diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:14:24 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:29:45 +0100 |
commit | 29d6678fd546377459ef75cf54abeef5b969b5cf (patch) | |
tree | 8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-devtools/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch | |
parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
download | poky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz |
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.
The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.
Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch new file mode 100644 index 0000000000..4f94fc9d66 --- /dev/null +++ b/meta/recipes-devtools/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 | ||