Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.11.1/900-march-i686.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567) 
     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.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c

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

     8 +++ glibc-2.11.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.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h

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

    23 +++ glibc-2.11.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