Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/strace/4.5.17/120-fix-arm-bad-syscall.patch
author Johannes Stezenbach <js@sig21.net>
Tue Oct 30 00:22:25 2012 +0000 (2012-10-30)
changeset 3097 5c67476c7342
parent 747 d3e603e7c17c
permissions -rw-r--r--
scripts/functions: fix endless loop in debug-shell with IO redirection

CT_DEBUG_INTERACTIVE is disabled when stdin, stdout or
stderr are redirected, but the check is only done at
the start of the build and doesn't catch when individual
build commands use redirection. When stdin is redirected
it will cause the debug shell to exit immediately, causing
and endless loop. Thus, save the stdin/our/err file handles
and restore them before invoking the debug shell.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
Message-Id: <20121030102225.GA8303@sig21.net>
Patchwork-Id: 195409 
     1 Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/120-fix-arm-bad-syscall.patch

     2 -= BEGIN original header =-

     3 diff -dur strace-4.5.16.orig/syscall.c strace-4.5.16/syscall.c

     4 -= END original header =-

     5 diff -durN strace-4.5.17.orig/syscall.c strace-4.5.17/syscall.c

     6 --- strace-4.5.17.orig/syscall.c	2008-05-28 01:18:29.000000000 +0200

     7 +++ strace-4.5.17/syscall.c	2008-10-24 21:30:13.000000000 +0200

     8 @@ -1016,6 +1016,15 @@

     9  		/*

    10  		 * Note: we only deal with only 32-bit CPUs here.

    11  		 */

    12 +

    13 +		if (!(tcp->flags & TCB_INSYSCALL) &&

    14 +		    (tcp->flags & TCB_WAITEXECVE)) {

    15 +			/* caught a fake syscall from the execve's exit */

    16 +			tcp->flags &= ~TCB_WAITEXECVE;

    17 +			return 0;

    18 +		}

    19 +

    20 +

    21  		if (regs.ARM_cpsr & 0x20) {

    22  			/*

    23  			 * Get the Thumb-mode system call number
crosstool-ng