author | Zhenqiang Chen <zhenqiang.chen@linaro.org> |
Fri Nov 18 11:32:50 2011 +0800 (2011-11-18) | |
branch | 1.13 |
changeset 2841 | 64fe22ca6e6f |
parent 744 | 4bf8448536d5 |
permissions | -rw-r--r-- |
1 2007-02-15 Khem Raj <kraj@xxxxxxxxxx>
3 * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
4 * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
8 Index: glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h
9 ===================================================================
10 --- glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h (revision 1469)
11 +++ glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h (working copy)
12 @@ -29,6 +29,10 @@
13 #include <dl-sysdep.h>
14 #include <tls.h>
16 +#if defined __i686 && defined __ASSEMBLER__
17 +#undef __i686
18 +#define __i686 __i686
19 +#endif
21 /* For Linux we can use the system call table in the header file
22 /usr/include/asm/unistd.h
23 Index: glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c
24 ===================================================================
25 --- glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c (revision 1469)
26 +++ glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c (working copy)
27 @@ -45,6 +45,11 @@
28 /* Embed an #include to pull in the alignment and .end directives. */
29 asm ("\n#include \"defs.h\"");
31 +asm ("\n#if defined __i686 && defined __ASSEMBLER__");
32 +asm ("\n#undef __i686");
33 +asm ("\n#define __i686 __i686");
34 +asm ("\n#endif");
35 +
36 /* The initial common code ends here. */
37 asm ("\n/*@HEADER_ENDS*/");