patches/strace/4.5.16/120-fix-arm-bad-syscall.patch
author Johannes Stezenbach <js@sig21.net>
Sun Oct 14 23:46:15 2012 +0000 (2012-10-14)
changeset 3082 39ec9e913d79
parent 746 b150d6f590fc
permissions -rw-r--r--
scripts: move backtrace marker to CT_WORK_DIR

Avoid error when commands in scripts/crosstool-NG.sh fail
before CT_BUILD_DIR is set.

So we need to remove the backtrace marker of a potential previous
build. Previously, it was implicitly removed because we did remove
the directory it was in, which is no longer the case.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
[yann.morin.1998@free.fr: remove backtrace marker on start of build]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <20121015094615.GA18673@sig21.net>
Patchwork-Id: 191498
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