patches/glibc/ports-2.10.1/290-undefine-__i686.patch
author Arnaud Lacombe <lacombar@gmail.com>
Tue Aug 03 06:17:51 2010 +0200 (2010-08-03)
changeset 2064 f5ebe8c429dc
permissions -rw-r--r--
libc/uClibc: add uClibc 0.9.30.3

This version has been released a couple of month ago, but it never reached
crosstool-ng tree. This may be linked to the fact that the current 0.9.30.2,
once patched, has nothing much different from 0.9.30.3, released.

I'm not including any patch with this upgrade, on purpose.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
     1 If gcc is configured to generate i686 code or better by default (like 
     2 when using the --with-arch=pentium3 configure option), then the __i686
     3 macro will always be defined automatically and thus screw up the
     4 compilation of some .S files.
     5 http://bugs.gentoo.org/131108
     6 http://sourceware.org/ml/libc-alpha/2006-04/msg00090.html
     7 
     8 2006-04-25  Mike Frysinger  <vapier@gentoo.org>
     9 
    10 	* sysdeps/i386/sysdep.h (__i686): Undefine.
    11 
    12 diff -durN glibc-2.10.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.10.1/nptl/sysdeps/pthread/pt-initfini.c
    13 --- glibc-2.10.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2007-06-17 20:02:01.000000000 +0200
    14 +++ glibc-2.10.1/nptl/sysdeps/pthread/pt-initfini.c	2009-11-13 00:50:22.000000000 +0100
    15 @@ -45,6 +45,9 @@
    16  /* Embed an #include to pull in the alignment and .end directives. */
    17  asm ("\n#include \"defs.h\"");
    18  
    19 +/* Embed an #include to pull in asm settings. */
    20 +asm ("\n#ifdef __i686__\n#include <sysdep.h>\n#endif");
    21 +
    22  /* The initial common code ends here. */
    23  asm ("\n/*@HEADER_ENDS*/");
    24  
    25 diff -durN glibc-2.10.1.orig/sysdeps/i386/sysdep.h glibc-2.10.1/sysdeps/i386/sysdep.h
    26 --- glibc-2.10.1.orig/sysdeps/i386/sysdep.h	2006-10-28 08:44:03.000000000 +0200
    27 +++ glibc-2.10.1/sysdeps/i386/sysdep.h	2009-11-13 00:50:22.000000000 +0100
    28 @@ -18,6 +18,14 @@
    29     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    30     02111-1307 USA.  */
    31  
    32 +/*
    33 + * When building for i686 targets or better, gcc automatically defines
    34 + * '__i686' to '1' for us which causes trouble when using section names
    35 + * like '__i686.get_pc_thunk.reg'.  Since we check for __i686__ in the
    36 + * code, killing '__i686' shouldn't be a problem.
    37 + */
    38 +#undef __i686
    39 +
    40  #include <sysdeps/generic/sysdep.h>
    41  
    42  #ifdef	__ASSEMBLER__