patches/glibc/2.7/130-i686-assembler.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:47:16 2010 +0200 (2010-07-29)
changeset 2045 fdaa6c7f6dea
parent 744 4bf8448536d5
permissions -rw-r--r--
cc/gcc: add option to compile against static libstdc++, for gcc-4.4 and newer

Idea and know-how taken from CodeSourcery build script.

Normal build:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb77f3000)
libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0xb76e8000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb75a1000)
libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb757a000)
/lib/ld-linux.so.2 (0xb77f4000)
libgcc_s.so.1 => /lib/libgcc_s.so.1 (0xb755c000)

CC_STATIC_LIBSTDCXX=y:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb7843000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb76e6000)
/lib/ld-linux.so.2 (0xb7844000)

I made CC_STATIC_LIBSTDCXX default=y since I think
it is always desirable.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
     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