From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 8 Nov 2016 18:58:18 +0000 (+0100)
Subject: Revert "devel/strace: fix build on mpc85xx target"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6649a172f28883caa417f2eefa5224a9e206f65a;p=openwrt%2Fstaging%2Frobimarko.git

Revert "devel/strace: fix build on mpc85xx target"

This reverts commit 519a199cbcc0930e229ddd7087309326a846bdce.

Multiple users have reported building failures on ARM architectures, e.g.:

    In file included from defs.h:42:0,
                     from process.c:37:
    process.c:51:22: error: 'struct user_regs' has no member named 'ARM_r0'
     #define uoff(member) offsetof(struct user, member)
                          ^
    ./linux/arm/userent.h:1:3: note: in expansion of macro 'uoff'
     { uoff(regs.ARM_r0), "r0" },
       ^

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/package/devel/strace/patches/100-workaround--pt-reg-collisions-ppc.patch b/package/devel/strace/patches/100-workaround--pt-reg-collisions-ppc.patch
deleted file mode 100644
index 9b9d12a286..0000000000
--- a/package/devel/strace/patches/100-workaround--pt-reg-collisions-ppc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/ptrace.h
-+++ b/ptrace.h
-@@ -52,7 +52,10 @@ extern long ptrace(int, int, char *, long);
- # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
- #endif
- 
-+#include <linux/types.h>
-+#define __ASSEMBLY__
- #include <linux/ptrace.h>
-+#undef __ASSEMBLY__
- 
- #ifdef HAVE_STRUCT_IA64_FPREG
- # undef ia64_fpreg
---