diff options
Diffstat (limited to 'meta/packages/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch')
-rw-r--r-- | meta/packages/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch | 74 |
1 files changed, 47 insertions, 27 deletions
diff --git a/meta/packages/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch b/meta/packages/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch index 6ba47003b3..f39e65220c 100644 --- a/meta/packages/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch +++ b/meta/packages/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch | |||
@@ -1,8 +1,10 @@ | |||
1 | --- gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100 | 1 | Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h |
2 | +++ gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2006-03-10 15:32:37 +0100 | 2 | =================================================================== |
3 | --- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-08-16 01:29:20.000000000 -0700 | ||
4 | +++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-08-16 01:33:23.000000000 -0700 | ||
3 | @@ -60,4 +60,49 @@ | 5 | @@ -60,4 +60,49 @@ |
4 | extern "C" __typeof(wctype_l) __wctype_l; | 6 | extern "C" __typeof(wctype_l) __wctype_l; |
5 | #endif | 7 | #endif |
6 | 8 | ||
7 | +# define __nl_langinfo_l nl_langinfo_l | 9 | +# define __nl_langinfo_l nl_langinfo_l |
8 | +# define __strcoll_l strcoll_l | 10 | +# define __strcoll_l strcoll_l |
@@ -44,14 +46,16 @@ | |||
44 | +# define __towlower_l(C, L) towlower((C)) | 46 | +# define __towlower_l(C, L) towlower((C)) |
45 | +# define __towupper_l(C, L) towupper((C)) | 47 | +# define __towupper_l(C, L) towupper((C)) |
46 | +# define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2)) | 48 | +# define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2)) |
47 | +//# define __wcsftime_l(S, M, F, T, L) wcsftime((S), (M), (F), (T)) | 49 | +//# define __wcsftime_l(S, M, F, T, L) wcsftime((S), (M), (F), (T)) |
48 | +# define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N)) | 50 | +# define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N)) |
49 | +# define __wctype_l(S, L) wctype((S)) | 51 | +# define __wctype_l(S, L) wctype((S)) |
50 | +# endif | 52 | +# endif |
51 | + | 53 | + |
52 | #endif // GLIBC 2.3 and later | 54 | #endif // GLIBC 2.3 and later |
53 | --- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 | 55 | Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc |
54 | +++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc 2006-03-10 15:32:37 +0100 | 56 | =================================================================== |
57 | --- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-08-16 01:29:20.000000000 -0700 | ||
58 | +++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-08-16 01:33:00.000000000 -0700 | ||
55 | @@ -39,20 +39,6 @@ | 59 | @@ -39,20 +39,6 @@ |
56 | #include <langinfo.h> | 60 | #include <langinfo.h> |
57 | #include <bits/c++locale_internal.h> | 61 | #include <bits/c++locale_internal.h> |
@@ -70,11 +74,13 @@ | |||
70 | -#define __duplocale(a) __c_locale() | 74 | -#define __duplocale(a) __c_locale() |
71 | -#endif | 75 | -#endif |
72 | - | 76 | - |
73 | namespace std | 77 | namespace std |
74 | { | 78 | { |
75 | template<> | 79 | template<> |
76 | --- gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 | 80 | Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/collate_members.cc |
77 | +++ gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc 2006-03-10 15:32:37 +0100 | 81 | =================================================================== |
82 | --- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc 2008-08-16 01:29:20.000000000 -0700 | ||
83 | +++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/collate_members.cc 2008-08-16 01:30:31.000000000 -0700 | ||
78 | @@ -36,13 +36,6 @@ | 84 | @@ -36,13 +36,6 @@ |
79 | #include <locale> | 85 | #include <locale> |
80 | #include <bits/c++locale_internal.h> | 86 | #include <bits/c++locale_internal.h> |
@@ -89,8 +95,10 @@ | |||
89 | namespace std | 95 | namespace std |
90 | { | 96 | { |
91 | // These are basically extensions to char_traits, and perhaps should | 97 | // These are basically extensions to char_traits, and perhaps should |
92 | --- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 | 98 | Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc |
93 | +++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:32:37 +0100 | 99 | =================================================================== |
100 | --- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-08-16 01:29:20.000000000 -0700 | ||
101 | +++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-08-16 01:30:31.000000000 -0700 | ||
94 | @@ -43,10 +43,6 @@ | 102 | @@ -43,10 +43,6 @@ |
95 | #warning tailor for stub locale support | 103 | #warning tailor for stub locale support |
96 | #endif | 104 | #endif |
@@ -102,8 +110,10 @@ | |||
102 | namespace std | 110 | namespace std |
103 | { | 111 | { |
104 | // Construct and return valid pattern consisting of some combination of: | 112 | // Construct and return valid pattern consisting of some combination of: |
105 | --- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 | 113 | Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc |
106 | +++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2006-03-10 15:32:37 +0100 | 114 | =================================================================== |
115 | --- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-08-16 01:29:20.000000000 -0700 | ||
116 | +++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-08-16 01:30:31.000000000 -0700 | ||
107 | @@ -41,9 +41,6 @@ | 117 | @@ -41,9 +41,6 @@ |
108 | #ifdef __UCLIBC_MJN3_ONLY__ | 118 | #ifdef __UCLIBC_MJN3_ONLY__ |
109 | #warning tailor for stub locale support | 119 | #warning tailor for stub locale support |
@@ -114,8 +124,10 @@ | |||
114 | 124 | ||
115 | namespace std | 125 | namespace std |
116 | { | 126 | { |
117 | --- gcc/libstdc++-v3/config/locale/uclibc/time_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 | 127 | Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc |
118 | +++ gcc/libstdc++-v3/config/locale/uclibc/time_members.cc 2006-03-10 15:32:37 +0100 | 128 | =================================================================== |
129 | --- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-08-16 01:29:20.000000000 -0700 | ||
130 | +++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-08-16 01:30:31.000000000 -0700 | ||
119 | @@ -40,9 +40,6 @@ | 131 | @@ -40,9 +40,6 @@ |
120 | #ifdef __UCLIBC_MJN3_ONLY__ | 132 | #ifdef __UCLIBC_MJN3_ONLY__ |
121 | #warning tailor for stub locale support | 133 | #warning tailor for stub locale support |
@@ -126,8 +138,10 @@ | |||
126 | 138 | ||
127 | namespace std | 139 | namespace std |
128 | { | 140 | { |
129 | --- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 | 141 | Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc |
130 | +++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2006-03-10 15:32:37 +0100 | 142 | =================================================================== |
143 | --- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-08-16 01:29:20.000000000 -0700 | ||
144 | +++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-08-16 01:30:31.000000000 -0700 | ||
131 | @@ -38,13 +38,6 @@ | 145 | @@ -38,13 +38,6 @@ |
132 | #undef _LIBC | 146 | #undef _LIBC |
133 | #include <bits/c++locale_internal.h> | 147 | #include <bits/c++locale_internal.h> |
@@ -142,8 +156,10 @@ | |||
142 | namespace std | 156 | namespace std |
143 | { | 157 | { |
144 | // NB: The other ctype<char> specializations are in src/locale.cc and | 158 | // NB: The other ctype<char> specializations are in src/locale.cc and |
145 | --- gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 | 159 | Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.cc |
146 | +++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc 2006-03-10 15:32:37 +0100 | 160 | =================================================================== |
161 | --- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc 2008-08-16 01:27:18.000000000 -0700 | ||
162 | +++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.cc 2008-08-16 01:30:31.000000000 -0700 | ||
147 | @@ -39,13 +39,10 @@ | 163 | @@ -39,13 +39,10 @@ |
148 | #ifdef __UCLIBC_MJN3_ONLY__ | 164 | #ifdef __UCLIBC_MJN3_ONLY__ |
149 | #warning fix gettext stuff | 165 | #warning fix gettext stuff |
@@ -160,8 +176,10 @@ | |||
160 | #define gettext(msgid) (msgid) | 176 | #define gettext(msgid) (msgid) |
161 | #endif | 177 | #endif |
162 | 178 | ||
163 | --- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100 | 179 | Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h |
164 | +++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h 2006-03-10 15:32:37 +0100 | 180 | =================================================================== |
181 | --- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-08-16 01:29:20.000000000 -0700 | ||
182 | +++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-08-16 01:31:43.000000000 -0700 | ||
165 | @@ -36,15 +36,11 @@ | 183 | @@ -36,15 +36,11 @@ |
166 | #ifdef __UCLIBC_MJN3_ONLY__ | 184 | #ifdef __UCLIBC_MJN3_ONLY__ |
167 | #warning fix prototypes for *textdomain funcs | 185 | #warning fix prototypes for *textdomain funcs |
@@ -184,16 +202,16 @@ | |||
184 | 202 | ||
185 | // Non-virtual member functions. | 203 | // Non-virtual member functions. |
186 | @@ -70,7 +66,7 @@ | 204 | @@ -70,7 +66,7 @@ |
187 | messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, | 205 | messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, |
188 | const char* __dir) const | 206 | const char* __dir) const |
189 | { | 207 | { |
190 | - __bindtextdomain(__s.c_str(), __dir); | 208 | - __bindtextdomain(__s.c_str(), __dir); |
191 | + bindtextdomain(__s.c_str(), __dir); | 209 | + bindtextdomain(__s.c_str(), __dir); |
192 | return this->do_open(__s, __loc); | 210 | return this->do_open(__s, __loc); |
193 | } | 211 | } |
194 | 212 | ||
195 | @@ -90,7 +86,7 @@ | 213 | @@ -90,7 +86,7 @@ |
196 | { | 214 | { |
197 | // No error checking is done, assume the catalog exists and can | 215 | // No error checking is done, assume the catalog exists and can |
198 | // be used. | 216 | // be used. |
199 | - __textdomain(__s.c_str()); | 217 | - __textdomain(__s.c_str()); |
@@ -201,8 +219,10 @@ | |||
201 | return 0; | 219 | return 0; |
202 | } | 220 | } |
203 | 221 | ||
204 | --- gcc/libstdc++-v3/config/locale/uclibc/c_locale.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100 | 222 | Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h |
205 | +++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.h 2006-03-10 15:32:37 +0100 | 223 | =================================================================== |
224 | --- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-08-16 01:29:20.000000000 -0700 | ||
225 | +++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-08-16 01:30:31.000000000 -0700 | ||
206 | @@ -68,6 +68,7 @@ | 226 | @@ -68,6 +68,7 @@ |
207 | { | 227 | { |
208 | extern "C" __typeof(uselocale) __uselocale; | 228 | extern "C" __typeof(uselocale) __uselocale; |