From: Mike Frysinger Date: Tue, 1 Nov 2011 18:58:26 +0100 Subject: [PATCH] undefine __i686 If gcc is configured to generate i686 code or better by default (like when using the --with-arch=pentium3 configure option), then the __i686 macro will always be defined automatically and thus screw up the compilation of some .S files. http://bugs.gentoo.org/131108 http://sourceware.org/ml/libc-alpha/2006-04/msg00090.html 2006-04-25 Mike Frysinger * sysdeps/i386/sysdep.h (__i686): Undefine. --- nptl/sysdeps/pthread/pt-initfini.c | 3 +++ sysdeps/i386/sysdep.h | 8 ++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/nptl/sysdeps/pthread/pt-initfini.c b/nptl/sysdeps/pthread/pt-initfini.c index 9c00dc0..4e46b3f 100644 --- a/nptl/sysdeps/pthread/pt-initfini.c +++ b/nptl/sysdeps/pthread/pt-initfini.c @@ -45,6 +45,9 @@ /* Embed an #include to pull in the alignment and .end directives. */ asm ("\n#include \"defs.h\""); +/* Embed an #include to pull in asm settings. */ +asm ("\n#ifdef __i686__\n#include \n#endif"); + /* The initial common code ends here. */ asm ("\n/*@HEADER_ENDS*/"); diff --git a/sysdeps/i386/sysdep.h b/sysdeps/i386/sysdep.h index efdc82d..3327c10 100644 --- a/sysdeps/i386/sysdep.h +++ b/sysdeps/i386/sysdep.h @@ -18,6 +18,14 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +/* + * When building for i686 targets or better, gcc automatically defines + * '__i686' to '1' for us which causes trouble when using section names + * like '__i686.get_pc_thunk.reg'. Since we check for __i686__ in the + * code, killing '__i686' shouldn't be a problem. + */ +#undef __i686 + #include #ifdef __ASSEMBLER__