Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/ports-2.10.1/290-undefine-__i686.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Jan 03 23:40:22 2011 +0100 (2011-01-03)
changeset 2267 7af68e6083aa
permissions -rw-r--r--
libc-glibc: remove 2.3.6

This is an obsolete version which is no longer used by any sample (the only
user, the ia64 sample, has been removed).

It also makes the code path a bit complex, with twists just to accomodate
that version. Removing the version will make those twists go away, and
will ease commonalisation of glibc and eglibc in the future (hopefully!).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 
     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__
crosstool-ng