From 8058b3145def398a06e41f59bd928f306da0442e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 1 Jul 2010 00:15:38 -0700 Subject: gcc-4.5: Make gcc-cross build for ppc target Signed-off-by: Khem Raj --- recipes/gcc/gcc-4.5.inc | 3 +- .../gcc-uclibc-locale-ctype_touplow_t.patch | 53 ++++++++++++++-------- 2 files changed, 35 insertions(+), 21 deletions(-) (limited to 'recipes/gcc') diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc index 0c3d46ffd4..b359efa543 100644 --- a/recipes/gcc/gcc-4.5.inc +++ b/recipes/gcc/gcc-4.5.inc @@ -18,7 +18,7 @@ PV = "4.5" # 4.5.1 then the value below will be 2 which will mean 4.5.2 # which will be next minor release and so on. -BINV = "${PV}.1" +BINV = "${PV}.2" BRANCH = "gcc-4_5-branch" PR_append = "+svnr${SRCPV}" @@ -54,4 +54,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.5/gcc-uclibc-locale-ctype_touplow_t.patch b/recipes/gcc/gcc-4.5/gcc-uclibc-locale-ctype_touplow_t.patch index ffb37d2976..4f94fc9d66 100644 --- a/recipes/gcc/gcc-4.5/gcc-uclibc-locale-ctype_touplow_t.patch +++ b/recipes/gcc/gcc-4.5/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.5/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.5.orig/libstdc++-v3/config/locale/generic/c_locale.h 2010-06-30 22:30:53.993316002 -0700 ++++ gcc-4.5/libstdc++-v3/config/locale/generic/c_locale.h 2010-06-30 22:31:26.043316001 -0700 @@ -41,12 +41,17 @@ #include #include -+#include -+#include ++#include ++#include #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.5/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.5.orig/libstdc++-v3/config/os/gnu-linux/ctype_base.h 2010-06-30 22:30:54.013316002 -0700 ++++ gcc-4.5/libstdc++-v3/config/os/gnu-linux/ctype_base.h 2010-06-30 22:31:26.053316001 -0700 @@ -33,14 +33,21 @@ */ // Information as gleaned from /usr/include/ctype.h - + -+#include -+#include ++#include ++#include + _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::_M_table force a particular size // on the mask type. Because of this, we don't use an enum. +Index: gcc-4.5/libstdc++-v3/config/locale/generic/c_locale.cc +=================================================================== +--- gcc-4.5.orig/libstdc++-v3/config/locale/generic/c_locale.cc 2010-06-28 12:12:42.000000000 -0700 ++++ gcc-4.5/libstdc++-v3/config/locale/generic/c_locale.cc 2010-06-30 22:31:26.063316001 -0700 +@@ -256,5 +256,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 -- cgit 1.2.3-korg