|
yann@1
|
1 |
Backport from cvs
|
|
yann@1
|
2 |
|
|
yann@1
|
3 |
Fixes:
|
|
yann@1
|
4 |
|
|
yann@1
|
5 |
../sysdeps/unix/sysv/linux/errlist.c:41: weak declaration of `_old_sys_nerr' must precede definition
|
|
yann@1
|
6 |
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
|
7 |
|
|
yann@1
|
8 |
as well as breakage on arches where ; is a comment char in asm
|
|
yann@1
|
9 |
|
|
yann@1
|
10 |
--- glibc-2.1.3/sysdeps/unix/sysv/linux/errlist.c.old 2004-03-05 15:32:21.000000000 -0800
|
|
yann@1
|
11 |
+++ glibc-2.1.3/sysdeps/unix/sysv/linux/errlist.c 2004-03-05 15:39:39.000000000 -0800
|
|
yann@1
|
12 |
@@ -24,13 +24,13 @@
|
|
yann@1
|
13 |
# define SYS_ERRLIST __new_sys_errlist
|
|
yann@1
|
14 |
# define SYS_NERR __new_sys_nerr
|
|
yann@1
|
15 |
|
|
yann@1
|
16 |
-asm (".data; .globl __old_sys_errlist; __old_sys_errlist:");
|
|
yann@1
|
17 |
+asm (".data\n\t.globl __old_sys_errlist\n\t __old_sys_errlist:");
|
|
yann@1
|
18 |
#endif
|
|
yann@1
|
19 |
|
|
yann@1
|
20 |
#include <sysdeps/gnu/errlist.c>
|
|
yann@1
|
21 |
|
|
yann@1
|
22 |
#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING
|
|
yann@1
|
23 |
-asm (".type __old_sys_errlist,@object;.size __old_sys_errlist,"
|
|
yann@1
|
24 |
+asm (".type __old_sys_errlist,@object\n\t.size __old_sys_errlist,"
|
|
yann@1
|
25 |
OLD_ERRLIST_SIZE_STR "*" PTR_SIZE_STR);
|
|
yann@1
|
26 |
|
|
yann@1
|
27 |
extern const char *const *__old_sys_errlist;
|
|
yann@1
|
28 |
@@ -38,17 +38,16 @@
|
|
yann@1
|
29 |
const int __old_sys_nerr = OLD_ERRLIST_SIZE;
|
|
yann@1
|
30 |
|
|
yann@1
|
31 |
strong_alias (__old_sys_nerr, _old_sys_nerr);
|
|
yann@1
|
32 |
-weak_alias (__old_sys_nerr, _old_sys_nerr)
|
|
yann@1
|
33 |
symbol_version (__old_sys_nerr, _sys_nerr, GLIBC_2.0);
|
|
yann@1
|
34 |
symbol_version (_old_sys_nerr, sys_nerr, GLIBC_2.0);
|
|
yann@1
|
35 |
-weak_alias (__old_sys_errlist, _old_sys_errlist);
|
|
yann@1
|
36 |
+strong_alias (__old_sys_errlist, _old_sys_errlist);
|
|
yann@1
|
37 |
symbol_version (__old_sys_errlist, _sys_errlist, GLIBC_2.0);
|
|
yann@1
|
38 |
symbol_version (_old_sys_errlist, sys_errlist, GLIBC_2.0);
|
|
yann@1
|
39 |
|
|
yann@1
|
40 |
-weak_alias (__new_sys_nerr, _new_sys_nerr)
|
|
yann@1
|
41 |
+strong_alias (__new_sys_nerr, _new_sys_nerr)
|
|
yann@1
|
42 |
default_symbol_version (__new_sys_nerr, _sys_nerr, GLIBC_2.1);
|
|
yann@1
|
43 |
default_symbol_version (_new_sys_nerr, sys_nerr, GLIBC_2.1);
|
|
yann@1
|
44 |
-weak_alias (__new_sys_errlist, _new_sys_errlist)
|
|
yann@1
|
45 |
+strong_alias (__new_sys_errlist, _new_sys_errlist)
|
|
yann@1
|
46 |
default_symbol_version (__new_sys_errlist, _sys_errlist, GLIBC_2.1);
|
|
yann@1
|
47 |
default_symbol_version (_new_sys_errlist, sys_errlist, GLIBC_2.1);
|
|
yann@1
|
48 |
|