patches/gcc/4.3.0/675-uclibc-locale-no__x.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Jul 28 21:08:01 2008 +0000 (2008-07-28)
changeset 746 b150d6f590fc
parent 552 patches/gcc/4.3.0/675-203-uclibc-locale-no__x.patch@4edbcdb17e3d
permissions -rw-r--r--
Third go at renaming patches to contain neither the package name nor the package version.
yann@552
     1
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.0/uclibc/90_all_203-uclibc-locale-no__x.patch
yann@552
     2
diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-4.3.0/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
yann@552
     3
--- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h	2008-06-10 14:45:39.000000000 +0200
yann@552
     4
+++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/c++locale_internal.h	2008-06-10 14:45:39.000000000 +0200
yann@552
     5
@@ -60,4 +60,49 @@
yann@552
     6
 extern "C" __typeof(wctype_l) __wctype_l;
yann@552
     7
 #endif 
yann@552
     8
 
yann@552
     9
+# define __nl_langinfo_l nl_langinfo_l
yann@552
    10
+# define __strcoll_l strcoll_l
yann@552
    11
+# define __strftime_l strftime_l
yann@552
    12
+# define __strtod_l strtod_l
yann@552
    13
+# define __strtof_l strtof_l
yann@552
    14
+# define __strtold_l strtold_l
yann@552
    15
+# define __strxfrm_l strxfrm_l
yann@552
    16
+# define __newlocale newlocale
yann@552
    17
+# define __freelocale freelocale
yann@552
    18
+# define __duplocale duplocale
yann@552
    19
+# define __uselocale uselocale
yann@552
    20
+
yann@552
    21
+# ifdef _GLIBCXX_USE_WCHAR_T
yann@552
    22
+#  define __iswctype_l iswctype_l
yann@552
    23
+#  define __towlower_l towlower_l
yann@552
    24
+#  define __towupper_l towupper_l
yann@552
    25
+#  define __wcscoll_l wcscoll_l
yann@552
    26
+#  define __wcsftime_l wcsftime_l
yann@552
    27
+#  define __wcsxfrm_l wcsxfrm_l
yann@552
    28
+#  define __wctype_l wctype_l
yann@552
    29
+# endif
yann@552
    30
+
yann@552
    31
+#else
yann@552
    32
+# define __nl_langinfo_l(N, L)       nl_langinfo((N))
yann@552
    33
+# define __strcoll_l(S1, S2, L)      strcoll((S1), (S2))
yann@552
    34
+# define __strtod_l(S, E, L)         strtod((S), (E))
yann@552
    35
+# define __strtof_l(S, E, L)         strtof((S), (E))
yann@552
    36
+# define __strtold_l(S, E, L)        strtold((S), (E))
yann@552
    37
+# define __strxfrm_l(S1, S2, N, L)   strxfrm((S1), (S2), (N))
yann@552
    38
+# warning should dummy __newlocale check for C|POSIX ?
yann@552
    39
+# define __newlocale(a, b, c)        NULL
yann@552
    40
+# define __freelocale(a)             ((void)0)
yann@552
    41
+# define __duplocale(a)              __c_locale()
yann@552
    42
+//# define __uselocale ?
yann@552
    43
+//
yann@552
    44
+# ifdef _GLIBCXX_USE_WCHAR_T
yann@552
    45
+#  define __iswctype_l(C, M, L)       iswctype((C), (M))
yann@552
    46
+#  define __towlower_l(C, L)          towlower((C))
yann@552
    47
+#  define __towupper_l(C, L)          towupper((C))
yann@552
    48
+#  define __wcscoll_l(S1, S2, L)      wcscoll((S1), (S2))
yann@552
    49
+//#  define __wcsftime_l(S, M, F, T, L)  wcsftime((S), (M), (F), (T)) 
yann@552
    50
+#  define __wcsxfrm_l(S1, S2, N, L)   wcsxfrm((S1), (S2), (N))
yann@552
    51
+#  define __wctype_l(S, L)            wctype((S))
yann@552
    52
+# endif
yann@552
    53
+
yann@552
    54
 #endif // GLIBC 2.3 and later
yann@552
    55
diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.3.0/libstdc++-v3/config/locale/uclibc/c_locale.cc
yann@552
    56
--- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc	2008-06-10 14:45:39.000000000 +0200
yann@552
    57
+++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/c_locale.cc	2008-06-10 14:45:39.000000000 +0200
yann@552
    58
@@ -39,20 +39,6 @@
yann@552
    59
 #include <langinfo.h>
yann@552
    60
 #include <bits/c++locale_internal.h>
yann@552
    61
 
yann@552
    62
-#ifndef __UCLIBC_HAS_XLOCALE__
yann@552
    63
-#define __strtol_l(S, E, B, L)      strtol((S), (E), (B))
yann@552
    64
-#define __strtoul_l(S, E, B, L)     strtoul((S), (E), (B))
yann@552
    65
-#define __strtoll_l(S, E, B, L)     strtoll((S), (E), (B))
yann@552
    66
-#define __strtoull_l(S, E, B, L)    strtoull((S), (E), (B))
yann@552
    67
-#define __strtof_l(S, E, L)         strtof((S), (E))
yann@552
    68
-#define __strtod_l(S, E, L)         strtod((S), (E))
yann@552
    69
-#define __strtold_l(S, E, L)        strtold((S), (E))
yann@552
    70
-#warning should dummy __newlocale check for C|POSIX ?
yann@552
    71
-#define __newlocale(a, b, c)        NULL
yann@552
    72
-#define __freelocale(a)             ((void)0)
yann@552
    73
-#define __duplocale(a)              __c_locale()
yann@552
    74
-#endif
yann@552
    75
-
yann@552
    76
 namespace std 
yann@552
    77
 {
yann@552
    78
   template<>
yann@552
    79
diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.3.0/libstdc++-v3/config/locale/uclibc/c_locale.h
yann@552
    80
--- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/c_locale.h	2008-06-10 14:45:39.000000000 +0200
yann@552
    81
+++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/c_locale.h	2008-06-10 14:45:39.000000000 +0200
yann@552
    82
@@ -68,6 +68,7 @@
yann@552
    83
 {
yann@552
    84
   extern "C" __typeof(uselocale) __uselocale;
yann@552
    85
 }
yann@552
    86
+#define __uselocale uselocale
yann@552
    87
 #endif
yann@552
    88
 
yann@552
    89
 namespace std
yann@552
    90
diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-4.3.0/libstdc++-v3/config/locale/uclibc/collate_members.cc
yann@552
    91
--- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc	2008-06-10 14:45:39.000000000 +0200
yann@552
    92
+++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/collate_members.cc	2008-06-10 14:45:39.000000000 +0200
yann@552
    93
@@ -36,13 +36,6 @@
yann@552
    94
 #include <locale>
yann@552
    95
 #include <bits/c++locale_internal.h>
yann@552
    96
 
yann@552
    97
-#ifndef __UCLIBC_HAS_XLOCALE__
yann@552
    98
-#define __strcoll_l(S1, S2, L)      strcoll((S1), (S2))
yann@552
    99
-#define __strxfrm_l(S1, S2, N, L)   strxfrm((S1), (S2), (N))
yann@552
   100
-#define __wcscoll_l(S1, S2, L)      wcscoll((S1), (S2))
yann@552
   101
-#define __wcsxfrm_l(S1, S2, N, L)   wcsxfrm((S1), (S2), (N))
yann@552
   102
-#endif
yann@552
   103
-
yann@552
   104
 namespace std
yann@552
   105
 {
yann@552
   106
   // These are basically extensions to char_traits, and perhaps should
yann@552
   107
diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.3.0/libstdc++-v3/config/locale/uclibc/ctype_members.cc
yann@552
   108
--- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc	2008-06-10 14:45:39.000000000 +0200
yann@552
   109
+++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/ctype_members.cc	2008-06-10 14:45:39.000000000 +0200
yann@552
   110
@@ -38,13 +38,6 @@
yann@552
   111
 #undef _LIBC
yann@552
   112
 #include <bits/c++locale_internal.h>
yann@552
   113
 
yann@552
   114
-#ifndef __UCLIBC_HAS_XLOCALE__
yann@552
   115
-#define __wctype_l(S, L)           wctype((S))
yann@552
   116
-#define __towupper_l(C, L)         towupper((C))
yann@552
   117
-#define __towlower_l(C, L)         towlower((C))
yann@552
   118
-#define __iswctype_l(C, M, L)      iswctype((C), (M))
yann@552
   119
-#endif
yann@552
   120
-
yann@552
   121
 namespace std
yann@552
   122
 {
yann@552
   123
   // NB: The other ctype<char> specializations are in src/locale.cc and
yann@552
   124
diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-4.3.0/libstdc++-v3/config/locale/uclibc/messages_members.cc
yann@552
   125
--- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc	2008-06-10 14:45:39.000000000 +0200
yann@552
   126
+++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/messages_members.cc	2008-06-10 14:45:39.000000000 +0200
yann@552
   127
@@ -39,13 +39,10 @@
yann@552
   128
 #ifdef __UCLIBC_MJN3_ONLY__
yann@552
   129
 #warning fix gettext stuff
yann@552
   130
 #endif
yann@552
   131
-#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
yann@552
   132
-extern "C" char *__dcgettext(const char *domainname,
yann@552
   133
-			     const char *msgid, int category);
yann@552
   134
 #undef gettext
yann@552
   135
-#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
yann@552
   136
+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
yann@552
   137
+#define gettext(msgid) dcgettext(NULL, msgid, LC_MESSAGES)
yann@552
   138
 #else
yann@552
   139
-#undef gettext
yann@552
   140
 #define gettext(msgid) (msgid)
yann@552
   141
 #endif
yann@552
   142
 
yann@552
   143
diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.3.0/libstdc++-v3/config/locale/uclibc/messages_members.h
yann@552
   144
--- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/messages_members.h	2008-06-10 14:45:39.000000000 +0200
yann@552
   145
+++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/messages_members.h	2008-06-10 14:45:39.000000000 +0200
yann@552
   146
@@ -36,15 +36,11 @@
yann@552
   147
 #ifdef __UCLIBC_MJN3_ONLY__
yann@552
   148
 #warning fix prototypes for *textdomain funcs
yann@552
   149
 #endif
yann@552
   150
-#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
yann@552
   151
-extern "C" char *__textdomain(const char *domainname);
yann@552
   152
-extern "C" char *__bindtextdomain(const char *domainname,
yann@552
   153
-				  const char *dirname);
yann@552
   154
-#else
yann@552
   155
-#undef __textdomain
yann@552
   156
-#undef __bindtextdomain
yann@552
   157
-#define __textdomain(D)           ((void)0)
yann@552
   158
-#define __bindtextdomain(D,P)     ((void)0)
yann@552
   159
+#ifndef __UCLIBC_HAS_GETTEXT_AWARENESS__
yann@552
   160
+#undef textdomain
yann@552
   161
+#undef bindtextdomain
yann@552
   162
+#define textdomain(D)           ((void)0)
yann@552
   163
+#define bindtextdomain(D,P)     ((void)0)
yann@552
   164
 #endif
yann@552
   165
 
yann@552
   166
   // Non-virtual member functions.
yann@552
   167
@@ -70,7 +66,7 @@
yann@552
   168
     messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, 
yann@552
   169
 			   const char* __dir) const
yann@552
   170
     { 
yann@552
   171
-      __bindtextdomain(__s.c_str(), __dir);
yann@552
   172
+      bindtextdomain(__s.c_str(), __dir);
yann@552
   173
       return this->do_open(__s, __loc); 
yann@552
   174
     }
yann@552
   175
 
yann@552
   176
@@ -90,7 +86,7 @@
yann@552
   177
     { 
yann@552
   178
       // No error checking is done, assume the catalog exists and can
yann@552
   179
       // be used.
yann@552
   180
-      __textdomain(__s.c_str());
yann@552
   181
+      textdomain(__s.c_str());
yann@552
   182
       return 0;
yann@552
   183
     }
yann@552
   184
 
yann@552
   185
diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.3.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc
yann@552
   186
--- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2008-06-10 14:45:39.000000000 +0200
yann@552
   187
+++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2008-06-10 14:45:39.000000000 +0200
yann@552
   188
@@ -43,10 +43,6 @@
yann@552
   189
 #warning tailor for stub locale support
yann@552
   190
 #endif
yann@552
   191
 
yann@552
   192
-#ifndef __UCLIBC_HAS_XLOCALE__
yann@552
   193
-#define __nl_langinfo_l(N, L)         nl_langinfo((N))
yann@552
   194
-#endif
yann@552
   195
-
yann@552
   196
 namespace std
yann@552
   197
 {
yann@552
   198
   // Construct and return valid pattern consisting of some combination of:
yann@552
   199
diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.3.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc
yann@552
   200
--- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2008-06-10 14:45:39.000000000 +0200
yann@552
   201
+++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2008-06-10 14:45:39.000000000 +0200
yann@552
   202
@@ -41,9 +41,6 @@
yann@552
   203
 #ifdef __UCLIBC_MJN3_ONLY__
yann@552
   204
 #warning tailor for stub locale support
yann@552
   205
 #endif
yann@552
   206
-#ifndef __UCLIBC_HAS_XLOCALE__
yann@552
   207
-#define __nl_langinfo_l(N, L)         nl_langinfo((N))
yann@552
   208
-#endif
yann@552
   209
 
yann@552
   210
 namespace std
yann@552
   211
 {
yann@552
   212
diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-4.3.0/libstdc++-v3/config/locale/uclibc/time_members.cc
yann@552
   213
--- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/time_members.cc	2008-06-10 14:45:39.000000000 +0200
yann@552
   214
+++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/time_members.cc	2008-06-10 14:45:39.000000000 +0200
yann@552
   215
@@ -40,9 +40,6 @@
yann@552
   216
 #ifdef __UCLIBC_MJN3_ONLY__
yann@552
   217
 #warning tailor for stub locale support
yann@552
   218
 #endif
yann@552
   219
-#ifndef __UCLIBC_HAS_XLOCALE__
yann@552
   220
-#define __nl_langinfo_l(N, L)         nl_langinfo((N))
yann@552
   221
-#endif
yann@552
   222
 
yann@552
   223
 namespace std
yann@552
   224
 {