patches/glibc/2.2.5/glibc-2.2.5-allow-gcc-3.4-weakextern.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Jul 28 21:34:41 2007 +0000 (2007-07-28)
changeset 301 2be7232a73ac
permissions -rw-r--r--
Bump version to 0.2.2.
     1 Suggested by Jake Page <jake at cs dot stanford dot edu>
     2 in http://sources.redhat.com/ml/crossgcc/2004-07/msg00169.html
     3 but the libc-symbols.h fragment has been reworked to fix typos
     4 and to still work on gcc-2.95.3, which lacks _Pragma.
     5 
     6 His comment was:
     7  Fixes gcc-3.4 optimizing out comparisons to weak external symbols in code
     8  like:
     9   if (__pthread_mutex_init != NULL)
    10     __pthread_mutex_init(...);
    11  that causes segfaults during libc init when not linked to libpthread
    12 
    13 diff -uNr glibc-2.2.5-orig/resolv/res_libc.c glibc-2.2.5/resolv/res_libc.c
    14 --- glibc-2.2.5-orig/resolv/res_libc.c	2001-02-12 12:23:34.000000000 -0800
    15 +++ glibc-2.2.5/resolv/res_libc.c	2004-07-27 22:56:32.000000000 -0700
    16 @@ -84,7 +84,8 @@
    17  
    18  #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_2)
    19  # undef res_init
    20 -strong_alias (__res_init, __res_init_weak);
    21 +extern int __res_init_weak (void);
    22  weak_extern (__res_init_weak);
    23 +strong_alias (__res_init, __res_init_weak);
    24  compat_symbol (libc, __res_init_weak, res_init, GLIBC_2_0);
    25  #endif
    26 --- glibc-2.2.5/include/libc-symbols.h.old	Fri Aug 13 04:20:55 2004
    27 +++ glibc-2.2.5/include/libc-symbols.h	Fri Aug 13 04:37:06 2004
    28 @@ -108,10 +108,16 @@
    29  
    30  /* Declare SYMBOL as weak undefined symbol (resolved to 0 if not defined).  */
    31  #  define weak_extern(symbol) _weak_extern (symbol)
    32 -#  ifdef HAVE_ASM_WEAKEXT_DIRECTIVE
    33 -#   define _weak_extern(symbol) asm (".weakext " __SYMBOL_PREFIX #symbol);
    34 -#  else
    35 -#   define _weak_extern(symbol)    asm (".weak " __SYMBOL_PREFIX #symbol);
    36 +#  if __GNUC__ >= 3
    37 +    /* see http://sources.redhat.com/ml/libc-alpha/2003-01/msg00043.html */
    38 +#   define __weak_extern_1(expr) _Pragma(#expr)
    39 +#   define _weak_extern(symbol) __weak_extern_1(weak symbol)
    40 +#  else /* __GNUC__ == 2 */
    41 +#   ifdef HAVE_ASM_WEAKEXT_DIRECTIVE
    42 +#    define _weak_extern(symbol) asm (".weakext " __SYMBOL_PREFIX #symbol);
    43 +#   else
    44 +#    define _weak_extern(symbol)    asm (".weak " __SYMBOL_PREFIX #symbol);
    45 +#   endif
    46  #  endif
    47  
    48  # else