patches/strace/4.5.19/110-fix-arm-bad-syscall.patch
author Joachim Nilsson <jocke@vmlinux.org>
Fri Jan 01 12:17:39 2010 +0100 (2010-01-01)
changeset 1671 08a5129e6eb0
permissions -rw-r--r--
debug/strace: fix strace 4.5.19 to properly build with latest Linux kernels

Here's a couple of patches to get strace 4.5.19 to configure and build
properly with the latest kernel headers. Not pretty, but hopefully
enough while we wait for 4.5.20 to be released.

With the current strace-4.5.19 patches I failed to get the configure
script running even on my host environment. Also, when cross building
the configure script needs to look for the proper system headers to be
able to properly set HAVE_LINUX_NETLINK_H. Otherwise you get:

[EXTRA] Building strace
[ERROR] /home/jocke/x-tools/targets/src/strace-4.5.19/net.c:976:
error: field 'nl' has incomplete type
[ERROR] make[2]: *** [net.o] Error 1
[ERROR] make[1]: *** [all] Error 2

The fix was simple, backport a change set from the git[1] tree and run
autoreconf to update the configure script.

[1] - http://strace.git.sourceforge.net/git/gitweb.cgi?p=strace/strace;a=commit;h=f0df31e71a58c6e79ba77c1a9d84b2f38d44bec7
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