yann@1: Backport from cvs 
yann@1: 
yann@1: Fixes:
yann@1: 
yann@1: ../sysdeps/unix/sysv/linux/errlist.c:41: weak declaration of `_old_sys_nerr' must precede definition
yann@1: make[2]: *** [/home/dank/downloads/crosstool-0.24/build/mipsel-unknown-linux-gnu/gcc-3.2.3-glibc-2.2.3/build-glibc/stdio-common/errlist.os] Error 1
yann@1: 
yann@1: as well as breakage on arches where ; is a comment char in asm
yann@1: 
yann@1: --- glibc-2.1.3/sysdeps/unix/sysv/linux/errlist.c.old	2004-03-05 15:32:21.000000000 -0800
yann@1: +++ glibc-2.1.3/sysdeps/unix/sysv/linux/errlist.c	2004-03-05 15:39:39.000000000 -0800
yann@1: @@ -24,13 +24,13 @@
yann@1:  # define SYS_ERRLIST __new_sys_errlist
yann@1:  # define SYS_NERR __new_sys_nerr
yann@1:  
yann@1: -asm (".data; .globl __old_sys_errlist;  __old_sys_errlist:");
yann@1: +asm (".data\n\t.globl __old_sys_errlist\n\t __old_sys_errlist:");
yann@1:  #endif
yann@1:  
yann@1:  #include <sysdeps/gnu/errlist.c>
yann@1:  
yann@1:  #if defined HAVE_ELF && defined PIC && defined DO_VERSIONING
yann@1: -asm (".type __old_sys_errlist,@object;.size __old_sys_errlist,"
yann@1: +asm (".type __old_sys_errlist,@object\n\t.size __old_sys_errlist,"
yann@1:       OLD_ERRLIST_SIZE_STR "*" PTR_SIZE_STR);
yann@1:  
yann@1:  extern const char *const *__old_sys_errlist;
yann@1: @@ -38,17 +38,16 @@
yann@1:  const int __old_sys_nerr = OLD_ERRLIST_SIZE;
yann@1:  
yann@1:  strong_alias (__old_sys_nerr, _old_sys_nerr);
yann@1: -weak_alias (__old_sys_nerr, _old_sys_nerr)
yann@1:  symbol_version (__old_sys_nerr, _sys_nerr, GLIBC_2.0);
yann@1:  symbol_version (_old_sys_nerr, sys_nerr, GLIBC_2.0);
yann@1: -weak_alias (__old_sys_errlist, _old_sys_errlist);
yann@1: +strong_alias (__old_sys_errlist, _old_sys_errlist);
yann@1:  symbol_version (__old_sys_errlist, _sys_errlist, GLIBC_2.0);
yann@1:  symbol_version (_old_sys_errlist, sys_errlist, GLIBC_2.0);
yann@1:  
yann@1: -weak_alias (__new_sys_nerr, _new_sys_nerr)
yann@1: +strong_alias (__new_sys_nerr, _new_sys_nerr)
yann@1:  default_symbol_version (__new_sys_nerr, _sys_nerr, GLIBC_2.1);
yann@1:  default_symbol_version (_new_sys_nerr, sys_nerr, GLIBC_2.1);
yann@1: -weak_alias (__new_sys_errlist, _new_sys_errlist)
yann@1: +strong_alias (__new_sys_errlist, _new_sys_errlist)
yann@1:  default_symbol_version (__new_sys_errlist, _sys_errlist, GLIBC_2.1);
yann@1:  default_symbol_version (_new_sys_errlist, sys_errlist, GLIBC_2.1);
yann@1: