patches/strace/4.5.16/120-fix-arm-bad-syscall.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed Sep 07 01:22:37 2011 +0200 (2011-09-07)
branch1.12
changeset 2655 3ba359965eb0
parent 746 b150d6f590fc
permissions -rw-r--r--
scripts: fix sysroot prefix dir

The sysroot prefix dir was broken in #4960f5d9f829 due to a mishap
when making the out-of-sysroot lib/ symlink: the './' was mistakenly
changed into a single '.' .

Although Jonathan suggested restoring the missing '/' to restore it to
normal operation, I prefered using an explicit pushd/popd to be extra
sure of the symlink location and target, along with a fix in the sysroot
relative directory calculation.

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