diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-25 16:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-25 16:07:13 +0200 |
| commit | 4d52e4eb4142be9d0849b4807f16adb57eb18fad (patch) | |
| tree | a66252457eaae23003e85953df9ab6c6a549e9e7 /package/strace/patches/patch-signal_c | |
| parent | b24967f7f53aca7ca634086ff09f2c78ea3c41df (diff) | |
another try to fix strace for arm/mips/x86
Diffstat (limited to 'package/strace/patches/patch-signal_c')
| -rw-r--r-- | package/strace/patches/patch-signal_c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/package/strace/patches/patch-signal_c b/package/strace/patches/patch-signal_c index 27e3d0d77..30fb0dfdd 100644 --- a/package/strace/patches/patch-signal_c +++ b/package/strace/patches/patch-signal_c @@ -1,6 +1,24 @@ --- strace-4.8.orig/signal.c 2013-05-23 15:41:23.000000000 +0200 -+++ strace-4.8/signal.c 2013-09-13 16:20:20.000000000 +0200 -@@ -61,6 +61,7 @@ ++++ strace-4.8/signal.c 2013-10-25 14:36:47.000000000 +0200 +@@ -43,17 +43,6 @@ + # ifndef PTRACE_POKEUSR + # define PTRACE_POKEUSR PTRACE_POKEUSER + # endif +-#elif defined(HAVE_LINUX_PTRACE_H) +-# undef PTRACE_SYSCALL +-# ifdef HAVE_STRUCT_IA64_FPREG +-# define ia64_fpreg XXX_ia64_fpreg +-# endif +-# ifdef HAVE_STRUCT_PT_ALL_USER_REGS +-# define pt_all_user_regs XXX_pt_all_user_regs +-# endif +-# include <linux/ptrace.h> +-# undef ia64_fpreg +-# undef pt_all_user_regs + #endif + + #ifdef IA64 +@@ -61,6 +50,7 @@ #endif #if defined(SPARC) || defined(SPARC64) || defined(MIPS) @@ -8,7 +26,7 @@ typedef struct { struct pt_regs si_regs; int si_mask; -@@ -815,7 +816,7 @@ sys_sigreturn(struct tcb *tcp) +@@ -815,7 +805,7 @@ sys_sigreturn(struct tcb *tcp) { #if defined(ARM) if (entering(tcp)) { |