1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/glibc/2.3.5/glibc-2.3.5-allow-gcc4-string.patch Mon Jul 09 20:55:32 2007 +0000
1.3 @@ -0,0 +1,83 @@
1.4 +
1.5 +Fixes? the following error when building with gcc-4.0.0:
1.6 +
1.7 +../string/strcoll.c:39: error: '__EI_strcoll' aliased to undefined symbol '__GI_strcoll'
1.8 +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
1.9 +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'
1.10 +
1.11 +
1.12 +Thu Mar 17 21:06:24 2005 UTC (3 weeks, 5 days ago) by roland
1.13 +Branch: MAIN
1.14 +CVS Tags: fedora-glibc-20050405T2114, fedora-glibc-20050401T1444, fedora-glibc-20050324T0715, fedora-glibc-20050319T1907, HEAD
1.15 +
1.16 +2005-03-16 Richard Henderson <rth@redhat.com>
1.17 +
1.18 + * include/wchar.h (__wcscoll): Remove.
1.19 + * wcsmbs/wcscoll.c: Define wcscoll directly instead of via __wcscoll.
1.20 + * string/strcoll.c: Don't issue libc_hidden_def STRCOLL redefined.
1.21 +
1.22 +http://sourceware.org/cgi-bin/cvsweb.cgi/libc/string/strcoll.c.diff?r1=1.33&r2=1.34&cvsroot=glibc
1.23 +http://sourceware.org/cgi-bin/cvsweb.cgi/libc/include/wchar.h.diff?r1=1.26&r2=1.27&cvsroot=glibc
1.24 +http://sourceware.org/cgi-bin/cvsweb.cgi/libc/wcsmbs/wcscoll.c.diff?r1=1.13&r2=1.14&cvsroot=glibc
1.25 +
1.26 +===================================================================
1.27 +RCS file: /cvs/glibc/libc/string/strcoll.c,v
1.28 +retrieving revision 1.33
1.29 +retrieving revision 1.34
1.30 +diff -u -r1.33 -r1.34
1.31 +--- libc/string/strcoll.c 2004/03/14 20:51:30 1.33
1.32 ++++ libc/string/strcoll.c 2005/03/17 21:06:24 1.34
1.33 +@@ -23,6 +23,7 @@
1.34 + # define STRING_TYPE char
1.35 + # define STRCOLL strcoll
1.36 + # define STRCOLL_L __strcoll_l
1.37 ++# define USE_HIDDEN_DEF
1.38 + #endif
1.39 +
1.40 + #include "../locale/localeinfo.h"
1.41 +@@ -35,6 +36,7 @@
1.42 + {
1.43 + return STRCOLL_L (s1, s2, _NL_CURRENT_LOCALE);
1.44 + }
1.45 +-#if !defined WIDE_CHAR_VERSION
1.46 +-libc_hidden_def (strcoll)
1.47 ++
1.48 ++#ifdef USE_HIDDEN_DEF
1.49 ++libc_hidden_def (STRCOLL)
1.50 + #endif
1.51 +===================================================================
1.52 +RCS file: /cvs/glibc/libc/include/wchar.h,v
1.53 +retrieving revision 1.26
1.54 +retrieving revision 1.27
1.55 +diff -u -r1.26 -r1.27
1.56 +--- libc/include/wchar.h 2004/03/14 20:45:10 1.26
1.57 ++++ libc/include/wchar.h 2005/03/17 21:06:24 1.27
1.58 +@@ -56,7 +56,6 @@
1.59 + extern int __wcsncasecmp (__const wchar_t *__s1, __const wchar_t *__s2,
1.60 + size_t __n)
1.61 + __attribute_pure__;
1.62 +-extern int __wcscoll (__const wchar_t *__s1, __const wchar_t *__s2);
1.63 + extern size_t __wcslen (__const wchar_t *__s) __attribute_pure__;
1.64 + extern size_t __wcsnlen (__const wchar_t *__s, size_t __maxlen)
1.65 + __attribute_pure__;
1.66 +===================================================================
1.67 +RCS file: /cvs/glibc/libc/wcsmbs/wcscoll.c,v
1.68 +retrieving revision 1.13
1.69 +retrieving revision 1.14
1.70 +diff -u -r1.13 -r1.14
1.71 +--- libc/wcsmbs/wcscoll.c 2004/03/14 21:05:48 1.13
1.72 ++++ libc/wcsmbs/wcscoll.c 2005/03/17 21:06:24 1.14
1.73 +@@ -22,12 +22,11 @@
1.74 +
1.75 + #define STRING_TYPE wchar_t
1.76 + #define USTRING_TYPE wint_t
1.77 +-#define STRCOLL __wcscoll
1.78 ++#define STRCOLL wcscoll
1.79 + #define STRCOLL_L __wcscoll_l
1.80 +
1.81 + #include "../string/strcoll.c"
1.82 +
1.83 + #ifndef USE_IN_EXTENDED_LOCALE_MODEL
1.84 +-weak_alias (__wcscoll, wcscoll)
1.85 + libc_hidden_weak (wcscoll)
1.86 + #endif