yann@434: If gcc is configured to generate i686 code or better by default (like yann@434: when using the --with-arch=pentium3 configure option), then the __i686 yann@434: macro will always be defined automatically and thus screw up the yann@434: compilation of some .S files. yann@434: yann@434: http://bugs.gentoo.org/131108 yann@434: http://sourceware.org/ml/libc-alpha/2006-04/msg00090.html yann@434: yann@434: 2006-04-25 Mike Frysinger yann@434: yann@434: * sysdeps/i386/sysdep.h (__i686): Undefine. yann@434: yann@434: Index: glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h yann@434: =================================================================== yann@434: --- glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h (revision 1469) yann@434: +++ glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h (working copy) yann@434: @@ -29,6 +29,10 @@ yann@434: #include yann@434: #include yann@434: yann@434: +#if defined __i686 && defined __ASSEMBLER__ yann@434: +#undef __i686 yann@434: +#define __i686 __i686 yann@434: +#endif yann@434: yann@434: /* For Linux we can use the system call table in the header file yann@434: /usr/include/asm/unistd.h yann@434: Index: glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c yann@434: =================================================================== yann@434: --- glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c (revision 1469) yann@434: +++ glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c (working copy) yann@434: @@ -45,6 +45,11 @@ yann@434: /* Embed an #include to pull in the alignment and .end directives. */ yann@434: asm ("\n#include \"defs.h\""); yann@434: yann@434: +asm ("\n#if defined __i686 && defined __ASSEMBLER__"); yann@434: +asm ("\n#undef __i686"); yann@434: +asm ("\n#define __i686 __i686"); yann@434: +asm ("\n#endif"); yann@434: + yann@434: /* The initial common code ends here. */ yann@434: asm ("\n/*@HEADER_ENDS*/"); yann@434: