yann@402: 2007-02-15  Khem Raj  <kraj@xxxxxxxxxx>
yann@402: 
yann@402:        * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
yann@402:        * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
yann@402: 
yann@402: 
yann@402: 
yann@402: Index: glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h
yann@402: ===================================================================
yann@402: --- glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h	(revision 1469)
yann@402: +++ glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h	(working copy)
yann@402: @@ -29,6 +29,10 @@
yann@402:  #include <dl-sysdep.h>
yann@402:  #include <tls.h>
yann@402:  
yann@402: +#if defined __i686 && defined __ASSEMBLER__
yann@402: +#undef __i686
yann@402: +#define __i686 __i686
yann@402: +#endif
yann@402:  
yann@402:  /* For Linux we can use the system call table in the header file
yann@402:  	/usr/include/asm/unistd.h
yann@402: Index: glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c
yann@402: ===================================================================
yann@402: --- glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c	(revision 1469)
yann@402: +++ glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c	(working copy)
yann@402: @@ -45,6 +45,11 @@
yann@402:  /* Embed an #include to pull in the alignment and .end directives. */
yann@402:  asm ("\n#include \"defs.h\"");
yann@402:  
yann@402: +asm ("\n#if defined __i686 && defined __ASSEMBLER__");
yann@402: +asm ("\n#undef __i686");
yann@402: +asm ("\n#define __i686 __i686");
yann@402: +asm ("\n#endif");
yann@402: +
yann@402:  /* The initial common code ends here. */
yann@402:  asm ("\n/*@HEADER_ENDS*/");
yann@402: