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