diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-12 14:42:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-12 14:42:20 +0100 |
| commit | fdc973fa4e29cada901b9499160a0478b59cefea (patch) | |
| tree | 4fd9d8666d4d788c0ae4afe3086cd68e917b67b5 /package/strace | |
| parent | 7aaac91a674b427e42e38cc6b86ada72fdc5e417 (diff) | |
| parent | 9cbc124a64439c1ac24a62ceed63efaf55e5760a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/strace')
| -rw-r--r-- | package/strace/patches/patch-process_c | 23 | ||||
| -rw-r--r-- | package/strace/patches/patch-util_c | 12 |
2 files changed, 30 insertions, 5 deletions
diff --git a/package/strace/patches/patch-process_c b/package/strace/patches/patch-process_c index a3d71bc9e..1c9ba10e9 100644 --- a/package/strace/patches/patch-process_c +++ b/package/strace/patches/patch-process_c @@ -1,5 +1,5 @@ --- strace-4.8.orig/process.c 2013-05-18 00:22:19.000000000 +0200 -+++ strace-4.8/process.c 2014-02-25 20:02:55.000000000 +0100 ++++ strace-4.8/process.c 2014-03-07 11:15:51.318966166 +0100 @@ -55,7 +55,7 @@ # endif #endif @@ -9,7 +9,7 @@ # undef PTRACE_SYSCALL # ifdef HAVE_STRUCT_IA64_FPREG # define ia64_fpreg XXX_ia64_fpreg -@@ -104,6 +104,10 @@ +@@ -104,6 +104,14 @@ # include <asm/rse.h> #endif @@ -17,10 +17,23 @@ +#include <asm/ptrace.h> +#endif + ++#ifdef __microblaze__ ++#include <asm/ptrace.h> ++#endif ++ #ifdef HAVE_PRCTL # include <sys/prctl.h> -@@ -2857,7 +2861,7 @@ sys_sched_setscheduler(struct tcb *tcp) +@@ -2472,7 +2480,7 @@ const struct xlat struct_user_offsets[] + #elif defined(TILE) + /* nothing */ + #elif defined(MICROBLAZE) +- { sizeof(struct user), "sizeof(struct user)" }, ++ /* nothing */ + #elif defined(AVR32) + { uoff(u_tsize), "offsetof(struct user, u_tsize)" }, + { uoff(u_dsize), "offsetof(struct user, u_dsize)" }, +@@ -2857,7 +2865,7 @@ sys_sched_setscheduler(struct tcb *tcp) if (umove(tcp, tcp->u_arg[2], &p) < 0) tprintf(", %#lx", tcp->u_arg[2]); else @@ -29,7 +42,7 @@ } return 0; } -@@ -2872,7 +2876,7 @@ sys_sched_getparam(struct tcb *tcp) +@@ -2872,7 +2880,7 @@ sys_sched_getparam(struct tcb *tcp) if (umove(tcp, tcp->u_arg[1], &p) < 0) tprintf("%#lx", tcp->u_arg[1]); else @@ -38,7 +51,7 @@ } return 0; } -@@ -2885,7 +2889,7 @@ sys_sched_setparam(struct tcb *tcp) +@@ -2885,7 +2893,7 @@ sys_sched_setparam(struct tcb *tcp) if (umove(tcp, tcp->u_arg[1], &p) < 0) tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]); else diff --git a/package/strace/patches/patch-util_c b/package/strace/patches/patch-util_c new file mode 100644 index 000000000..34181a22f --- /dev/null +++ b/package/strace/patches/patch-util_c @@ -0,0 +1,12 @@ +--- strace-4.8.orig/util.c 2013-05-06 20:23:01.000000000 +0200 ++++ strace-4.8/util.c 2014-03-07 15:34:01.074036954 +0100 +@@ -55,7 +55,9 @@ + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS + # define pt_all_user_regs XXX_pt_all_user_regs + # endif ++#if !defined(SH) + # include <linux/ptrace.h> ++#endif + # undef ia64_fpreg + # undef pt_all_user_regs + #endif |