|
yann@1
|
1 |
|
|
yann@1
|
2 |
Fixes? the following error when building with gcc-4.0.0:
|
|
yann@1
|
3 |
|
|
yann@1
|
4 |
../string/strcoll.c:39: error: '__EI_strcoll' aliased to undefined symbol '__GI_strcoll'
|
|
yann@1
|
5 |
make[2]: *** [/home/dank/crosstool-0.32/build/i686-unknown-linux-gnu/gcc-4.0.0-20050410-glibc-2.3.4/build-glibc/wcsmbs/wcscoll.os] Error 1
|
|
yann@1
|
6 |
make[2]: Leaving directory `/home/dank/crosstool-0.32/build/i686-unknown-linux-gnu/gcc-4.0.0-20050410-glibc-2.3.4/glibc-2.3.4/wcsmbs'
|
|
yann@1
|
7 |
|
|
yann@1
|
8 |
|
|
yann@1
|
9 |
Thu Mar 17 21:06:24 2005 UTC (3 weeks, 5 days ago) by roland
|
|
yann@1
|
10 |
Branch: MAIN
|
|
yann@1
|
11 |
CVS Tags: fedora-glibc-20050405T2114, fedora-glibc-20050401T1444, fedora-glibc-20050324T0715, fedora-glibc-20050319T1907, HEAD
|
|
yann@1
|
12 |
|
|
yann@1
|
13 |
2005-03-16 Richard Henderson <rth@redhat.com>
|
|
yann@1
|
14 |
|
|
yann@1
|
15 |
* include/wchar.h (__wcscoll): Remove.
|
|
yann@1
|
16 |
* wcsmbs/wcscoll.c: Define wcscoll directly instead of via __wcscoll.
|
|
yann@1
|
17 |
* string/strcoll.c: Don't issue libc_hidden_def STRCOLL redefined.
|
|
yann@1
|
18 |
|
|
yann@1
|
19 |
http://sourceware.org/cgi-bin/cvsweb.cgi/libc/string/strcoll.c.diff?r1=1.33&r2=1.34&cvsroot=glibc
|
|
yann@1
|
20 |
http://sourceware.org/cgi-bin/cvsweb.cgi/libc/include/wchar.h.diff?r1=1.26&r2=1.27&cvsroot=glibc
|
|
yann@1
|
21 |
http://sourceware.org/cgi-bin/cvsweb.cgi/libc/wcsmbs/wcscoll.c.diff?r1=1.13&r2=1.14&cvsroot=glibc
|
|
yann@1
|
22 |
|
|
yann@1
|
23 |
===================================================================
|
|
yann@1
|
24 |
RCS file: /cvs/glibc/libc/string/strcoll.c,v
|
|
yann@1
|
25 |
retrieving revision 1.33
|
|
yann@1
|
26 |
retrieving revision 1.34
|
|
yann@1
|
27 |
diff -u -r1.33 -r1.34
|
|
yann@1
|
28 |
--- libc/string/strcoll.c 2004/03/14 20:51:30 1.33
|
|
yann@1
|
29 |
+++ libc/string/strcoll.c 2005/03/17 21:06:24 1.34
|
|
yann@1
|
30 |
@@ -23,6 +23,7 @@
|
|
yann@1
|
31 |
# define STRING_TYPE char
|
|
yann@1
|
32 |
# define STRCOLL strcoll
|
|
yann@1
|
33 |
# define STRCOLL_L __strcoll_l
|
|
yann@1
|
34 |
+# define USE_HIDDEN_DEF
|
|
yann@1
|
35 |
#endif
|
|
yann@1
|
36 |
|
|
yann@1
|
37 |
#include "../locale/localeinfo.h"
|
|
yann@1
|
38 |
@@ -35,6 +36,7 @@
|
|
yann@1
|
39 |
{
|
|
yann@1
|
40 |
return STRCOLL_L (s1, s2, _NL_CURRENT_LOCALE);
|
|
yann@1
|
41 |
}
|
|
yann@1
|
42 |
-#if !defined WIDE_CHAR_VERSION
|
|
yann@1
|
43 |
-libc_hidden_def (strcoll)
|
|
yann@1
|
44 |
+
|
|
yann@1
|
45 |
+#ifdef USE_HIDDEN_DEF
|
|
yann@1
|
46 |
+libc_hidden_def (STRCOLL)
|
|
yann@1
|
47 |
#endif
|
|
yann@1
|
48 |
===================================================================
|
|
yann@1
|
49 |
RCS file: /cvs/glibc/libc/include/wchar.h,v
|
|
yann@1
|
50 |
retrieving revision 1.26
|
|
yann@1
|
51 |
retrieving revision 1.27
|
|
yann@1
|
52 |
diff -u -r1.26 -r1.27
|
|
yann@1
|
53 |
--- libc/include/wchar.h 2004/03/14 20:45:10 1.26
|
|
yann@1
|
54 |
+++ libc/include/wchar.h 2005/03/17 21:06:24 1.27
|
|
yann@1
|
55 |
@@ -56,7 +56,6 @@
|
|
yann@1
|
56 |
extern int __wcsncasecmp (__const wchar_t *__s1, __const wchar_t *__s2,
|
|
yann@1
|
57 |
size_t __n)
|
|
yann@1
|
58 |
__attribute_pure__;
|
|
yann@1
|
59 |
-extern int __wcscoll (__const wchar_t *__s1, __const wchar_t *__s2);
|
|
yann@1
|
60 |
extern size_t __wcslen (__const wchar_t *__s) __attribute_pure__;
|
|
yann@1
|
61 |
extern size_t __wcsnlen (__const wchar_t *__s, size_t __maxlen)
|
|
yann@1
|
62 |
__attribute_pure__;
|
|
yann@1
|
63 |
===================================================================
|
|
yann@1
|
64 |
RCS file: /cvs/glibc/libc/wcsmbs/wcscoll.c,v
|
|
yann@1
|
65 |
retrieving revision 1.13
|
|
yann@1
|
66 |
retrieving revision 1.14
|
|
yann@1
|
67 |
diff -u -r1.13 -r1.14
|
|
yann@1
|
68 |
--- libc/wcsmbs/wcscoll.c 2004/03/14 21:05:48 1.13
|
|
yann@1
|
69 |
+++ libc/wcsmbs/wcscoll.c 2005/03/17 21:06:24 1.14
|
|
yann@1
|
70 |
@@ -22,12 +22,11 @@
|
|
yann@1
|
71 |
|
|
yann@1
|
72 |
#define STRING_TYPE wchar_t
|
|
yann@1
|
73 |
#define USTRING_TYPE wint_t
|
|
yann@1
|
74 |
-#define STRCOLL __wcscoll
|
|
yann@1
|
75 |
+#define STRCOLL wcscoll
|
|
yann@1
|
76 |
#define STRCOLL_L __wcscoll_l
|
|
yann@1
|
77 |
|
|
yann@1
|
78 |
#include "../string/strcoll.c"
|
|
yann@1
|
79 |
|
|
yann@1
|
80 |
#ifndef USE_IN_EXTENDED_LOCALE_MODEL
|
|
yann@1
|
81 |
-weak_alias (__wcscoll, wcscoll)
|
|
yann@1
|
82 |
libc_hidden_weak (wcscoll)
|
|
yann@1
|
83 |
#endif
|