Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.17a/150-check_ldrunpath_length.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 747 d3e603e7c17c
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@55 
     1
 
diff -dur binutils-2.17.old/ld/emultempl/elf32.em binutils-2.17/ld/emultempl/elf32.em
yann@55 
     2
 
--- binutils-2.17.old/ld/emultempl/elf32.em	2006-06-12 15:05:04.000000000 +0200
yann@55 
     3
 
+++ binutils-2.17/ld/emultempl/elf32.em	2007-05-01 18:26:13.000000000 +0200
yann@55 
     4
 
@@ -970,6 +970,8 @@
yann@55 
     5
 
 	      && command_line.rpath == NULL)
yann@55 
     6
 
 	    {
yann@55 
     7
 
 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
yann@55 
     8
 
+	      if ((lib_path) && (strlen (lib_path) == 0))
yann@55 
     9
 
+		  lib_path = NULL;
yann@55 
    10
 
 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
yann@55 
    11
 
 						      force))
yann@55 
    12
 
 		break;
yann@55 
    13
 
@@ -1154,6 +1156,8 @@
yann@55 
    14
 
   rpath = command_line.rpath;
yann@55 
    15
 
   if (rpath == NULL)
yann@55 
    16
 
     rpath = (const char *) getenv ("LD_RUN_PATH");
yann@55 
    17
 
+  if ((rpath) && (strlen (rpath) == 0))
yann@55 
    18
 
+      rpath = NULL;
yann@55 
    19
 
   if (! (bfd_elf_size_dynamic_sections
yann@55 
    20
 
 	 (output_bfd, command_line.soname, rpath,
yann@55 
    21
 
 	  command_line.filter_shlib,
crosstool-ng