source:
scripts/patches/glibc-2.3.5-allow-gcc4-string.patch@
f2d3163
Last change on this file since f2d3163 was 7f65c0e, checked in by , 19 years ago | |
---|---|
|
|
File size: 3.2 KB |
-
libc/string/strcoll.c
Submitted By: Ryan Oliver <ryan.oliver@pha.com.au> Date: 2005-05-03 Initial Package Version: 2.3.4 Origin: Dan Kegel's crosstool ( http://kegel.com/crosstool/ ) Upstream Status: in glibc cvs ( see below for details ) Description: Fixes? the following error when building with gcc-4.0.0: ../string/strcoll.c:39: error: '__EI_strcoll' aliased to undefined symbol '__GI_strcoll' 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 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' Thu Mar 17 21:06:24 2005 UTC (3 weeks, 5 days ago) by roland Branch: MAIN CVS Tags: fedora-glibc-20050405T2114, fedora-glibc-20050401T1444, fedora-glibc-20050324T0715, fedora-glibc-20050319T1907, HEAD 2005-03-16 Richard Henderson <rth@redhat.com> * include/wchar.h (__wcscoll): Remove. * wcsmbs/wcscoll.c: Define wcscoll directly instead of via __wcscoll. * string/strcoll.c: Don't issue libc_hidden_def STRCOLL redefined. http://sourceware.org/cgi-bin/cvsweb.cgi/libc/string/strcoll.c.diff?r1=1.33&r2=1.34&cvsroot=glibc http://sourceware.org/cgi-bin/cvsweb.cgi/libc/include/wchar.h.diff?r1=1.26&r2=1.27&cvsroot=glibc http://sourceware.org/cgi-bin/cvsweb.cgi/libc/wcsmbs/wcscoll.c.diff?r1=1.13&r2=1.14&cvsroot=glibc RCS file: /cvs/glibc/libc/string/strcoll.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34
23 23 # define STRING_TYPE char 24 24 # define STRCOLL strcoll 25 25 # define STRCOLL_L __strcoll_l 26 # define USE_HIDDEN_DEF 26 27 #endif 27 28 28 29 #include "../locale/localeinfo.h" … … 35 36 { 36 37 return STRCOLL_L (s1, s2, _NL_CURRENT_LOCALE); 37 38 } 38 #if !defined WIDE_CHAR_VERSION 39 libc_hidden_def (strcoll) 39 40 #ifdef USE_HIDDEN_DEF 41 libc_hidden_def (STRCOLL) 40 42 #endif -
libc/include/wchar.h
RCS file: /cvs/glibc/libc/include/wchar.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27
56 56 extern int __wcsncasecmp (__const wchar_t *__s1, __const wchar_t *__s2, 57 57 size_t __n) 58 58 __attribute_pure__; 59 extern int __wcscoll (__const wchar_t *__s1, __const wchar_t *__s2);60 59 extern size_t __wcslen (__const wchar_t *__s) __attribute_pure__; 61 60 extern size_t __wcsnlen (__const wchar_t *__s, size_t __maxlen) 62 61 __attribute_pure__; -
libc/wcsmbs/wcscoll.c
RCS file: /cvs/glibc/libc/wcsmbs/wcscoll.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14
22 22 23 23 #define STRING_TYPE wchar_t 24 24 #define USTRING_TYPE wint_t 25 #define STRCOLL __wcscoll25 #define STRCOLL wcscoll 26 26 #define STRCOLL_L __wcscoll_l 27 27 28 28 #include "../string/strcoll.c" 29 29 30 30 #ifndef USE_IN_EXTENDED_LOCALE_MODEL 31 weak_alias (__wcscoll, wcscoll)32 31 libc_hidden_weak (wcscoll) 33 32 #endif
Note:
See TracBrowser
for help on using the repository browser.