1.1 --- a/patches/glibc/2.7/160-glibc-2.7-i686-assembler.patch Mon Jul 28 11:43:29 2008 +0000
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,43 +0,0 @@
1.4 -If gcc is configured to generate i686 code or better by default (like
1.5 -when using the --with-arch=pentium3 configure option), then the __i686
1.6 -macro will always be defined automatically and thus screw up the
1.7 -compilation of some .S files.
1.8 -
1.9 -http://bugs.gentoo.org/131108
1.10 -http://sourceware.org/ml/libc-alpha/2006-04/msg00090.html
1.11 -
1.12 -2006-04-25 Mike Frysinger <vapier@gentoo.org>
1.13 -
1.14 - * sysdeps/i386/sysdep.h (__i686): Undefine.
1.15 -
1.16 -Index: glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h
1.17 -===================================================================
1.18 ---- glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h (revision 1469)
1.19 -+++ glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h (working copy)
1.20 -@@ -29,6 +29,10 @@
1.21 - #include <dl-sysdep.h>
1.22 - #include <tls.h>
1.23 -
1.24 -+#if defined __i686 && defined __ASSEMBLER__
1.25 -+#undef __i686
1.26 -+#define __i686 __i686
1.27 -+#endif
1.28 -
1.29 - /* For Linux we can use the system call table in the header file
1.30 - /usr/include/asm/unistd.h
1.31 -Index: glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c
1.32 -===================================================================
1.33 ---- glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c (revision 1469)
1.34 -+++ glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c (working copy)
1.35 -@@ -45,6 +45,11 @@
1.36 - /* Embed an #include to pull in the alignment and .end directives. */
1.37 - asm ("\n#include \"defs.h\"");
1.38 -
1.39 -+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
1.40 -+asm ("\n#undef __i686");
1.41 -+asm ("\n#define __i686 __i686");
1.42 -+asm ("\n#endif");
1.43 -+
1.44 - /* The initial common code ends here. */
1.45 - asm ("\n/*@HEADER_ENDS*/");
1.46 -