patches/gcc/3.4.6/180-pr15068-fix.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Fri Jan 27 13:31:16 2012 +0100 (2012-01-27)
changeset 2854 a70abdbfa342
parent 339 bd5e0a849352
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>
yann@339
     1
diff -durN gcc-3.4.6.orig/gcc/flow.c gcc-3.4.6/gcc/flow.c
yann@339
     2
--- gcc-3.4.6.orig/gcc/flow.c	2005-09-01 22:51:09.000000000 +0200
yann@339
     3
+++ gcc-3.4.6/gcc/flow.c	2007-08-15 23:00:30.000000000 +0200
yann@339
     4
@@ -1884,6 +1884,7 @@
yann@339
     5
 	  rtx set_src = SET_SRC (pc_set (BB_END (bb)));
yann@339
     6
 	  rtx cond_true = XEXP (set_src, 0);
yann@339
     7
 	  rtx reg = XEXP (cond_true, 0);
yann@339
     8
+ 	  enum rtx_code inv_cond;
yann@339
     9
 
yann@339
    10
 	  if (GET_CODE (reg) == SUBREG)
yann@339
    11
 	    reg = SUBREG_REG (reg);
yann@339
    12
@@ -1892,11 +1893,13 @@
yann@339
    13
 	     in the form of a comparison of a register against zero.  
yann@339
    14
 	     If the condition is more complex than that, then it is safe
yann@339
    15
 	     not to record any information.  */
yann@339
    16
-	  if (GET_CODE (reg) == REG
yann@339
    17
+ 	  inv_cond = reversed_comparison_code (cond_true, BB_END (bb));
yann@339
    18
+ 	  if (inv_cond != UNKNOWN
yann@339
    19
+	      && GET_CODE (reg) == REG
yann@339
    20
 	      && XEXP (cond_true, 1) == const0_rtx)
yann@339
    21
 	    {
yann@339
    22
 	      rtx cond_false
yann@339
    23
-		= gen_rtx_fmt_ee (reverse_condition (GET_CODE (cond_true)),
yann@339
    24
+		= gen_rtx_fmt_ee (inv_cond,
yann@339
    25
 				  GET_MODE (cond_true), XEXP (cond_true, 0),
yann@339
    26
 				  XEXP (cond_true, 1));
yann@339
    27
 	      if (GET_CODE (XEXP (set_src, 1)) == PC)