diff options
author | root <root@rshg054.dnsready.net> | 2012-06-10 00:04:00 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-06-10 00:04:00 +0000 |
commit | 7b2739f21a7ed0d52497fa381c9a2383e71ab7a8 (patch) | |
tree | e92096f88e034d79e6f814971f98eb098c0abd80 /multilib-testing/lib32-glibc/glibc-__i686.patch | |
parent | 0c7e29df5c6742895884a0bbcf86381f8e601782 (diff) |
Sun Jun 10 00:04:00 UTC 2012
Diffstat (limited to 'multilib-testing/lib32-glibc/glibc-__i686.patch')
-rw-r--r-- | multilib-testing/lib32-glibc/glibc-__i686.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch new file mode 100644 index 000000000..16f84c536 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-__i686.patch @@ -0,0 +1,31 @@ +diff --git a/nptl/sysdeps/pthread/pt-initfini.c b/nptl/sysdeps/pthread/pt-initfini.c +index 9c00dc0..f5d4df8 100644 +--- a/nptl/sysdeps/pthread/pt-initfini.c ++++ b/nptl/sysdeps/pthread/pt-initfini.c +@@ -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 --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h +index 64ef400..726b1df 100644 +--- a/sysdeps/unix/sysv/linux/i386/sysdep.h ++++ b/sysdeps/unix/sysv/linux/i386/sysdep.h +@@ -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 |