Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.9/350-2.4-undefine-__i686.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Thu Feb 17 21:54:07 2011 +0100 (2011-02-17)
changeset 2301 a3818c3b03e0
parent 1201 c9967a6e3b25
permissions -rw-r--r--
internals: fix stripping host binaries

The gcc used by linaro has a version number specific to Linaro, but
identifies itself with its upstream version numbering scheme.

This breaks the strip in the finish step, because the actual gcc version
is not the same as the configured one (eg. 4.5.2 vs. linaro-4.5-2011.02-0).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 
     1 Original patch from: gentoo/src/patchsets/glibc/2.9/1130_all_glibc-2.4-undefine-__i686.patch

     2 

     3 -= BEGIN original header =-

     4 If gcc is configured to generate i686 code or better by default (like 

     5 when using the --with-arch=pentium3 configure option), then the __i686

     6 macro will always be defined automatically and thus screw up the

     7 compilation of some .S files.

     8 http://bugs.gentoo.org/131108

     9 http://sourceware.org/ml/libc-alpha/2006-04/msg00090.html

    10 

    11 2006-04-25  Mike Frysinger  <vapier@gentoo.org>

    12 

    13 	* sysdeps/i386/sysdep.h (__i686): Undefine.

    14 

    15 -= END original header =-

    16 

    17 diff -durN glibc-2_9.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2_9/nptl/sysdeps/pthread/pt-initfini.c

    18 --- glibc-2_9.orig/nptl/sysdeps/pthread/pt-initfini.c	2007-06-17 20:02:01.000000000 +0200

    19 +++ glibc-2_9/nptl/sysdeps/pthread/pt-initfini.c	2009-02-02 22:01:09.000000000 +0100

    20 @@ -45,6 +45,9 @@

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

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

    23  

    24 +/* Embed an #include to pull in asm settings. */

    25 +asm ("\n#ifdef __i686__\n#include <sysdep.h>\n#endif");

    26 +

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

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

    29  

    30 diff -durN glibc-2_9.orig/sysdeps/i386/sysdep.h glibc-2_9/sysdeps/i386/sysdep.h

    31 --- glibc-2_9.orig/sysdeps/i386/sysdep.h	2006-10-28 08:44:03.000000000 +0200

    32 +++ glibc-2_9/sysdeps/i386/sysdep.h	2009-02-02 22:01:09.000000000 +0100

    33 @@ -18,6 +18,14 @@

    34     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA

    35     02111-1307 USA.  */

    36  

    37 +/*

    38 + * When building for i686 targets or better, gcc automatically defines

    39 + * '__i686' to '1' for us which causes trouble when using section names

    40 + * like '__i686.get_pc_thunk.reg'.  Since we check for __i686__ in the

    41 + * code, killing '__i686' shouldn't be a problem.

    42 + */

    43 +#undef __i686

    44 +

    45  #include <sysdeps/generic/sysdep.h>

    46  

    47  #ifdef	__ASSEMBLER__
crosstool-ng