patches/strace/4.5.18/120-fix-arm-bad-syscall.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:30:37 2010 +0200 (2010-07-29)
branch1.7
changeset 2047 ace1d90c9b15
permissions -rw-r--r--
scripts: remove . from $PATH

Add CT_SanitizePath function which removes entries referring to ., /tmp
and non-existing directories from $PATH, and call it early in the
build script.

If . is in PATH, gcc-4.4.4 build breaks:

[ALL ] checking what assembler to use...
/tmp/build/targets/arm-unknown-linux-uclibcgnueabi/build/gcc-core-static/arm-unknown-linux-uclibcgnueabi/bin/as
...
[ALL ] config.status: creating as

i.e. "as" is supposed to be the arm-unknown-linux-uclibcgnueabi cross assembler,
but config.status creates a local "as" script which is calling the
host assembler.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
[Yann E. MORIN: style fixes + explanations]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 20dd8cef1c8adff0aa3e78ae6d7acfbc45ed5a83)
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