diff options
Diffstat (limited to 'main/strace/strace-musl.patch')
| -rw-r--r-- | main/strace/strace-musl.patch | 190 |
1 files changed, 0 insertions, 190 deletions
diff --git a/main/strace/strace-musl.patch b/main/strace/strace-musl.patch deleted file mode 100644 index b0fb3f9cbd..0000000000 --- a/main/strace/strace-musl.patch +++ /dev/null @@ -1,190 +0,0 @@ ---- strace-4.8.orig/defs.h -+++ strace-4.8/defs.h -@@ -155,7 +155,7 @@ - || defined(METAG) \ - || defined(TILE) \ - || defined(XTENSA) \ -- ) && defined(__GLIBC__) -+ ) && defined(__linux__) - # include <sys/ptrace.h> - #else - /* Work around awkward prototype in ptrace.h. */ -@@ -222,7 +222,7 @@ - # define PTRACE_EVENT_EXIT 6 - #endif - --#if !defined(__GLIBC__) -+#if !defined(__GLIBC__) && !defined(PTRACE_PEEKUSER) - # define PTRACE_PEEKUSER PTRACE_PEEKUSR - # define PTRACE_POKEUSER PTRACE_POKEUSR - #endif ---- strace-4.8.orig/desc.c -+++ strace-4.8/desc.c -@@ -299,7 +299,7 @@ - #ifdef X32 - tprintf(", start=%lld, len=%lld", fl.l_start, fl.l_len); - #else -- tprintf(", start=%ld, len=%ld", fl.l_start, fl.l_len); -+ tprintf(", start=%ld, len=%ld", (long) fl.l_start, (long) fl.l_len); - #endif - if (getlk) - tprintf(", pid=%lu}", (unsigned long) fl.l_pid); ---- strace-4.8.orig/file.c -+++ strace-4.8/file.c -@@ -632,7 +632,7 @@ - return 0; - } - --#if _LFS64_LARGEFILE -+#if defined _LFS64_LARGEFILE || defined HAVE_LONG_LONG_OFF_T - int - sys_truncate64(struct tcb *tcp) - { -@@ -654,7 +654,7 @@ - return 0; - } - --#if _LFS64_LARGEFILE -+#if defined _LFS64_LARGEFILE || defined HAVE_LONG_LONG_OFF_T - int - sys_ftruncate64(struct tcb *tcp) - { -@@ -2322,7 +2322,7 @@ - return 0; - } - --#if _LFS64_LARGEFILE -+#if defined _LFS64_LARGEFILE || defined HAVE_LONG_LONG_OFF_T - int - sys_getdents64(struct tcb *tcp) - { ---- strace-4.8.orig/net.c -+++ strace-4.8/net.c -@@ -95,12 +95,14 @@ - #endif - - /* Under Linux these are enums so we can't test for them with ifdef. */ -+#if !defined(IPPROTO_MAX) - #define IPPROTO_EGP IPPROTO_EGP - #define IPPROTO_PUP IPPROTO_PUP - #define IPPROTO_IDP IPPROTO_IDP - #define IPPROTO_IGMP IPPROTO_IGMP - #define IPPROTO_RAW IPPROTO_RAW - #define IPPROTO_MAX IPPROTO_MAX -+#endif - - static const struct xlat domains[] = { - #ifdef PF_UNSPEC ---- strace-4.8.orig/process.c -+++ strace-4.8/process.c -@@ -55,7 +55,7 @@ - # endif - #endif - --#ifdef HAVE_LINUX_PTRACE_H -+#if defined HAVE_LINUX_PTRACE_H && defined __GLIBC__ - # undef PTRACE_SYSCALL - # ifdef HAVE_STRUCT_IA64_FPREG - # define ia64_fpreg XXX_ia64_fpreg -@@ -2857,7 +2857,7 @@ - if (umove(tcp, tcp->u_arg[2], &p) < 0) - tprintf(", %#lx", tcp->u_arg[2]); - else -- tprintf(", { %d }", p.__sched_priority); -+ tprintf(", { %d }", p.sched_priority); - } - return 0; - } -@@ -2872,7 +2872,7 @@ - if (umove(tcp, tcp->u_arg[1], &p) < 0) - tprintf("%#lx", tcp->u_arg[1]); - else -- tprintf("{ %d }", p.__sched_priority); -+ tprintf("{ %d }", p.sched_priority); - } - return 0; - } -@@ -2885,7 +2885,7 @@ - if (umove(tcp, tcp->u_arg[1], &p) < 0) - tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]); - else -- tprintf("%d, { %d }", (int) tcp->u_arg[0], p.__sched_priority); -+ tprintf("%d, { %d }", (int) tcp->u_arg[0], p.sched_priority); - } - return 0; - } ---- strace-4.8.orig/signal.c -+++ strace-4.8/signal.c -@@ -59,6 +59,7 @@ - #ifdef IA64 - # include <asm/ptrace_offsets.h> - #endif -+#include <asm/ptrace.h> - - #if defined(SPARC) || defined(SPARC64) || defined(MIPS) - typedef struct { ---- strace-4.8.orig/strace.c -+++ strace-4.8/strace.c -@@ -506,7 +506,7 @@ - perror_msg_and_die("dup2"); - close(fds[0]); - } -- execl(_PATH_BSHELL, "sh", "-c", command, NULL); -+ execl(_PATH_BSHELL, "sh", "-c", command, (void*) 0); - perror_msg_and_die("Can't execute '%s'", _PATH_BSHELL); - } - ---- strace-4.8.orig/syscall.c -+++ strace-4.8/syscall.c -@@ -72,13 +72,7 @@ - # include <elf.h> - #endif - --#if defined(AARCH64) --# include <asm/ptrace.h> --#endif -- --#if defined(XTENSA) --# include <asm/ptrace.h> --#endif -+#include <asm/ptrace.h> - - #ifndef ERESTARTSYS - # define ERESTARTSYS 512 ---- strace-4.8.orig/time.c -+++ strace-4.8/time.c -@@ -774,7 +774,11 @@ - /* _pad[0] is the _tid field which might not be - present in the userlevel definition of the - struct. */ -+#if defined(__GLIBC__) - tprintf("{%d}", sev._sigev_un._pad[0]); -+#else -+ tprintf("{%d}", (int) sev.__pad[0]); -+#endif - else if (sev.sigev_notify == SIGEV_THREAD) - tprintf("{%p, %p}", sev.sigev_notify_function, - sev.sigev_notify_attributes); ---- ./resource.c.orig -+++ ./resource.c -@@ -31,6 +31,7 @@ - #include "defs.h" - #include <sys/resource.h> - #include <sys/times.h> -+#include <sys/sysinfo.h> - #include <linux/kernel.h> - - static const struct xlat resources[] = { ---- strace-4.8.org/process.c -+++ strace-4.8/process.c -@@ -91,6 +91,10 @@ - # include <asm/rse.h> - #endif - -+#ifdef __arm__ -+#include <asm/ptrace.h> -+#endif -+ - #ifdef HAVE_PRCTL - # include <sys/prctl.h> - |