diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.5.1/gcc-uclibc-locale-ctype_touplow_t.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.5.1/gcc-uclibc-locale-ctype_touplow_t.patch | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/gcc-uclibc-locale-ctype_touplow_t.patch b/meta/recipes-devtools/gcc/gcc-4.5.1/gcc-uclibc-locale-ctype_touplow_t.patch deleted file mode 100644 index e3e229295a..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.5.1/gcc-uclibc-locale-ctype_touplow_t.patch +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: gcc-4.5/libstdc++-v3/config/locale/generic/c_locale.h | ||
4 | =================================================================== | ||
5 | --- gcc-4.5.orig/libstdc++-v3/config/locale/generic/c_locale.h 2010-06-30 22:30:53.993316002 -0700 | ||
6 | +++ gcc-4.5/libstdc++-v3/config/locale/generic/c_locale.h 2010-06-30 22:31:26.043316001 -0700 | ||
7 | @@ -41,12 +41,17 @@ | ||
8 | |||
9 | #include <clocale> | ||
10 | #include <cstddef> | ||
11 | +#include <features.h> | ||
12 | +#include <ctype.h> | ||
13 | |||
14 | #define _GLIBCXX_NUM_CATEGORIES 0 | ||
15 | |||
16 | _GLIBCXX_BEGIN_NAMESPACE(std) | ||
17 | - | ||
18 | - typedef int* __c_locale; | ||
19 | +#ifdef __UCLIBC__ | ||
20 | + typedef __ctype_touplow_t* __c_locale; | ||
21 | +#else | ||
22 | + typedef int* __c_locale; | ||
23 | +#endif | ||
24 | |||
25 | // Convert numeric value of type double and long double to string and | ||
26 | // return length of string. If vsnprintf is available use it, otherwise | ||
27 | Index: gcc-4.5/libstdc++-v3/config/os/gnu-linux/ctype_base.h | ||
28 | =================================================================== | ||
29 | --- gcc-4.5.orig/libstdc++-v3/config/os/gnu-linux/ctype_base.h 2010-06-30 22:30:54.013316002 -0700 | ||
30 | +++ gcc-4.5/libstdc++-v3/config/os/gnu-linux/ctype_base.h 2010-06-30 22:31:26.053316001 -0700 | ||
31 | @@ -33,14 +33,21 @@ | ||
32 | */ | ||
33 | |||
34 | // Information as gleaned from /usr/include/ctype.h | ||
35 | - | ||
36 | + | ||
37 | +#include <features.h> | ||
38 | +#include <ctype.h> | ||
39 | + | ||
40 | _GLIBCXX_BEGIN_NAMESPACE(std) | ||
41 | |||
42 | /// @brief Base class for ctype. | ||
43 | struct ctype_base | ||
44 | { | ||
45 | // Non-standard typedefs. | ||
46 | - typedef const int* __to_type; | ||
47 | +#ifdef __UCLIBC__ | ||
48 | + typedef const __ctype_touplow_t* __to_type; | ||
49 | +#else | ||
50 | + typedef const int* __to_type; | ||
51 | +#endif | ||
52 | |||
53 | // NB: Offsets into ctype<char>::_M_table force a particular size | ||
54 | // on the mask type. Because of this, we don't use an enum. | ||
55 | Index: gcc-4.5/libstdc++-v3/config/locale/generic/c_locale.cc | ||
56 | =================================================================== | ||
57 | --- gcc-4.5.orig/libstdc++-v3/config/locale/generic/c_locale.cc 2010-06-28 12:12:42.000000000 -0700 | ||
58 | +++ gcc-4.5/libstdc++-v3/config/locale/generic/c_locale.cc 2010-06-30 22:31:26.063316001 -0700 | ||
59 | @@ -256,5 +256,10 @@ _GLIBCXX_END_NAMESPACE | ||
60 | #ifdef _GLIBCXX_LONG_DOUBLE_COMPAT | ||
61 | #define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \ | ||
62 | extern "C" void ldbl (void) __attribute__ ((alias (#dbl))) | ||
63 | +#ifdef __UCLIBC__ | ||
64 | +// This is because __c_locale is of type __ctype_touplow_t* which is short on uclibc. for glibc its int* | ||
65 | +_GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKPs, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPs); | ||
66 | +#else | ||
67 | _GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKPi, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPi); | ||
68 | +#endif | ||
69 | #endif // _GLIBCXX_LONG_DOUBLE_COMPAT | ||