strace: unbreak build on ARM and musl (patch from Fedora).

This commit is contained in:
Juan RP 2014-02-17 08:56:18 +01:00
parent 16a703bee4
commit a83cf1768d
2 changed files with 44 additions and 13 deletions

View File

@ -0,0 +1,44 @@
--- process.c.orig 2013-12-06 16:18:27.682402291 +0000
+++ process.c 2013-12-06 16:19:14.602165296 +0000
@@ -63,7 +63,7 @@
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
# endif
-# include <linux/ptrace.h>
+# include <asm/ptrace.h>
# undef ia64_fpreg
# undef pt_all_user_regs
#endif
--- signal.c.orig 2013-12-06 16:28:54.800551324 +0000
+++ signal.c 2013-12-06 16:30:26.033019415 +0000
@@ -51,7 +51,7 @@
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
# endif
-# include <linux/ptrace.h>
+# include <asm/ptrace.h>
# undef ia64_fpreg
# undef pt_all_user_regs
#endif
--- syscall.c.orig 2013-12-06 16:29:37.912245321 +0000
+++ syscall.c 2013-12-06 16:30:55.933500132 +0000
@@ -48,7 +48,7 @@
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
# endif
-# include <linux/ptrace.h>
+# include <asm/ptrace.h>
# undef ia64_fpreg
# undef pt_all_user_regs
#endif
--- util.c.orig 2013-12-06 16:29:44.382349431 +0000
+++ util.c 2013-12-06 16:31:04.267634082 +0000
@@ -55,7 +55,7 @@
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
# endif
-# include <linux/ptrace.h>
+# include <asm/ptrace.h>
# undef ia64_fpreg
# undef pt_all_user_regs
#endif

View File

@ -1,13 +0,0 @@
Otherwise struct ptrace_peeksiginfo_args is redefined.
--- process.c.orig 2014-01-08 18:07:14.306950549 +0100
+++ process.c 2014-01-08 18:07:19.585917125 +0100
@@ -63,7 +63,7 @@
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
# endif
-# include <linux/ptrace.h>
+# include <sys/ptrace.h>
# undef ia64_fpreg
# undef pt_all_user_regs
#endif