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