patches/strace/4.5.19/110-fix-arm-bad-syscall.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
yann@1613
     1
diff -durN strace-4.5.19.orig/syscall.c strace-4.5.19/syscall.c
yann@1613
     2
--- strace-4.5.19.orig/syscall.c	2009-10-12 21:54:21.000000000 +0200
yann@1613
     3
+++ strace-4.5.19/syscall.c	2009-10-28 18:47:18.000000000 +0100
yann@1613
     4
@@ -1022,6 +1022,15 @@
yann@1613
     5
 		/*
yann@1613
     6
 		 * Note: we only deal with only 32-bit CPUs here.
yann@1613
     7
 		 */
yann@1613
     8
+
yann@1613
     9
+		if (!(tcp->flags & TCB_INSYSCALL) &&
yann@1613
    10
+		    (tcp->flags & TCB_WAITEXECVE)) {
yann@1613
    11
+			/* caught a fake syscall from the execve's exit */
yann@1613
    12
+			tcp->flags &= ~TCB_WAITEXECVE;
yann@1613
    13
+			return 0;
yann@1613
    14
+		}
yann@1613
    15
+
yann@1613
    16
+
yann@1613
    17
 		if (regs.ARM_cpsr & 0x20) {
yann@1613
    18
 			/*
yann@1613
    19
 			 * Get the Thumb-mode system call number