From 6765a17f36ebd3493758f23d1170dbe01c86f406 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 25 Oct 2013 13:01:35 +0200 Subject: fix strace compile --- package/strace/patches/patch-defs_h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'package/strace/patches/patch-defs_h') diff --git a/package/strace/patches/patch-defs_h b/package/strace/patches/patch-defs_h index 50d061348..5f0cd1732 100644 --- a/package/strace/patches/patch-defs_h +++ b/package/strace/patches/patch-defs_h @@ -1,6 +1,14 @@ --- strace-4.8.orig/defs.h 2013-05-14 16:10:42.000000000 +0200 -+++ strace-4.8/defs.h 2013-08-14 08:51:03.000000000 +0200 -@@ -162,7 +162,7 @@ extern char *stpcpy(char *dst, const cha ++++ strace-4.8/defs.h 2013-10-24 18:52:25.000000000 +0200 +@@ -155,14 +155,14 @@ extern char *stpcpy(char *dst, const cha + || defined(METAG) \ + || defined(TILE) \ + || defined(XTENSA) \ +- ) && defined(__GLIBC__) ++ ) && defined(__linux__) + # include + #else + /* Work around awkward prototype in ptrace.h. */ # define ptrace xptrace # include # undef ptrace -- cgit v1.2.3 From 4d52e4eb4142be9d0849b4807f16adb57eb18fad Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 25 Oct 2013 16:07:13 +0200 Subject: another try to fix strace for arm/mips/x86 --- package/strace/patches/patch-defs_h | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) (limited to 'package/strace/patches/patch-defs_h') diff --git a/package/strace/patches/patch-defs_h b/package/strace/patches/patch-defs_h index 5f0cd1732..d4a359ef4 100644 --- a/package/strace/patches/patch-defs_h +++ b/package/strace/patches/patch-defs_h @@ -1,6 +1,35 @@ --- strace-4.8.orig/defs.h 2013-05-14 16:10:42.000000000 +0200 -+++ strace-4.8/defs.h 2013-10-24 18:52:25.000000000 +0200 -@@ -155,14 +155,14 @@ extern char *stpcpy(char *dst, const cha ++++ strace-4.8/defs.h 2013-10-25 13:21:18.000000000 +0200 +@@ -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 + # if _MIPS_SIM == _MIPS_SIM_ABI64 +@@ -155,14 +177,14 @@ extern char *stpcpy(char *dst, const cha || defined(METAG) \ || defined(TILE) \ || defined(XTENSA) \ @@ -17,7 +46,7 @@ # define __KERNEL__ # include # undef __KERNEL__ -@@ -222,11 +222,6 @@ extern long ptrace(int, int, char *, lon +@@ -222,11 +244,6 @@ extern long ptrace(int, int, char *, lon # define PTRACE_EVENT_EXIT 6 #endif -- cgit v1.2.3