patches/strace/4.5.15/120-fix-arm-bad-syscall.patch
author "Bryan Hundven" <bryanhundven@gmail.com>
Thu Mar 01 15:23:49 2012 -0800 (2012-03-01)
changeset 2909 28ac8fbd9e6a
parent 746 b150d6f590fc
permissions -rw-r--r--
libg/eglibc: add updated eglibc 2.15

Includes a patch to remove __builtin_expect test:

In eglibc-2.15, the build breaks in configure while testing
for the existance of __builtin_expect. It fails with newer
versions of gcc.

This patch is a modification of an upstream change in glibc
mainline (to be 2.16) to fix the following error:

[CFG ] checking for __builtin_expect... no
[ERROR] configure: error: support for __builtin_expect needed

http://sourceware.org/git/?p=glibc.git;a=commit;h=3857022a761ea7251f8e5c0e45d382ebc3e34cf9

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
[yann.morin.1998@free.fr: coalesce both patches into a single changeset]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.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