Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.7/130-i686-assembler.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Thu Jul 28 22:09:31 2011 +0200 (2011-07-28)
changeset 2573 424fa2092ace
parent 744 4bf8448536d5
permissions -rw-r--r--
scripts/libc: do not build add-ons by default

Currently, no --enable-add-ons option is passed to libc configure when
"$(do_libc_add_ons_list ,)" is empty, which makes configure automatically search
for present add-ons. In that case, all present add-ons are built, although
no add-on was selected by the user in the config. Moreover, this can make the
configure fail if some non-standard add-ons like eglibc-localedef are present.

This behavior also leads to an inconsistency from a user point of view between
the following cases:
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS="none" in the config,
which makes "$(do_libc_add_ons_list ,)" return "", so all present add-ons
are built.
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS!="none" in the
config, which makes "$(do_libc_add_ons_list ,)" return the add-on supporting
the chosen threading implementation, e.g. "nptl", so only this add-on is
built.

This patch disables the building of all add-ons in that case.

It is still possible to build all present add-ons by adding --enable-add-ons to
LIBC_GLIBC_EXTRA_CONFIG_ARRAY.

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.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 

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

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

     8 

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

    10 

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

    12 

    13 Index: glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h

    14 ===================================================================

    15 --- glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h	(revision 1469)

    16 +++ glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h	(working copy)

    17 @@ -29,6 +29,10 @@

    18  #include <dl-sysdep.h>

    19  #include <tls.h>

    20 

    21 +#if defined __i686 && defined __ASSEMBLER__

    22 +#undef __i686

    23 +#define __i686 __i686

    24 +#endif

    25 

    26  /* For Linux we can use the system call table in the header file

    27  	/usr/include/asm/unistd.h

    28 Index: glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c

    29 ===================================================================

    30 --- glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c	(revision 1469)

    31 +++ glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c	(working copy)

    32 @@ -45,6 +45,11 @@

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

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

    35 

    36 +asm ("\n#if defined __i686 && defined __ASSEMBLER__");

    37 +asm ("\n#undef __i686");

    38 +asm ("\n#define __i686 __i686");

    39 +asm ("\n#endif");

    40 +

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

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

    43
crosstool-ng