yann@1365: Original patch from: gentoo/src/patchsets/glibc/2.9/1130_all_glibc-2.4-undefine-__i686.patch
yann@1365: 
yann@1365: -= BEGIN original header =-
yann@1365: If gcc is configured to generate i686 code or better by default (like 
yann@1365: when using the --with-arch=pentium3 configure option), then the __i686
yann@1365: macro will always be defined automatically and thus screw up the
yann@1365: compilation of some .S files.
yann@1365: http://bugs.gentoo.org/131108
yann@1365: http://sourceware.org/ml/libc-alpha/2006-04/msg00090.html
yann@1365: 
yann@1365: 2006-04-25  Mike Frysinger  <vapier@gentoo.org>
yann@1365: 
yann@1365: 	* sysdeps/i386/sysdep.h (__i686): Undefine.
yann@1365: 
yann@1365: -= END original header =-
yann@1365: 
yann@1365: diff -durN glibc-2_9.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2_9/nptl/sysdeps/pthread/pt-initfini.c
yann@1365: --- glibc-2_9.orig/nptl/sysdeps/pthread/pt-initfini.c	2007-06-17 20:02:01.000000000 +0200
yann@1365: +++ glibc-2_9/nptl/sysdeps/pthread/pt-initfini.c	2009-02-02 22:01:09.000000000 +0100
yann@1365: @@ -45,6 +45,9 @@
yann@1365:  /* Embed an #include to pull in the alignment and .end directives. */
yann@1365:  asm ("\n#include \"defs.h\"");
yann@1365:  
yann@1365: +/* Embed an #include to pull in asm settings. */
yann@1365: +asm ("\n#ifdef __i686__\n#include <sysdep.h>\n#endif");
yann@1365: +
yann@1365:  /* The initial common code ends here. */
yann@1365:  asm ("\n/*@HEADER_ENDS*/");
yann@1365:  
yann@1365: diff -durN glibc-2_9.orig/sysdeps/i386/sysdep.h glibc-2_9/sysdeps/i386/sysdep.h
yann@1365: --- glibc-2_9.orig/sysdeps/i386/sysdep.h	2006-10-28 08:44:03.000000000 +0200
yann@1365: +++ glibc-2_9/sysdeps/i386/sysdep.h	2009-02-02 22:01:09.000000000 +0100
yann@1365: @@ -18,6 +18,14 @@
yann@1365:     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
yann@1365:     02111-1307 USA.  */
yann@1365:  
yann@1365: +/*
yann@1365: + * When building for i686 targets or better, gcc automatically defines
yann@1365: + * '__i686' to '1' for us which causes trouble when using section names
yann@1365: + * like '__i686.get_pc_thunk.reg'.  Since we check for __i686__ in the
yann@1365: + * code, killing '__i686' shouldn't be a problem.
yann@1365: + */
yann@1365: +#undef __i686
yann@1365: +
yann@1365:  #include <sysdeps/generic/sysdep.h>
yann@1365:  
yann@1365:  #ifdef	__ASSEMBLER__