Mercurialcrosstool-ng / annotate
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 "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Jan 05 23:02:43 2009 +0000 (2009-01-05)
changeset 1126 1ab3d2e08c8b
parent 747 d3e603e7c17c
permissions -rw-r--r--
Split CT_ExtractAndPatch in two: CT_Extract and CT_Patch:
- it is unworkable to have CT_ExtactAndPAtch cope with all those silly glibc addons:
- they can have 'short' (as 'ports') or 'long' (as glibc-ports-2.7) names
- patches are against eithe the short or long name, but non-uniformly use one or the other
- it is the reposibility of the component (glibc in this case) to handle corner cases such as those
- update all components to use the new functions

/trunk/scripts/build/tools/000-template.sh | 3 2 1 0 +-
/trunk/scripts/build/tools/100-libelf.sh | 3 2 1 0 +-
/trunk/scripts/build/tools/200-sstrip.sh | 3 2 1 0 +-
/trunk/scripts/build/kernel/linux.sh | 3 2 1 0 +-
/trunk/scripts/build/binutils.sh | 3 2 1 0 +-
/trunk/scripts/build/cc/gcc.sh | 3 2 1 0 +-
/trunk/scripts/build/debug/000-template.sh | 3 2 1 0 +-
/trunk/scripts/build/debug/100-dmalloc.sh | 3 2 1 0 +-
/trunk/scripts/build/debug/400-ltrace.sh | 3 2 1 0 +-
/trunk/scripts/build/debug/300-gdb.sh | 9 6 3 0 +++--
/trunk/scripts/build/debug/500-strace.sh | 7 3 4 0 ++--
/trunk/scripts/build/debug/200-duma.sh | 19 8 11 0 ++++------
/trunk/scripts/build/libc/glibc.sh | 14 12 2 0 ++++++-
/trunk/scripts/build/libc/uClibc.sh | 13 9 4 0 +++++--
/trunk/scripts/build/libc/eglibc.sh | 14 12 2 0 ++++++-
/trunk/scripts/build/gmp.sh | 3 2 1 0 +-
/trunk/scripts/build/mpfr.sh | 3 2 1 0 +-
/trunk/scripts/functions | 68 36 32 0 +++++++++++++++++++-----------------
18 files changed, 108 insertions(+), 69 deletions(-)
yann@974 
     1
 
Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/120-fix-arm-bad-syscall.patch
yann@974 
     2
 
-= BEGIN original header =-
yann@428 
     3
 
diff -dur strace-4.5.16.orig/syscall.c strace-4.5.16/syscall.c
yann@974 
     4
 
-= END original header =-
yann@974 
     5
 
diff -durN strace-4.5.17.orig/syscall.c strace-4.5.17/syscall.c
yann@974 
     6
 
--- strace-4.5.17.orig/syscall.c	2008-05-28 01:18:29.000000000 +0200
yann@974 
     7
 
+++ strace-4.5.17/syscall.c	2008-10-24 21:30:13.000000000 +0200
yann@974 
     8
 
@@ -1016,6 +1016,15 @@
yann@428 
     9
 
 		/*
yann@428 
    10
 
 		 * Note: we only deal with only 32-bit CPUs here.
yann@428 
    11
 
 		 */
yann@428 
    12
 
+
yann@428 
    13
 
+		if (!(tcp->flags & TCB_INSYSCALL) &&
yann@428 
    14
 
+		    (tcp->flags & TCB_WAITEXECVE)) {
yann@428 
    15
 
+			/* caught a fake syscall from the execve's exit */
yann@428 
    16
 
+			tcp->flags &= ~TCB_WAITEXECVE;
yann@428 
    17
 
+			return 0;
yann@428 
    18
 
+		}
yann@428 
    19
 
+
yann@428 
    20
 
+
yann@428 
    21
 
 		if (regs.ARM_cpsr & 0x20) {
yann@428 
    22
 
 			/*
yann@428 
    23
 
 			 * Get the Thumb-mode system call number
crosstool-ng