patches/glibc/2.6/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 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 
     7 
     8 Index: glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h
     9 ===================================================================
    10 --- glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h	(revision 1469)
    11 +++ glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h	(working copy)
    12 @@ -29,6 +29,10 @@
    13  #include <dl-sysdep.h>
    14  #include <tls.h>
    15  
    16 +#if defined __i686 && defined __ASSEMBLER__
    17 +#undef __i686
    18 +#define __i686 __i686
    19 +#endif
    20  
    21  /* For Linux we can use the system call table in the header file
    22  	/usr/include/asm/unistd.h
    23 Index: glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c
    24 ===================================================================
    25 --- glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c	(revision 1469)
    26 +++ glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c	(working copy)
    27 @@ -45,6 +45,11 @@
    28  /* Embed an #include to pull in the alignment and .end directives. */
    29  asm ("\n#include \"defs.h\"");
    30  
    31 +asm ("\n#if defined __i686 && defined __ASSEMBLER__");
    32 +asm ("\n#undef __i686");
    33 +asm ("\n#define __i686 __i686");
    34 +asm ("\n#endif");
    35 +
    36  /* The initial common code ends here. */
    37  asm ("\n/*@HEADER_ENDS*/");
    38