summaryrefslogtreecommitdiff
path: root/package/strace/patches/patch-process_c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-25 16:07:13 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-25 16:07:13 +0200
commit4d52e4eb4142be9d0849b4807f16adb57eb18fad (patch)
treea66252457eaae23003e85953df9ab6c6a549e9e7 /package/strace/patches/patch-process_c
parentb24967f7f53aca7ca634086ff09f2c78ea3c41df (diff)
another try to fix strace for arm/mips/x86
Diffstat (limited to 'package/strace/patches/patch-process_c')
-rw-r--r--package/strace/patches/patch-process_c35
1 files changed, 20 insertions, 15 deletions
diff --git a/package/strace/patches/patch-process_c b/package/strace/patches/patch-process_c
index 133b42525..3384b1f4f 100644
--- a/package/strace/patches/patch-process_c
+++ b/package/strace/patches/patch-process_c
@@ -1,21 +1,26 @@
--- strace-4.8.orig/process.c 2013-05-18 00:22:19.000000000 +0200
-+++ strace-4.8/process.c 2013-10-24 18:57:55.000000000 +0200
-@@ -56,14 +56,12 @@
++++ strace-4.8/process.c 2013-10-25 13:17:58.000000000 +0200
+@@ -55,19 +55,6 @@
+ # endif
#endif
- #ifdef HAVE_LINUX_PTRACE_H
+-#ifdef 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
+-# 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
-@@ -2857,7 +2855,7 @@ sys_sched_setscheduler(struct tcb *tcp)
+-# undef ia64_fpreg
+-# undef pt_all_user_regs
+-#endif
+-
+ #if defined(SPARC64)
+ # define r_pc r_tpc
+ # undef PTRACE_GETREGS
+@@ -2857,7 +2844,7 @@ sys_sched_setscheduler(struct tcb *tcp)
if (umove(tcp, tcp->u_arg[2], &p) < 0)
tprintf(", %#lx", tcp->u_arg[2]);
else
@@ -24,7 +29,7 @@
}
return 0;
}
-@@ -2872,7 +2870,7 @@ sys_sched_getparam(struct tcb *tcp)
+@@ -2872,7 +2859,7 @@ sys_sched_getparam(struct tcb *tcp)
if (umove(tcp, tcp->u_arg[1], &p) < 0)
tprintf("%#lx", tcp->u_arg[1]);
else
@@ -33,7 +38,7 @@
}
return 0;
}
-@@ -2885,7 +2883,7 @@ sys_sched_setparam(struct tcb *tcp)
+@@ -2885,7 +2872,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