patches/strace/4.5.17/120-fix-arm-bad-syscall.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
parent 747 d3e603e7c17c
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567)
     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