patches/glibc/2.7/130-i686-assembler.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:06:16 2011 +0200 (2011-05-19)
changeset 2461 ec30b191f0e3
parent 744 4bf8448536d5
permissions -rw-r--r--
complibs/ppl: build only C and C++ interfaces for PPL

By default, PPL wants to build interfaces for any of a variety of
langauges it finds on the local host (python, java, possibly perl, also
more esoteric languages such as ocaml and prolog).

These extra interfaces can double the compile time for the library. For
single-process builds, I found a savings of more than 40%:

default / j1: 716s total, 143.2s avg, 0.52s stdev
just_c / j1: 406s total, 81.2s avg, 0.33s stdev
just_c_cpp / j1: 413s total, 82.6s avg, 0.22s stdev

And for multi-process builds, it approached 50%:

default / j4: 625s total, 125.0s avg, 0.57s stdev
just_c / j4: 338s total, 67.6s avg, 1.25s stdev
just_c_cpp / j4: 327s total, 65.4s avg, 0.36s stdev

Since the PPL we build within ct-ng is only used by GCC, we only need to
build the C and C++ interfaces.

Signed-Off-By: Anthony Foiani <anthony.foiani@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 
     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