32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
|
diff -Naur glibc-2.11.1-orig/nptl/sysdeps/pthread/pt-initfini.c
|
||
|
|
glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c
|
||
|
|
--- glibc-2.11.1-orig/nptl/sysdeps/pthread/pt-initfini.c 2009-12-08 20:10:20.000000000 +0000
|
||
|
|
+++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c 2010-04-17 02:24:02.000000000 +0100
|
||
|
|
@@ -45,6 +45,11 @@
|
||
|
|
/* Embed an #include to pull in the alignment and .end directives. */
|
||
|
|
asm ("\n#include \"defs.h\"");
|
||
|
|
|
||
|
|
+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
|
||
|
|
+asm ("\n#undef __i686");
|
||
|
|
+asm ("\n#define __i686 __i686");
|
||
|
|
+asm ("\n#endif");
|
||
|
|
+
|
||
|
|
/* The initial common code ends here. */
|
||
|
|
asm ("\n/*...@header_ends*/");
|
||
|
|
|
||
|
|
diff -Naur glibc-2.11.1-orig/sysdeps/unix/sysv/linux/i386/sysdep.h
|
||
|
|
glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h
|
||
|
|
--- glibc-2.11.1-orig/sysdeps/unix/sysv/linux/i386/sysdep.h 2009-12-08 20:10:20.000000000 +0000
|
||
|
|
+++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h 2010-04-17 02:24:02.000000000 +0100
|
||
|
|
@@ -29,6 +29,10 @@
|
||
|
|
#include <dl-sysdep.h>
|
||
|
|
#include <tls.h>
|
||
|
|
|
||
|
|
+#if defined __i686 && defined __ASSEMBLER__
|
||
|
|
+#undef __i686
|
||
|
|
+#define __i686 __i686
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
/* For Linux we can use the system call table in the header file
|
||
|
|
/usr/include/asm/unistd.h
|