diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2008-12-31 17:17:18 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-12-31 17:17:18 +0000 |
commit | 1357f754b137ecd455c4d15c3181613b08b1982a (patch) | |
tree | d8dbc3ba15f9e05ef62055bdb24eda52b3ba1db6 /meta/packages/strace/strace-4.5.18 | |
parent | 83494fc2e3fa8972559711b6efe60e84c5eca0bf (diff) | |
download | poky-1357f754b137ecd455c4d15c3181613b08b1982a.tar.gz |
strace: Upgrade to 4.5.18
Diffstat (limited to 'meta/packages/strace/strace-4.5.18')
-rw-r--r-- | meta/packages/strace/strace-4.5.18/strace-fix-arm-bad-syscall.patch | 18 | ||||
-rw-r--r-- | meta/packages/strace/strace-4.5.18/strace-undef-syscall.patch | 62 |
2 files changed, 80 insertions, 0 deletions
diff --git a/meta/packages/strace/strace-4.5.18/strace-fix-arm-bad-syscall.patch b/meta/packages/strace/strace-4.5.18/strace-fix-arm-bad-syscall.patch new file mode 100644 index 0000000000..d7d7426b74 --- /dev/null +++ b/meta/packages/strace/strace-4.5.18/strace-fix-arm-bad-syscall.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | --- strace-4.5.12-orig/syscall.c 2005-06-08 21:45:28.000000000 +0100 | ||
2 | +++ strace-4.5.12/syscall.c 2005-10-25 19:26:39.000000000 +0100 | ||
3 | @@ -1013,6 +1013,15 @@ struct tcb *tcp; | ||
4 | /* | ||
5 | * Note: we only deal with only 32-bit CPUs here. | ||
6 | */ | ||
7 | + | ||
8 | + if (!(tcp->flags & TCB_INSYSCALL) && | ||
9 | + (tcp->flags & TCB_WAITEXECVE)) { | ||
10 | + /* caught a fake syscall from the execve's exit */ | ||
11 | + tcp->flags &= ~TCB_WAITEXECVE; | ||
12 | + return 0; | ||
13 | + } | ||
14 | + | ||
15 | + | ||
16 | if (regs.ARM_cpsr & 0x20) { | ||
17 | /* | ||
18 | * Get the Thumb-mode system call number | ||
diff --git a/meta/packages/strace/strace-4.5.18/strace-undef-syscall.patch b/meta/packages/strace/strace-4.5.18/strace-undef-syscall.patch new file mode 100644 index 0000000000..ac33db4e78 --- /dev/null +++ b/meta/packages/strace/strace-4.5.18/strace-undef-syscall.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | Origin is http://buildroot.uclibc.org/cgi-bin/viewcvs.cgi/*checkout*/trunk/buildroot/package/strace/strace-undef-syscall.patch?rev=17767 | ||
2 | |||
3 | This gets applied to fix build errors with uclibc on ARM EABI | ||
4 | |||
5 | Index: strace-4.5.18/linux/syscallent.h | ||
6 | =================================================================== | ||
7 | --- strace-4.5.18.orig/linux/syscallent.h 2008-07-18 02:23:49.000000000 +0100 | ||
8 | +++ strace-4.5.18/linux/syscallent.h 2008-12-31 16:56:03.000000000 +0000 | ||
9 | @@ -130,7 +130,10 @@ | ||
10 | { 2, TF, sys_statfs, "statfs" }, /* 99 */ | ||
11 | { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */ | ||
12 | { 3, 0, sys_ioperm, "ioperm" }, /* 101 */ | ||
13 | - { 2, TD, sys_socketcall, "socketcall", SYS_socketcall }, /* 102 */ | ||
14 | + { 2, TD, sys_socketcall, "socketcall", | ||
15 | +#ifdef __NR_socketcall | ||
16 | + SYS_socketcall }, /* 102 */ | ||
17 | +#endif | ||
18 | { 3, 0, sys_syslog, "syslog" }, /* 103 */ | ||
19 | { 3, 0, sys_setitimer, "setitimer" }, /* 104 */ | ||
20 | { 2, 0, sys_getitimer, "getitimer" }, /* 105 */ | ||
21 | @@ -145,7 +148,10 @@ | ||
22 | { 4, TP, sys_wait4, "wait4", SYS_wait4 }, /* 114 */ | ||
23 | { 1, 0, sys_swapoff, "swapoff" }, /* 115 */ | ||
24 | { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ | ||
25 | - { 6, 0, sys_ipc, "ipc", SYS_ipc }, /* 117 */ | ||
26 | + { 6, 0, sys_ipc, "ipc", | ||
27 | +#ifdef __NR_ipc | ||
28 | + SYS_ipc }, /* 117 */ | ||
29 | +#endif | ||
30 | { 1, TD, sys_fsync, "fsync" }, /* 118 */ | ||
31 | { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ | ||
32 | { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */ | ||
33 | @@ -282,7 +288,11 @@ | ||
34 | { 3, 0, sys_io_cancel, "io_cancel" }, /* 249 */ | ||
35 | { 5, 0, sys_fadvise64, "fadvise64" }, /* 250 */ | ||
36 | { 5, 0, printargs, "SYS_251" }, /* 251 */ | ||
37 | - { 1, TP, sys_exit, "exit_group", __NR_exit_group }, /* 252 */ | ||
38 | + { 1, TP, sys_exit, "exit_group" | ||
39 | +#ifdef __NR_exit_group | ||
40 | + , __NR_exit_group | ||
41 | +#endif | ||
42 | + }, /* 252 */ | ||
43 | { 4, 0, printargs, "lookup_dcookie"}, /* 253 */ | ||
44 | { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */ | ||
45 | { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 255 */ | ||
46 | Index: strace-4.5.18/linux/arm/syscallent.h | ||
47 | =================================================================== | ||
48 | --- strace-4.5.18.orig/linux/arm/syscallent.h 2008-12-31 17:13:12.000000000 +0000 | ||
49 | +++ strace-4.5.18/linux/arm/syscallent.h 2008-12-31 17:15:02.000000000 +0000 | ||
50 | @@ -431,6 +431,7 @@ | ||
51 | { 5, 0, printargs, "SYS_398" }, /* 398 */ | ||
52 | { 5, 0, printargs, "SYS_399" }, /* 399 */ | ||
53 | |||
54 | +#if !defined(__ARM_EABI__) | ||
55 | #if SYS_socket_subcall != 400 | ||
56 | #error fix me | ||
57 | #endif | ||
58 | @@ -481,3 +482,4 @@ | ||
59 | { 4, TI, sys_shmdt, "shmdt" }, /* 440 */ | ||
60 | { 4, TI, sys_shmget, "shmget" }, /* 441 */ | ||
61 | { 4, TI, sys_shmctl, "shmctl" }, /* 442 */ | ||
62 | +#endif | ||