source: scripts/patches/glibc-2.3.5-allow-gcc4-string.patch@ 4af05f3

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 4af05f3 was 7f65c0e, checked in by Jim Gifford <clfs@…>, 19 years ago

r625@server (orig r623): jim | 2005-10-31 12:43:24 -0800
Final Move
  • Property mode set to 100644
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
     
    2323# define STRING_TYPE char
    2424# define STRCOLL strcoll
    2525# define STRCOLL_L __strcoll_l
     26# define USE_HIDDEN_DEF
    2627#endif
    2728
    2829#include "../locale/localeinfo.h"
    … …  
    3536{
    3637  return STRCOLL_L (s1, s2, _NL_CURRENT_LOCALE);
    3738}
    38 #if !defined WIDE_CHAR_VERSION
    39 libc_hidden_def (strcoll)
     39
     40#ifdef USE_HIDDEN_DEF
     41libc_hidden_def (STRCOLL)
    4042#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
     
    5656extern int __wcsncasecmp (__const wchar_t *__s1, __const wchar_t *__s2,
    5757                          size_t __n)
    5858     __attribute_pure__;
    59 extern int __wcscoll (__const wchar_t *__s1, __const wchar_t *__s2);
    6059extern size_t __wcslen (__const wchar_t *__s) __attribute_pure__;
    6160extern size_t __wcsnlen (__const wchar_t *__s, size_t __maxlen)
    6261     __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
     
    2222
    2323#define STRING_TYPE wchar_t
    2424#define USTRING_TYPE wint_t
    25 #define STRCOLL __wcscoll
     25#define STRCOLL wcscoll
    2626#define STRCOLL_L __wcscoll_l
    2727
    2828#include "../string/strcoll.c"
    2929
    3030#ifndef USE_IN_EXTENDED_LOCALE_MODEL
    31 weak_alias (__wcscoll, wcscoll)
    3231libc_hidden_weak (wcscoll)
    3332#endif
Note: See TracBrowser for help on using the repository browser.