Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.10.1/900-march-i686.patch
author "Bryan Hundven" <bryanhundven@gmail.com>
Thu Mar 01 15:23:49 2012 -0800 (2012-03-01)
changeset 2909 28ac8fbd9e6a
permissions -rw-r--r--
libg/eglibc: add updated eglibc 2.15

Includes a patch to remove __builtin_expect test:

In eglibc-2.15, the build breaks in configure while testing
for the existance of __builtin_expect. It fails with newer
versions of gcc.

This patch is a modification of an upstream change in glibc
mainline (to be 2.16) to fix the following error:

[CFG ] checking for __builtin_expect... no
[ERROR] configure: error: support for __builtin_expect needed

http://sourceware.org/git/?p=glibc.git;a=commit;h=3857022a761ea7251f8e5c0e45d382ebc3e34cf9

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
[yann.morin.1998@free.fr: coalesce both patches into a single changeset]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.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.10.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.10.1/nptl/sysdeps/pthread/pt-initfini.c

     7 --- glibc-2.10.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-12-08 21:10:20.000000000 +0100

     8 +++ glibc-2.10.1/nptl/sysdeps/pthread/pt-initfini.c	2010-12-30 11:33:31.520855595 +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.10.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.10.1/sysdeps/unix/sysv/linux/i386/sysdep.h

    22 --- glibc-2.10.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-12-08 21:10:20.000000000 +0100

    23 +++ glibc-2.10.1/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-12-30 11:33:31.520855595 +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