1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/glibc/2.12.2/900-march-i686.patch Sun Sep 16 14:12:22 2012 -0400
1.3 @@ -0,0 +1,34 @@
1.4 +2007-02-15 Khem Raj <kraj@xxxxxxxxxx>
1.5 +
1.6 + * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
1.7 + * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
1.8 +
1.9 +diff -urN glibc-2.12.2.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.2/nptl/sysdeps/pthread/pt-initfini.c
1.10 +--- glibc-2.12.2.orig/nptl/sysdeps/pthread/pt-initfini.c 2009-10-30 18:17:08.000000000 +0100
1.11 ++++ glibc-2.12.2/nptl/sysdeps/pthread/pt-initfini.c 2010-12-30 11:36:19.858708534 +0100
1.12 +@@ -45,6 +45,11 @@
1.13 + /* Embed an #include to pull in the alignment and .end directives. */
1.14 + asm ("\n#include \"defs.h\"");
1.15 +
1.16 ++asm ("\n#if defined __i686 && defined __ASSEMBLER__");
1.17 ++asm ("\n#undef __i686");
1.18 ++asm ("\n#define __i686 __i686");
1.19 ++asm ("\n#endif");
1.20 ++
1.21 + /* The initial common code ends here. */
1.22 + asm ("\n/*@HEADER_ENDS*/");
1.23 +
1.24 +diff -urN glibc-2.12.2.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.12.2/sysdeps/unix/sysv/linux/i386/sysdep.h
1.25 +--- glibc-2.12.2.orig/sysdeps/unix/sysv/linux/i386/sysdep.h 2009-10-30 18:17:08.000000000 +0100
1.26 ++++ glibc-2.12.2/sysdeps/unix/sysv/linux/i386/sysdep.h 2010-12-30 11:36:19.858708534 +0100
1.27 +@@ -29,6 +29,10 @@
1.28 + #include <dl-sysdep.h>
1.29 + #include <tls.h>
1.30 +
1.31 ++#if defined __i686 && defined __ASSEMBLER__
1.32 ++#undef __i686
1.33 ++#define __i686 __i686
1.34 ++#endif
1.35 +
1.36 + /* For Linux we can use the system call table in the header file
1.37 + /usr/include/asm/unistd.h