patches/strace/4.5.17/120-fix-arm-bad-syscall.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@974
     1
Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/120-fix-arm-bad-syscall.patch
yann@974
     2
-= BEGIN original header =-
yann@428
     3
diff -dur strace-4.5.16.orig/syscall.c strace-4.5.16/syscall.c
yann@974
     4
-= END original header =-
yann@974
     5
diff -durN strace-4.5.17.orig/syscall.c strace-4.5.17/syscall.c
yann@974
     6
--- strace-4.5.17.orig/syscall.c	2008-05-28 01:18:29.000000000 +0200
yann@974
     7
+++ strace-4.5.17/syscall.c	2008-10-24 21:30:13.000000000 +0200
yann@974
     8
@@ -1016,6 +1016,15 @@
yann@428
     9
 		/*
yann@428
    10
 		 * Note: we only deal with only 32-bit CPUs here.
yann@428
    11
 		 */
yann@428
    12
+
yann@428
    13
+		if (!(tcp->flags & TCB_INSYSCALL) &&
yann@428
    14
+		    (tcp->flags & TCB_WAITEXECVE)) {
yann@428
    15
+			/* caught a fake syscall from the execve's exit */
yann@428
    16
+			tcp->flags &= ~TCB_WAITEXECVE;
yann@428
    17
+			return 0;
yann@428
    18
+		}
yann@428
    19
+
yann@428
    20
+
yann@428
    21
 		if (regs.ARM_cpsr & 0x20) {
yann@428
    22
 			/*
yann@428
    23
 			 * Get the Thumb-mode system call number