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