diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-07-19 02:36:13 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-24 01:38:36 +0100 |
commit | c7c5c34188599bae19991f842a836fe125fa3283 (patch) | |
tree | 5e2e97d48c73cc9d0206a0d57bf2446b8dec8af1 /meta/packages/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch | |
parent | 722e27e44806558b2ef3e6b7072451981fa5823e (diff) | |
download | poky-c7c5c34188599bae19991f842a836fe125fa3283.tar.gz |
gcc family : upgrade to 4.5.0
Imported OE patches into the poky recipes.
- Use elfutils instead of libelf
Converted OE's svn source into tar ball & a patch.
Added a patch to revert the baseversion to 4.5.0
Merge OE & poky extra_oeconf_options
Fix the zlib (inside gcc) make issue by providing the --with-system-zlib switch in EXTRA_OECONF
Found out that some header file dirs were soft linked to non-existing
locations like c_std. Changed the configure options to point them to
existing locations like c_global.
gcc-cross-canadian_4.5.0: fix configure issue
Thanks to Saul Wold for providing poky gcc patches rebased to the 4.5.0
sources.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/packages/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch')
-rw-r--r-- | meta/packages/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/meta/packages/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch b/meta/packages/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch new file mode 100644 index 0000000000..4f94fc9d66 --- /dev/null +++ b/meta/packages/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch | |||
@@ -0,0 +1,67 @@ | |||
1 | Index: gcc-4.5/libstdc++-v3/config/locale/generic/c_locale.h | ||
2 | =================================================================== | ||
3 | --- gcc-4.5.orig/libstdc++-v3/config/locale/generic/c_locale.h 2010-06-30 22:30:53.993316002 -0700 | ||
4 | +++ gcc-4.5/libstdc++-v3/config/locale/generic/c_locale.h 2010-06-30 22:31:26.043316001 -0700 | ||
5 | @@ -41,12 +41,17 @@ | ||
6 | |||
7 | #include <clocale> | ||
8 | #include <cstddef> | ||
9 | +#include <features.h> | ||
10 | +#include <ctype.h> | ||
11 | |||
12 | #define _GLIBCXX_NUM_CATEGORIES 0 | ||
13 | |||
14 | _GLIBCXX_BEGIN_NAMESPACE(std) | ||
15 | - | ||
16 | - typedef int* __c_locale; | ||
17 | +#ifdef __UCLIBC__ | ||
18 | + typedef __ctype_touplow_t* __c_locale; | ||
19 | +#else | ||
20 | + typedef int* __c_locale; | ||
21 | +#endif | ||
22 | |||
23 | // Convert numeric value of type double and long double to string and | ||
24 | // return length of string. If vsnprintf is available use it, otherwise | ||
25 | Index: gcc-4.5/libstdc++-v3/config/os/gnu-linux/ctype_base.h | ||
26 | =================================================================== | ||
27 | --- gcc-4.5.orig/libstdc++-v3/config/os/gnu-linux/ctype_base.h 2010-06-30 22:30:54.013316002 -0700 | ||
28 | +++ gcc-4.5/libstdc++-v3/config/os/gnu-linux/ctype_base.h 2010-06-30 22:31:26.053316001 -0700 | ||
29 | @@ -33,14 +33,21 @@ | ||
30 | */ | ||
31 | |||
32 | // Information as gleaned from /usr/include/ctype.h | ||
33 | - | ||
34 | + | ||
35 | +#include <features.h> | ||
36 | +#include <ctype.h> | ||
37 | + | ||
38 | _GLIBCXX_BEGIN_NAMESPACE(std) | ||
39 | |||
40 | /// @brief Base class for ctype. | ||
41 | struct ctype_base | ||
42 | { | ||
43 | // Non-standard typedefs. | ||
44 | - typedef const int* __to_type; | ||
45 | +#ifdef __UCLIBC__ | ||
46 | + typedef const __ctype_touplow_t* __to_type; | ||
47 | +#else | ||
48 | + typedef const int* __to_type; | ||
49 | +#endif | ||
50 | |||
51 | // NB: Offsets into ctype<char>::_M_table force a particular size | ||
52 | // on the mask type. Because of this, we don't use an enum. | ||
53 | Index: gcc-4.5/libstdc++-v3/config/locale/generic/c_locale.cc | ||
54 | =================================================================== | ||
55 | --- gcc-4.5.orig/libstdc++-v3/config/locale/generic/c_locale.cc 2010-06-28 12:12:42.000000000 -0700 | ||
56 | +++ gcc-4.5/libstdc++-v3/config/locale/generic/c_locale.cc 2010-06-30 22:31:26.063316001 -0700 | ||
57 | @@ -256,5 +256,10 @@ _GLIBCXX_END_NAMESPACE | ||
58 | #ifdef _GLIBCXX_LONG_DOUBLE_COMPAT | ||
59 | #define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \ | ||
60 | extern "C" void ldbl (void) __attribute__ ((alias (#dbl))) | ||
61 | +#ifdef __UCLIBC__ | ||
62 | +// This is because __c_locale is of type __ctype_touplow_t* which is short on uclibc. for glibc its int* | ||
63 | +_GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKPs, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPs); | ||
64 | +#else | ||
65 | _GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKPi, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPi); | ||
66 | +#endif | ||
67 | #endif // _GLIBCXX_LONG_DOUBLE_COMPAT | ||