patches/strace/4.5.15/120-fix-arm-bad-syscall.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Dec 12 21:41:16 2011 +0200 (2011-12-12)
branch1.13
changeset 2845 0dc9d4931246
parent 746 b150d6f590fc
permissions -rw-r--r--
scripts: unset CONFIG_SITE

Some distributions (eg. openSUSE 12.1) systematically export
the CONFIG_SITE environment variable to point to a custom
script setting misc paths for ./configure.

This can, and does, break when cross-compiling for architectures
that are not supported by this script.

The simple workaround is to unset this variable.
NB: buildroot has a similar fix:
http://git.buildroot.org/buildroot/commit/?id=12c9f7dd6dee9c6029b4f9a12d6aac1516911ab4

Reported-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 21f4f28e60ec0342133086c9a51e7f0e5b181fb8)
yann@257
     1
diff -dur strace-4.5.15.orig/syscall.c strace-4.5.15/syscall.c
yann@257
     2
--- strace-4.5.15.orig/syscall.c	2006-12-21 23:13:33.000000000 +0100
yann@257
     3
+++ strace-4.5.15/syscall.c	2007-07-14 19:21:44.000000000 +0200
yann@257
     4
@@ -1045,6 +1045,15 @@
yann@257
     5
 		/*
yann@257
     6
 		 * Note: we only deal with only 32-bit CPUs here.
yann@257
     7
 		 */
yann@257
     8
+
yann@257
     9
+		if (!(tcp->flags & TCB_INSYSCALL) &&
yann@257
    10
+		    (tcp->flags & TCB_WAITEXECVE)) {
yann@257
    11
+			/* caught a fake syscall from the execve's exit */
yann@257
    12
+			tcp->flags &= ~TCB_WAITEXECVE;
yann@257
    13
+			return 0;
yann@257
    14
+		}
yann@257
    15
+ 
yann@257
    16
+
yann@257
    17
 		if (regs.ARM_cpsr & 0x20) {
yann@257
    18
 			/*
yann@257
    19
 			 * Get the Thumb-mode system call number