patches/strace/4.5.18/120-fix-arm-bad-syscall.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Jan 03 23:40:22 2011 +0100 (2011-01-03)
changeset 2267 7af68e6083aa
permissions -rw-r--r--
libc-glibc: remove 2.3.6

This is an obsolete version which is no longer used by any sample (the only
user, the ia64 sample, has been removed).

It also makes the code path a bit complex, with twists just to accomodate
that version. Removing the version will make those twists go away, and
will ease commonalisation of glibc and eglibc in the future (hopefully!).

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