Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/glibc/patches/glibc-2.3.5-gcc4_fix_string-1.patch

    Contents of /trunk/glibc/patches/glibc-2.3.5-gcc4_fix_string-1.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 144 - (show annotations) (download)
    Tue May 8 20:06:05 2007 UTC (16 years, 11 months ago) by niro
    File size: 2104 byte(s) 
    -import
    1 Submitted By: Matthew Burgess <matthew@linuxfromscratch.org>
    2 Date: 2005-07-15
    3 Initial Package Version: 2.3.5
    4 Upstream Status: From Upstream
    5 Origin: Ryan Oliver, courtesy of Dan Kegel's crosstool
    6 (http://kegel.com/crosstool/)
    7 Description: Fixes a compilation problem with gcc-4.0.x that results in:
    8 ../string/strcoll.c:39: error: '__EI_strcoll' aliased to undefined
    9 symbol '__GI_strcoll'
    10
    11 diff -Naur glibc-2.3.5.orig/include/wchar.h glibc-2.3.5/include/wchar.h
    12 --- glibc-2.3.5.orig/include/wchar.h 2004-03-14 20:45:10.000000000 +0000
    13 +++ glibc-2.3.5/include/wchar.h 2005-07-15 18:17:51.206515632 +0000
    14 @@ -56,7 +56,6 @@
    15 extern int __wcsncasecmp (__const wchar_t *__s1, __const wchar_t *__s2,
    16 size_t __n)
    17 __attribute_pure__;
    18 -extern int __wcscoll (__const wchar_t *__s1, __const wchar_t *__s2);
    19 extern size_t __wcslen (__const wchar_t *__s) __attribute_pure__;
    20 extern size_t __wcsnlen (__const wchar_t *__s, size_t __maxlen)
    21 __attribute_pure__;
    22 diff -Naur glibc-2.3.5.orig/string/strcoll.c glibc-2.3.5/string/strcoll.c
    23 --- glibc-2.3.5.orig/string/strcoll.c 2004-03-14 20:51:30.000000000 +0000
    24 +++ glibc-2.3.5/string/strcoll.c 2005-07-15 18:17:51.205515784 +0000
    25 @@ -23,6 +23,7 @@
    26 # define STRING_TYPE char
    27 # define STRCOLL strcoll
    28 # define STRCOLL_L __strcoll_l
    29 +# define USE_HIDDEN_DEF
    30 #endif
    31
    32 #include "../locale/localeinfo.h"
    33 @@ -35,6 +36,7 @@
    34 {
    35 return STRCOLL_L (s1, s2, _NL_CURRENT_LOCALE);
    36 }
    37 -#if !defined WIDE_CHAR_VERSION
    38 -libc_hidden_def (strcoll)
    39 +
    40 +#ifdef USE_HIDDEN_DEF
    41 +libc_hidden_def (STRCOLL)
    42 #endif
    43 diff -Naur glibc-2.3.5.orig/wcsmbs/wcscoll.c glibc-2.3.5/wcsmbs/wcscoll.c
    44 --- glibc-2.3.5.orig/wcsmbs/wcscoll.c 2004-03-14 21:05:48.000000000 +0000
    45 +++ glibc-2.3.5/wcsmbs/wcscoll.c 2005-07-15 18:17:51.206515632 +0000
    46 @@ -22,12 +22,11 @@
    47
    48 #define STRING_TYPE wchar_t
    49 #define USTRING_TYPE wint_t
    50 -#define STRCOLL __wcscoll
    51 +#define STRCOLL wcscoll
    52 #define STRCOLL_L __wcscoll_l
    53
    54 #include "../string/strcoll.c"
    55
    56 #ifndef USE_IN_EXTENDED_LOCALE_MODEL
    57 -weak_alias (__wcscoll, wcscoll)
    58 libc_hidden_weak (wcscoll)
    59 #endif