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