eha@2378: 2007-02-15  Khem Raj  <kraj@xxxxxxxxxx>
eha@2378: 
eha@2378:        * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
eha@2378:        * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
eha@2378: 
eha@2378: diff -urN glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.1/nptl/sysdeps/pthread/pt-initfini.c
eha@2378: --- glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-10-30 18:17:08.000000000 +0100
eha@2378: +++ glibc-2.12.1/nptl/sysdeps/pthread/pt-initfini.c	2010-12-30 11:36:19.858708534 +0100
eha@2378: @@ -45,6 +45,11 @@
eha@2378:  /* Embed an #include to pull in the alignment and .end directives. */
eha@2378:  asm ("\n#include \"defs.h\"");
eha@2378:  
eha@2378: +asm ("\n#if defined __i686 && defined __ASSEMBLER__");
eha@2378: +asm ("\n#undef __i686");
eha@2378: +asm ("\n#define __i686 __i686");
eha@2378: +asm ("\n#endif");
eha@2378: +
eha@2378:  /* The initial common code ends here. */
eha@2378:  asm ("\n/*@HEADER_ENDS*/");
eha@2378:  
eha@2378: diff -urN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.12.1/sysdeps/unix/sysv/linux/i386/sysdep.h
eha@2378: --- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-10-30 18:17:08.000000000 +0100
eha@2378: +++ glibc-2.12.1/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-12-30 11:36:19.858708534 +0100
eha@2378: @@ -29,6 +29,10 @@
eha@2378:  #include <dl-sysdep.h>
eha@2378:  #include <tls.h>
eha@2378:  
eha@2378: +#if defined __i686 && defined __ASSEMBLER__
eha@2378: +#undef __i686
eha@2378: +#define __i686 __i686
eha@2378: +#endif
eha@2378:  
eha@2378:  /* For Linux we can use the system call table in the header file
eha@2378:  	/usr/include/asm/unistd.h