patches/strace/4.5.16/200-strace-fix-arm-bad-syscall.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Fri Sep 05 11:16:26 2008 +0000 (2008-09-05)
branch1.2
changeset 841 918cc0a7bd0a
permissions -rw-r--r--
Backport #973 from trunk:
Don't allow to specify an ABI for ARM EABI builds: the ABI is implied by the fact we're building for EABI.

/branches/1.2/arch/arm/functions | 19 3 16 0 +++----------------
/branches/1.2/arch/arm/config.in | 9 6 3 0 ++++++---
2 files changed, 9 insertions(+), 19 deletions(-)
     1 diff -dur strace-4.5.16.orig/syscall.c strace-4.5.16/syscall.c
     2 --- strace-4.5.16.orig/syscall.c	2006-12-21 23:13:33.000000000 +0100
     3 +++ strace-4.5.16/syscall.c	2007-07-14 19:21:44.000000000 +0200
     4 @@ -1045,6 +1045,15 @@
     5  		/*
     6  		 * Note: we only deal with only 32-bit CPUs here.
     7  		 */
     8 +
     9 +		if (!(tcp->flags & TCB_INSYSCALL) &&
    10 +		    (tcp->flags & TCB_WAITEXECVE)) {
    11 +			/* caught a fake syscall from the execve's exit */
    12 +			tcp->flags &= ~TCB_WAITEXECVE;
    13 +			return 0;
    14 +		}
    15 +
    16 +
    17  		if (regs.ARM_cpsr & 0x20) {
    18  			/*
    19  			 * Get the Thumb-mode system call number