diff --git a/glibc-2.15-confstr-strdup.patch b/glibc-2.15-confstr-strdup.patch
new file mode 100644
index 0000000..f738bac
--- /dev/null
+++ b/glibc-2.15-confstr-strdup.patch
@@ -0,0 +1,299 @@
+diff --git a/libc/posix/confstr.c b/libc/posix/confstr.c
+index 3f79d45..b5b4185 100644
+--- a/libc/posix/confstr.c
++++ b/libc/posix/confstr.c
+@@ -34,10 +36,6 @@ confstr (name, buf, len)
+   const char *string = "";
+   size_t string_len = 1;
+ 
+-  /* Note that this buffer must be large enough for the longest strings
+-     used below.  */
+-  char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"];
+-
+   switch (name)
+     {
+     case _CS_PATH:
+diff --git a/libc/posix/confstr.inc b/libc/posix/confstr.inc
+index 9f1a071..ee88304 100644
+--- a/libc/posix/confstr.inc
++++ b/libc/posix/confstr.inc
+@@ -28,55 +28,59 @@
+ 	 wint_t types are no greater than the width of type long.
+ 
+ 	 Currently this means all environment which the system allows.  */
+-      string_len = 0;
++      {
++	char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"];
++
++	string_len = 0;
+ #ifndef _POSIX_V7_ILP32_OFF32
+-      if (__sysconf (_SC_V7_ILP32_OFF32) > 0)
++	if (__sysconf (_SC_V7_ILP32_OFF32) > 0)
+ #endif
+ #if !defined _POSIX_V7_ILP32_OFF32 || _POSIX_V7_ILP32_OFF32 > 0
+-	{
+-	  memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32",
+-		  sizeof "POSIX_V7_ILP32_OFF32" - 1);
+-	  string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1;
+-	}
++	  {
++	    memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32",
++		    sizeof "POSIX_V7_ILP32_OFF32" - 1);
++	    string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1;
++	  }
+ #endif
+ #ifndef _POSIX_V7_ILP32_OFFBIG
+-      if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0)
++	if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0)
+ #endif
+ #if !defined _POSIX_V7_ILP32_OFFBIG || _POSIX_V7_ILP32_OFFBIG > 0
+-	{
+-	  if (string_len)
+-	    restenvs[string_len++] = '\n';
+-	  memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG",
+-		  sizeof "POSIX_V7_ILP32_OFFBIG" - 1);
+-	  string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1;
+-	}
++	  {
++	    if (string_len)
++	      restenvs[string_len++] = '\n';
++	    memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG",
++		    sizeof "POSIX_V7_ILP32_OFFBIG" - 1);
++	    string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1;
++	  }
+ #endif
+ #ifndef _POSIX_V7_LP64_OFF64
+-      if (__sysconf (_SC_V7_LP64_OFF64) > 0)
++	if (__sysconf (_SC_V7_LP64_OFF64) > 0)
+ #endif
+ #if !defined _POSIX_V7_LP64_OFF64 || _POSIX_V7_LP64_OFF64 > 0
+-	{
+-	  if (string_len)
+-	    restenvs[string_len++] = '\n';
+-	  memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64",
+-		  sizeof "POSIX_V7_LP64_OFF64" - 1);
+-	  string_len += sizeof "POSIX_V7_LP64_OFF64" - 1;
+-	}
++	  {
++	    if (string_len)
++	      restenvs[string_len++] = '\n';
++	    memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64",
++		    sizeof "POSIX_V7_LP64_OFF64" - 1);
++	    string_len += sizeof "POSIX_V7_LP64_OFF64" - 1;
++	  }
+ #endif
+ #ifndef _POSIX_V7_LPBIG_OFFBIG
+-      if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0)
++	if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0)
+ #endif
+ #if !defined _POSIX_V7_LPBIG_OFFBIG || _POSIX_V7_LPBIG_OFFBIG > 0
+-	{
+-	  if (string_len)
+-	    restenvs[string_len++] = '\n';
+-	  memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG",
+-		  sizeof "POSIX_V7_LPBIG_OFFBIG" - 1);
+-	  string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1;
+-	}
+-#endif
+-      restenvs[string_len++] = '\0';
+-      string = restenvs;
++	  {
++	    if (string_len)
++	      restenvs[string_len++] = '\n';
++	    memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG",
++		    sizeof "POSIX_V7_LPBIG_OFFBIG" - 1);
++	    string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1;
++	  }
++#endif
++	restenvs[string_len++] = '\0';
++	string = restenvs;
++      }
+       break;
+ 
+     case _CS_V6_WIDTH_RESTRICTED_ENVS:
+@@ -87,55 +91,59 @@
+ 	 wint_t types are no greater than the width of type long.
+ 
+ 	 Currently this means all environment which the system allows.  */
+-      string_len = 0;
++      {
++	char restenvs[4 * sizeof "POSIX_V6_LPBIG_OFFBIG"];
++
++	string_len = 0;
+ #ifndef _POSIX_V6_ILP32_OFF32
+-      if (__sysconf (_SC_V6_ILP32_OFF32) > 0)
++	if (__sysconf (_SC_V6_ILP32_OFF32) > 0)
+ #endif
+ #if !defined _POSIX_V6_ILP32_OFF32 || _POSIX_V6_ILP32_OFF32 > 0
+-	{
+-	  memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32",
+-		  sizeof "POSIX_V6_ILP32_OFF32" - 1);
+-	  string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1;
+-	}
++	  {
++	    memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32",
++		    sizeof "POSIX_V6_ILP32_OFF32" - 1);
++	    string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1;
++	  }
+ #endif
+ #ifndef _POSIX_V6_ILP32_OFFBIG
+-      if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0)
++	if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0)
+ #endif
+ #if !defined _POSIX_V6_ILP32_OFFBIG || _POSIX_V6_ILP32_OFFBIG > 0
+-	{
+-	  if (string_len)
+-	    restenvs[string_len++] = '\n';
+-	  memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG",
+-		  sizeof "POSIX_V6_ILP32_OFFBIG" - 1);
+-	  string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1;
+-	}
++	  {
++	    if (string_len)
++	      restenvs[string_len++] = '\n';
++	    memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG",
++		    sizeof "POSIX_V6_ILP32_OFFBIG" - 1);
++	    string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1;
++	  }
+ #endif
+ #ifndef _POSIX_V6_LP64_OFF64
+-      if (__sysconf (_SC_V6_LP64_OFF64) > 0)
++	if (__sysconf (_SC_V6_LP64_OFF64) > 0)
+ #endif
+ #if !defined _POSIX_V6_LP64_OFF64 || _POSIX_V6_LP64_OFF64 > 0
+-	{
+-	  if (string_len)
+-	    restenvs[string_len++] = '\n';
+-	  memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64",
+-		  sizeof "POSIX_V6_LP64_OFF64" - 1);
+-	  string_len += sizeof "POSIX_V6_LP64_OFF64" - 1;
+-	}
++	  {
++	    if (string_len)
++	      restenvs[string_len++] = '\n';
++	    memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64",
++		    sizeof "POSIX_V6_LP64_OFF64" - 1);
++	    string_len += sizeof "POSIX_V6_LP64_OFF64" - 1;
++	  }
+ #endif
+ #ifndef _POSIX_V6_LPBIG_OFFBIG
+-      if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0)
++	if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0)
+ #endif
+ #if !defined _POSIX_V6_LPBIG_OFFBIG || _POSIX_V6_LPBIG_OFFBIG > 0
+-	{
+-	  if (string_len)
+-	    restenvs[string_len++] = '\n';
+-	  memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG",
+-		  sizeof "POSIX_V6_LPBIG_OFFBIG" - 1);
+-	  string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1;
+-	}
+-#endif
+-      restenvs[string_len++] = '\0';
+-      string = restenvs;
++	  {
++	    if (string_len)
++	      restenvs[string_len++] = '\n';
++	    memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG",
++		    sizeof "POSIX_V6_LPBIG_OFFBIG" - 1);
++	    string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1;
++	  }
++#endif
++	restenvs[string_len++] = '\0';
++	string = restenvs;
++      }
+       break;
+ 
+     case _CS_V5_WIDTH_RESTRICTED_ENVS:
+@@ -146,53 +154,57 @@
+ 	 wint_t types are no greater than the width of type long.
+ 
+ 	 Currently this means all environment which the system allows.  */
+-      string_len = 0;
++      {
++	char restenvs[4 * sizeof "XBS5_LPBIG_OFFBIG"];
++
++	string_len = 0;
+ #ifndef _XBS5_ILP32_OFF32
+-      if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0)
++	if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0)
+ #endif
+ #if !defined _XBS5_ILP32_OFF32 || _XBS5_ILP32_OFF32 > 0
+-	{
+-	  memcpy (restenvs + string_len, "XBS5_ILP32_OFF32",
+-		  sizeof "XBS5_ILP32_OFF32" - 1);
+-	  string_len += sizeof "XBS5_ILP32_OFF32" - 1;
+-	}
++	  {
++	    memcpy (restenvs + string_len, "XBS5_ILP32_OFF32",
++		    sizeof "XBS5_ILP32_OFF32" - 1);
++	    string_len += sizeof "XBS5_ILP32_OFF32" - 1;
++	  }
+ #endif
+ #ifndef _XBS5_ILP32_OFFBIG
+-      if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0)
++	if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0)
+ #endif
+ #if !defined _XBS5_ILP32_OFFBIG || _XBS5_ILP32_OFFBIG > 0
+-	{
+-	  if (string_len)
+-	    restenvs[string_len++] = '\n';
+-	  memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG",
+-		  sizeof "XBS5_ILP32_OFFBIG" - 1);
+-	  string_len += sizeof "XBS5_ILP32_OFFBIG" - 1;
+-	}
++	  {
++	    if (string_len)
++	      restenvs[string_len++] = '\n';
++	    memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG",
++		    sizeof "XBS5_ILP32_OFFBIG" - 1);
++	    string_len += sizeof "XBS5_ILP32_OFFBIG" - 1;
++	  }
+ #endif
+ #ifndef _XBS5_LP64_OFF64
+-      if (__sysconf (_SC_XBS5_LP64_OFF64) > 0)
++	if (__sysconf (_SC_XBS5_LP64_OFF64) > 0)
+ #endif
+ #if !defined _XBS5_LP64_OFF64 || _XBS5_LP64_OFF64 > 0
+-	{
+-	  if (string_len)
+-	    restenvs[string_len++] = '\n';
+-	  memcpy (restenvs + string_len, "XBS5_LP64_OFF64",
+-		  sizeof "XBS5_LP64_OFF64" - 1);
+-	  string_len += sizeof "XBS5_LP64_OFF64" - 1;
+-	}
++	  {
++	    if (string_len)
++	      restenvs[string_len++] = '\n';
++	    memcpy (restenvs + string_len, "XBS5_LP64_OFF64",
++		    sizeof "XBS5_LP64_OFF64" - 1);
++	    string_len += sizeof "XBS5_LP64_OFF64" - 1;
++	  }
+ #endif
+ #ifndef _XBS5_LPBIG_OFFBIG
+-      if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0)
++	if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0)
+ #endif
+ #if !defined _XBS5_LPBIG_OFFBIG || _XBS5_LPBIG_OFFBIG > 0
+-	{
+-	  if (string_len)
+-	    restenvs[string_len++] = '\n';
+-	  memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG",
+-		  sizeof "XBS5_LPBIG_OFFBIG" - 1);
+-	  string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1;
+-	}
+-#endif
+-      restenvs[string_len++] = '\0';
+-      string = restenvs;
++	  {
++	    if (string_len)
++	      restenvs[string_len++] = '\n';
++	    memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG",
++		    sizeof "XBS5_LPBIG_OFFBIG" - 1);
++	    string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1;
++	  }
++#endif
++	restenvs[string_len++] = '\0';
++	string = restenvs;
++      }
+       break;
diff --git a/glibc.changes b/glibc.changes
index 78074c3..bb95c8f 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,6 @@
+* Tue Dec 17 2013 Carsten Munk <carsten.munk@jollamobile.com> - 2.15
+- Add patch to sort out GCC 4.7/4.8 getconf breakage.
+
 * Tue Jul 16 2013 Mikko Hurskainen <mikko.hurskainen@nomovok.com> - 2.15
 - Fix shlib.lds generation with make 3.81
   eglibc-2.15-shlib-make.patch
diff --git a/glibc.spec b/glibc.spec
index adf20e5..44d6cb0 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -38,6 +38,7 @@ Patch12: eglibc-2.15-disable-multilib.patch
 Patch13: eglibc-2.15-use-usrbin-localedef.patch
 Patch14: eglibc-2.15-fix-neon-libdl.patch
 Patch15: eglibc-2.15-shlib-make.patch
+Patch16: glibc-2.15-confstr-strdup.patch
 
 Provides: ldconfig
 # The dynamic linker supports DT_GNU_HASH
@@ -203,6 +204,7 @@ If unsure if you need this, don't install this package.
 %patch14 -p1
 %endif
 %patch15 -p1
+%patch16 -p2 -R 
 
 # Not well formatted locales --cvm
 sed -i "s|^localedata/locale-eo_EO.diff$||g" debian/patches/series