diff options
author | root <root@rshg054.dnsready.net> | 2012-03-31 00:01:07 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-03-31 00:01:07 +0000 |
commit | 977b78df305a06797773799a7295f2a5f3f013cf (patch) | |
tree | c2cad20a10da5fe8f8784db13a2d52b80d0199a3 /multilib-testing/lib32-glibc/glibc-__i686.patch | |
parent | 263884f95012e159a0be10444ef96bbf56e70545 (diff) |
Sat Mar 31 00:01:07 UTC 2012
Diffstat (limited to 'multilib-testing/lib32-glibc/glibc-__i686.patch')
-rw-r--r-- | multilib-testing/lib32-glibc/glibc-__i686.patch | 44 |
1 files changed, 31 insertions, 13 deletions
diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch index 28d5dd424..16f84c536 100644 --- a/multilib-testing/lib32-glibc/glibc-__i686.patch +++ b/multilib-testing/lib32-glibc/glibc-__i686.patch @@ -1,13 +1,31 @@ -diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile ---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 -+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 -@@ -1,6 +1,7 @@ - # The mpn functions need a #define for asm syntax flavor. --# Every i386 port in use uses gas syntax (I think). --asm-CPPFLAGS += -DGAS_SYNTAX -+# Every i386 port in use uses gas syntax (I think). Don't replace -+# __i686 in __i686.get_pc_thunk.bx. -+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 - - # The i386 `long double' is a distinct type we support. - long-double-fcts = yes +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 |