mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-22 06:07:49 +00:00
d64cca93c6
- forward-port the patchset from strace-4.5.16 to 4.5.17 - add a new patch from Michael Abbott (#170) /trunk/patches/strace/4.5.17/100-autoreconf.patch | 16 10 6 0 ++-- /trunk/patches/strace/4.5.17/150-undef-CTL_PROC.patch | 8 6 2 0 +- /trunk/patches/strace/4.5.17/140-statfs64-check.patch | 28 16 12 0 ++++--- /trunk/patches/strace/4.5.17/160-undef-syscall.patch | 24 14 10 0 +++--- /trunk/patches/strace/4.5.17/110-dont-use-REG_SYSCALL-for-sh.patch | 10 7 3 0 +- /trunk/patches/strace/4.5.17/120-fix-arm-bad-syscall.patch | 10 7 3 0 +- /trunk/patches/strace/4.5.17/130-fix-disabled-largefile-syscalls.patch | 10 7 3 0 +- /trunk/patches/strace/4.5.17/170-arm-syscalls.patch | 42 42 0 0 ++++++++++ /trunk/config/debug/strace.in | 5 5 0 0 + 9 files changed, 114 insertions(+), 39 deletions(-)
24 lines
796 B
Diff
24 lines
796 B
Diff
Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/120-fix-arm-bad-syscall.patch
|
|
-= BEGIN original header =-
|
|
diff -dur strace-4.5.16.orig/syscall.c strace-4.5.16/syscall.c
|
|
-= END original header =-
|
|
diff -durN strace-4.5.17.orig/syscall.c strace-4.5.17/syscall.c
|
|
--- strace-4.5.17.orig/syscall.c 2008-05-28 01:18:29.000000000 +0200
|
|
+++ strace-4.5.17/syscall.c 2008-10-24 21:30:13.000000000 +0200
|
|
@@ -1016,6 +1016,15 @@
|
|
/*
|
|
* Note: we only deal with only 32-bit CPUs here.
|
|
*/
|
|
+
|
|
+ if (!(tcp->flags & TCB_INSYSCALL) &&
|
|
+ (tcp->flags & TCB_WAITEXECVE)) {
|
|
+ /* caught a fake syscall from the execve's exit */
|
|
+ tcp->flags &= ~TCB_WAITEXECVE;
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+
|
|
if (regs.ARM_cpsr & 0x20) {
|
|
/*
|
|
* Get the Thumb-mode system call number
|