Commonalise options common to both glibc and eglibc.
/trunk/scripts/build/libc_eglibc.sh | 6 3 3 0 +-
/trunk/config/libc/glibc.in | 63 2 61 0 +---------------------------------
/trunk/config/libc/eglibc.in | 61 1 60 0 +--------------------------------
/trunk/config/libc/eglibc-glibc-common.in | 1 1 0 0 +
/trunk/config/libc/glibc-eglibc-common.in | 69 69 0 0 +++++++++++++++++++++++++++++++++++++
5 files changed, 76 insertions(+), 124 deletions(-)
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)
13 #include <dl-sysdep.h>
16 +#if defined __i686 && defined __ASSEMBLER__
18 +#define __i686 __i686
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)
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");
36 /* The initial common code ends here. */
37 asm ("\n/*@HEADER_ENDS*/");