Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.3.4/glibc-2.3.5-allow-gcc4-string.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Feb 24 11:00:05 2007 +0000 (2007-02-24)
changeset 1 eeea35fbf182
permissions -rw-r--r--
Add the full crosstool-NG sources to the new repository of its own.
You might just say: 'Yeah! crosstool-NG's got its own repo!".
Unfortunately, that's because the previous repo got damaged beyond repair and I had no backup.
That means I'm putting backups in place in the afternoon.
That also means we've lost history... :-( 
     1 

     2 Fixes? the following error when building with gcc-4.0.0:

     3 

     4 ../string/strcoll.c:39: error: '__EI_strcoll' aliased to undefined symbol '__GI_strcoll'

     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

     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'

     7 

     8 

     9 Thu Mar 17 21:06:24 2005 UTC (3 weeks, 5 days ago) by roland

    10 Branch: MAIN

    11 CVS Tags: fedora-glibc-20050405T2114, fedora-glibc-20050401T1444, fedora-glibc-20050324T0715, fedora-glibc-20050319T1907, HEAD

    12 

    13 2005-03-16  Richard Henderson  <rth@redhat.com>

    14 

    15 	* include/wchar.h (__wcscoll): Remove.

    16 	* wcsmbs/wcscoll.c: Define wcscoll directly instead of via __wcscoll.

    17 	* string/strcoll.c: Don't issue libc_hidden_def STRCOLL redefined.

    18 

    19 http://sourceware.org/cgi-bin/cvsweb.cgi/libc/string/strcoll.c.diff?r1=1.33&r2=1.34&cvsroot=glibc

    20 http://sourceware.org/cgi-bin/cvsweb.cgi/libc/include/wchar.h.diff?r1=1.26&r2=1.27&cvsroot=glibc

    21 http://sourceware.org/cgi-bin/cvsweb.cgi/libc/wcsmbs/wcscoll.c.diff?r1=1.13&r2=1.14&cvsroot=glibc

    22 

    23 ===================================================================

    24 RCS file: /cvs/glibc/libc/string/strcoll.c,v

    25 retrieving revision 1.33

    26 retrieving revision 1.34

    27 diff -u -r1.33 -r1.34

    28 --- libc/string/strcoll.c	2004/03/14 20:51:30	1.33

    29 +++ libc/string/strcoll.c	2005/03/17 21:06:24	1.34

    30 @@ -23,6 +23,7 @@

    31  # define STRING_TYPE char

    32  # define STRCOLL strcoll

    33  # define STRCOLL_L __strcoll_l

    34 +# define USE_HIDDEN_DEF

    35  #endif

    36  

    37  #include "../locale/localeinfo.h"

    38 @@ -35,6 +36,7 @@

    39  {

    40    return STRCOLL_L (s1, s2, _NL_CURRENT_LOCALE);

    41  }

    42 -#if !defined WIDE_CHAR_VERSION

    43 -libc_hidden_def (strcoll)

    44 +

    45 +#ifdef USE_HIDDEN_DEF

    46 +libc_hidden_def (STRCOLL)

    47  #endif

    48 ===================================================================

    49 RCS file: /cvs/glibc/libc/include/wchar.h,v

    50 retrieving revision 1.26

    51 retrieving revision 1.27

    52 diff -u -r1.26 -r1.27

    53 --- libc/include/wchar.h	2004/03/14 20:45:10	1.26

    54 +++ libc/include/wchar.h	2005/03/17 21:06:24	1.27

    55 @@ -56,7 +56,6 @@

    56  extern int __wcsncasecmp (__const wchar_t *__s1, __const wchar_t *__s2,

    57  			  size_t __n)

    58       __attribute_pure__;

    59 -extern int __wcscoll (__const wchar_t *__s1, __const wchar_t *__s2);

    60  extern size_t __wcslen (__const wchar_t *__s) __attribute_pure__;

    61  extern size_t __wcsnlen (__const wchar_t *__s, size_t __maxlen)

    62       __attribute_pure__;

    63 ===================================================================

    64 RCS file: /cvs/glibc/libc/wcsmbs/wcscoll.c,v

    65 retrieving revision 1.13

    66 retrieving revision 1.14

    67 diff -u -r1.13 -r1.14

    68 --- libc/wcsmbs/wcscoll.c	2004/03/14 21:05:48	1.13

    69 +++ libc/wcsmbs/wcscoll.c	2005/03/17 21:06:24	1.14

    70 @@ -22,12 +22,11 @@

    71  

    72  #define STRING_TYPE wchar_t

    73  #define USTRING_TYPE wint_t

    74 -#define STRCOLL __wcscoll

    75 +#define STRCOLL wcscoll

    76  #define STRCOLL_L __wcscoll_l

    77  

    78  #include "../string/strcoll.c"

    79  

    80  #ifndef USE_IN_EXTENDED_LOCALE_MODEL

    81 -weak_alias (__wcscoll, wcscoll)

    82  libc_hidden_weak (wcscoll)

    83  #endif
crosstool-ng