remove some more patches, need to rework musl support

3 files changed, 1 insertions, 87 deletions

diff --git a/package/strace/Makefile b/package/strace/Makefile
index 0c3ea3cbf..624cf8909 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		strace
 PKG_VERSION:=		4.8
-PKG_RELEASE:=		6
+PKG_RELEASE:=		7
 PKG_MD5SUM:=		c575ef43829586801f514fd91bfe7575
 PKG_DESCR:=		System call trace program
 PKG_SECTION:=		debug
diff --git a/package/strace/patches/patch-defs_h b/package/strace/patches/patch-defs_h
deleted file mode 100644
index c5687b457..000000000
--- a/package/strace/patches/patch-defs_h
+++ /dev/null
@@ -1,60 +0,0 @@
---- strace-4.8.orig/defs.h	2013-05-14 16:10:42.000000000 +0200
-+++ strace-4.8/defs.h	2014-01-15 12:10:01.000000000 +0100
-@@ -37,6 +37,28 @@
- # endif
- #endif
- 
-+#ifdef ARM
-+struct pt_regs { long uregs[18]; };
-+#define ARM_cpsr uregs[16]
-+#define ARM_pc uregs[15]
-+#define ARM_lr uregs[14]
-+#define ARM_sp uregs[13]
-+#define ARM_ip uregs[12]
-+#define ARM_fp uregs[11]
-+#define ARM_r10 uregs[10]
-+#define ARM_r9 uregs[9]
-+#define ARM_r8 uregs[8]
-+#define ARM_r7 uregs[7]
-+#define ARM_r6 uregs[6]
-+#define ARM_r5 uregs[5]
-+#define ARM_r4 uregs[4]
-+#define ARM_r3 uregs[3]
-+#define ARM_r2 uregs[2]
-+#define ARM_r1 uregs[1]
-+#define ARM_r0 uregs[0]
-+#define ARM_ORIG_r0 uregs[17]
-+#endif
-+
- #ifdef MIPS
- # include <sgidefs.h>
- # if _MIPS_SIM == _MIPS_SIM_ABI64
-@@ -155,14 +177,14 @@ extern char *stpcpy(char *dst, const cha
-     || defined(METAG) \
-     || defined(TILE) \
-     || defined(XTENSA) \
--    ) && defined(__GLIBC__)
-+    ) && defined(__linux__)
- # include <sys/ptrace.h>
- #else
- /* Work around awkward prototype in ptrace.h. */
- # define ptrace xptrace
- # include <sys/ptrace.h>
- # undef ptrace
--# ifdef POWERPC
-+# if defined(ARM)
- #  define __KERNEL__
- #  include <asm/ptrace.h>
- #  undef __KERNEL__
-@@ -222,11 +244,6 @@ extern long ptrace(int, int, char *, lon
- # define PTRACE_EVENT_EXIT	6
- #endif
- 
--#if !defined(__GLIBC__)
--# define PTRACE_PEEKUSER PTRACE_PEEKUSR
--# define PTRACE_POKEUSER PTRACE_POKEUSR
--#endif
--
- #if USE_SEIZE
- # undef PTRACE_SEIZE
- # define PTRACE_SEIZE		0x4206
diff --git a/package/strace/patches/patch-signal_c b/package/strace/patches/patch-signal_c
index 30fb0dfdd..ec06ec5e2 100644
--- a/package/strace/patches/patch-signal_c
+++ b/package/strace/patches/patch-signal_c
@@ -1,31 +1,5 @@
 --- strace-4.8.orig/signal.c	2013-05-23 15:41:23.000000000 +0200
 +++ 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)
-+#include <asm/ptrace.h>
- typedef struct {
- 	struct pt_regs		si_regs;
- 	int			si_mask;
 @@ -815,7 +805,7 @@ sys_sigreturn(struct tcb *tcp)
  {
  #if defined(ARM)