patches/glibc/2.11/900-march-i686.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Fri Jan 27 13:31:16 2012 +0100 (2012-01-27)
changeset 2854 a70abdbfa342
permissions -rw-r--r--
complibs/cloog: fix linking with libm

In Ubuntu 11.04 and 11.10, the default options for ld have changed.
--no-copy-dt-needed-entries and --as-needed are now enabled by default, which
causes errors like:

[EXTRA] Checking CLooG/ppl
[DEBUG] ==> Executing: 'make' '-j3' '-s' 'check'
[ALL ] Making check in .
[ALL ] config.status: creating include/cloog/cloog-config.h
[ALL ] config.status: include/cloog/cloog-config.h is unchanged
[ALL ] libtool: link: i686-build_pc-linux-gnu-gcc -Wall -fomit-frame-pointer
-pipe -o cloog cloog.o -L/<snip>/build/static/lib ./.libs/libcloog.a -lm
/<snip>/build/static/lib/libppl_c.a /<snip>/build/static/lib/libpwl.a
/<snip>/build/static/lib/libppl.a /<snip>/build/static/lib/libgmpxx.a
/<snip>/build/static/lib/libgmp.a -lstdc++
[ALL ] /usr/bin/ld: /<snip>/build/static/lib/libppl.a(MIP_Problem.o):
undefined reference to symbol 'sqrt@@GLIBC_2.0'
[ALL ] /usr/bin/ld: note: 'sqrt@@GLIBC_2.0' is defined in DSO
/usr/lib/gcc/i686-linux-gnu/4.6.1/../../../i386-linux-gnu/libm.so so try adding
it to the linker command line
[ALL ] /usr/lib/gcc/i686-linux-gnu/4.6.1/../../../i386-linux-gnu/libm.so:
could not read symbols: Invalid operation
[ALL ] collect2: ld returned 1 exit status
[ERROR] make[2]: *** [cloog] Error 1
[ERROR] make[1]: *** [check-recursive] Error 1

See:
https://wiki.ubuntu.com/NattyNarwhal/ToolchainTransition

This patch fixes these errors by placing '-lm' at the right place on the command
line as libppl requires libm when linking cloog.

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
eha@2378
     1
2007-02-15  Khem Raj  <kraj@xxxxxxxxxx>
eha@2378
     2
eha@2378
     3
       * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
eha@2378
     4
       * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
eha@2378
     5
eha@2378
     6
diff -urN glibc-2.11.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11/nptl/sysdeps/pthread/pt-initfini.c
eha@2378
     7
--- glibc-2.11.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-12-08 21:10:20.000000000 +0100
eha@2378
     8
+++ glibc-2.11/nptl/sysdeps/pthread/pt-initfini.c	2010-12-30 11:33:31.520855595 +0100
eha@2378
     9
@@ -45,6 +45,11 @@
eha@2378
    10
 /* Embed an #include to pull in the alignment and .end directives. */
eha@2378
    11
 asm ("\n#include \"defs.h\"");
eha@2378
    12
 
eha@2378
    13
+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
eha@2378
    14
+asm ("\n#undef __i686");
eha@2378
    15
+asm ("\n#define __i686 __i686");
eha@2378
    16
+asm ("\n#endif");
eha@2378
    17
+
eha@2378
    18
 /* The initial common code ends here. */
eha@2378
    19
 asm ("\n/*@HEADER_ENDS*/");
eha@2378
    20
 
eha@2378
    21
diff -urN glibc-2.11.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11/sysdeps/unix/sysv/linux/i386/sysdep.h
eha@2378
    22
--- glibc-2.11.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-12-08 21:10:20.000000000 +0100
eha@2378
    23
+++ glibc-2.11/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-12-30 11:33:31.520855595 +0100
eha@2378
    24
@@ -29,6 +29,10 @@
eha@2378
    25
 #include <dl-sysdep.h>
eha@2378
    26
 #include <tls.h>
eha@2378
    27
 
eha@2378
    28
+#if defined __i686 && defined __ASSEMBLER__
eha@2378
    29
+#undef __i686
eha@2378
    30
+#define __i686 __i686
eha@2378
    31
+#endif
eha@2378
    32
 
eha@2378
    33
 /* For Linux we can use the system call table in the header file
eha@2378
    34
 	/usr/include/asm/unistd.h