Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.12.1/900-march-i686.patch
author Esben Haabendal <eha@dev.doredevelopment.dk>
Wed Apr 06 20:15:40 2011 +0200 (2011-04-06)
changeset 2378 fa3c0b3cebf6
permissions -rw-r--r--
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 <raj.khem@gmail.com>
Signed-off-by: Esben Haabendal <eha@dev.doredevelopment.dk>
[yann.morin.1998@anciens.enib.fr: remove patch from ports]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 
     1 2007-02-15  Khem Raj  <kraj@xxxxxxxxxx>

     2 

     3        * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.

     4        * nptl/sysdeps/pthread/pt-initfini.c: Ditto.

     5 

     6 diff -urN glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.1/nptl/sysdeps/pthread/pt-initfini.c

     7 --- glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-10-30 18:17:08.000000000 +0100

     8 +++ glibc-2.12.1/nptl/sysdeps/pthread/pt-initfini.c	2010-12-30 11:36:19.858708534 +0100

     9 @@ -45,6 +45,11 @@

    10  /* Embed an #include to pull in the alignment and .end directives. */

    11  asm ("\n#include \"defs.h\"");

    12  

    13 +asm ("\n#if defined __i686 && defined __ASSEMBLER__");

    14 +asm ("\n#undef __i686");

    15 +asm ("\n#define __i686 __i686");

    16 +asm ("\n#endif");

    17 +

    18  /* The initial common code ends here. */

    19  asm ("\n/*@HEADER_ENDS*/");

    20  

    21 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

    22 --- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-10-30 18:17:08.000000000 +0100

    23 +++ glibc-2.12.1/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-12-30 11:36:19.858708534 +0100

    24 @@ -29,6 +29,10 @@

    25  #include <dl-sysdep.h>

    26  #include <tls.h>

    27  

    28 +#if defined __i686 && defined __ASSEMBLER__

    29 +#undef __i686

    30 +#define __i686 __i686

    31 +#endif

    32  

    33  /* For Linux we can use the system call table in the header file

    34  	/usr/include/asm/unistd.h
crosstool-ng