From c0800dc7b51019fea1ea09843031e7cb0a8d62e6 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Wed, 6 Apr 2011 20:15:40 +0200 Subject: libc/glibc: fix cross-compiling to i686 In OE-lite we use the attached patch for building i686 cross compilers. Thanks to Khem Raj for original patch :-) At the same time, remove the corresponding patch that was in the ports patchset. CC: Khem Raj Signed-off-by: Esben Haabendal [yann.morin.1998@anciens.enib.fr: remove patch from ports] Signed-off-by: "Yann E. MORIN" --- patches/glibc/2.12.1/900-march-i686.patch | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 patches/glibc/2.12.1/900-march-i686.patch (limited to 'patches/glibc/2.12.1') diff --git a/patches/glibc/2.12.1/900-march-i686.patch b/patches/glibc/2.12.1/900-march-i686.patch new file mode 100644 index 00000000..7f5b1cee --- /dev/null +++ b/patches/glibc/2.12.1/900-march-i686.patch @@ -0,0 +1,34 @@ +2007-02-15 Khem Raj + + * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686. + * nptl/sysdeps/pthread/pt-initfini.c: Ditto. + +diff -urN glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.1/nptl/sysdeps/pthread/pt-initfini.c +--- glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c 2009-10-30 18:17:08.000000000 +0100 ++++ glibc-2.12.1/nptl/sysdeps/pthread/pt-initfini.c 2010-12-30 11:36:19.858708534 +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 -urN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.12.1/sysdeps/unix/sysv/linux/i386/sysdep.h +--- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h 2009-10-30 18:17:08.000000000 +0100 ++++ glibc-2.12.1/sysdeps/unix/sysv/linux/i386/sysdep.h 2010-12-30 11:36:19.858708534 +0100 +@@ -29,6 +29,10 @@ + #include + #include + ++#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 -- cgit v1.2.3