patches/strace/4.5.15/120-fix-arm-bad-syscall.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Sep 12 23:38:18 2010 +0200 (2010-09-12)
changeset 2120 48de021b3a9e
parent 746 b150d6f590fc
permissions -rw-r--r--
arch/mips: add experimental mips64 samples

Both toolchains were tested to successfully:
- _build_ busybox, giving respectively an n32 and an n64 binary
although it has not been run-tested.
- build linux-2.6.36-rc3 for Loongson, giving an n64 vmlinux
(which is expected, due to the way the kernel is built),
and the kernel properly boots!

Credits are due to Julien MOUTHINO (julm on freenode#uClibc) for
testing that the kernel boots on his hardware! Cheers! ;-)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
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