gcc-4.4.4: Fix build failure on powerpc/uclibc.

* For uclibc __to_type is typedef'ed to const __ctype_touplow_t*
  which is a short int. So the mangled alias breaks because on
  glibc __to_type is int* and mangled alias is set accordingly

Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 35 insertions, 21 deletions

diff --git a/recipes/gcc/gcc-4.4.4.inc b/recipes/gcc/gcc-4.4.4.inc
index de916112b8..e14f31e79d 100644
--- a/recipes/gcc/gcc-4.4.4.inc
+++ b/recipes/gcc/gcc-4.4.4.inc
@@ -8,7 +8,7 @@ LICENSE = "GPLv3"
 DEPENDS = "mpfr gmp"
 NATIVEDEPS = "mpfr-native gmp-native"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 FILESPATHPKG .= ":gcc-$PV"
 
@@ -44,4 +44,3 @@ EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-li
 EXTRA_OECONF_append_linux-uclibc = " --disable-decimal-float "
 EXTRA_OECONF_append_linux-uclibceabi = " --disable-decimal-float "
 EXTRA_OECONF_append_linux-uclibcspe = " --disable-decimal-float "
-EXTRA_OECONF_append_linux-uclibc = " ${@base_contains('TARGET_ARCH', 'powerpc', '--without-long-double-128', '',d)}"
diff --git a/recipes/gcc/gcc-4.4.4/gcc-uclibc-locale-ctype_touplow_t.patch b/recipes/gcc/gcc-4.4.4/gcc-uclibc-locale-ctype_touplow_t.patch
index ffb37d2976..00121c52e6 100644
--- a/recipes/gcc/gcc-4.4.4/gcc-uclibc-locale-ctype_touplow_t.patch
+++ b/recipes/gcc/gcc-4.4.4/gcc-uclibc-locale-ctype_touplow_t.patch
@@ -1,39 +1,39 @@
-Index: gcc-4.4.1/libstdc++-v3/config/locale/generic/c_locale.h
+Index: gcc-4.4.4/libstdc++-v3/config/locale/generic/c_locale.h
 ===================================================================
---- gcc-4.4.1.orig/libstdc++-v3/config/locale/generic/c_locale.h	2009-08-06 23:38:32.398265633 -0700
-+++ gcc-4.4.1/libstdc++-v3/config/locale/generic/c_locale.h	2009-08-06 23:41:09.778242281 -0700
+--- gcc-4.4.4.orig/libstdc++-v3/config/locale/generic/c_locale.h	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.4/libstdc++-v3/config/locale/generic/c_locale.h	2010-05-18 03:37:42.003030691 -0700
 @@ -41,12 +41,17 @@
  
  #include <clocale>
  #include <cstddef>
-+#include <features.h> 
-+#include <ctype.h> 
++#include <features.h>
++#include <ctype.h>
  
  #define _GLIBCXX_NUM_CATEGORIES 0
  
  _GLIBCXX_BEGIN_NAMESPACE(std)
 -
 -  typedef int*			__c_locale;
-+#ifdef __UCLIBC__ 
-+   typedef __ctype_touplow_t*   __c_locale; 
-+#else 
-+   typedef int*         __c_locale; 
-+#endif 
++#ifdef __UCLIBC__
++   typedef __ctype_touplow_t*   __c_locale;
++#else
++   typedef int*         __c_locale;
++#endif
  
    // Convert numeric value of type double and long double to string and
    // return length of string.  If vsnprintf is available use it, otherwise
-Index: gcc-4.4.1/libstdc++-v3/config/os/gnu-linux/ctype_base.h
+Index: gcc-4.4.4/libstdc++-v3/config/os/gnu-linux/ctype_base.h
 ===================================================================
---- gcc-4.4.1.orig/libstdc++-v3/config/os/gnu-linux/ctype_base.h	2009-08-06 23:42:27.402242608 -0700
-+++ gcc-4.4.1/libstdc++-v3/config/os/gnu-linux/ctype_base.h	2009-08-06 23:43:44.842241959 -0700
+--- gcc-4.4.4.orig/libstdc++-v3/config/os/gnu-linux/ctype_base.h	2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.4/libstdc++-v3/config/os/gnu-linux/ctype_base.h	2010-05-18 03:37:42.003030691 -0700
 @@ -33,14 +33,21 @@
   */
  
  // Information as gleaned from /usr/include/ctype.h
 -  
 +
-+#include <features.h> 
-+#include <ctype.h> 
++#include <features.h>
++#include <ctype.h>
 +
  _GLIBCXX_BEGIN_NAMESPACE(std)
  
@@ -42,11 +42,26 @@ Index: gcc-4.4.1/libstdc++-v3/config/os/gnu-linux/ctype_base.h
    {
      // Non-standard typedefs.
 -    typedef const int* 		__to_type;
-+#ifdef __UCLIBC__ 
-+    typedef const __ctype_touplow_t*   __to_type; 
-+#else 
-+    typedef const int*         __to_type; 
++#ifdef __UCLIBC__
++    typedef const __ctype_touplow_t*   __to_type;
++#else
++    typedef const int*         __to_type;
 +#endif
  
      // NB: Offsets into ctype<char>::_M_table force a particular size
      // on the mask type. Because of this, we don't use an enum.
+Index: gcc-4.4.4/libstdc++-v3/config/locale/generic/c_locale.cc
+===================================================================
+--- gcc-4.4.4.orig/libstdc++-v3/config/locale/generic/c_locale.cc	2010-05-18 03:32:27.120513925 -0700
++++ gcc-4.4.4/libstdc++-v3/config/locale/generic/c_locale.cc	2010-05-18 03:36:35.890559135 -0700
+@@ -252,5 +252,10 @@ _GLIBCXX_END_NAMESPACE
+ #ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
+ #define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
+   extern "C" void ldbl (void) __attribute__ ((alias (#dbl)))
++#ifdef __UCLIBC__
++// This is because __c_locale is of type __ctype_touplow_t* which is short on uclibc. for glibc its int*
++_GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKPs, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPs);
++#else
+ _GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKPi, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPi);
++#endif
+ #endif // _GLIBCXX_LONG_DOUBLE_COMPAT