diff options
Diffstat (limited to 'sysutils/strace/patches/patch-au')
| -rw-r--r-- | sysutils/strace/patches/patch-au | 44 |
1 files changed, 30 insertions, 14 deletions
diff --git a/sysutils/strace/patches/patch-au b/sysutils/strace/patches/patch-au index 1e9defa6cb5..e632e70e50f 100644 --- a/sysutils/strace/patches/patch-au +++ b/sysutils/strace/patches/patch-au @@ -1,7 +1,7 @@ -$NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $ +$NetBSD: patch-au,v 1.3 2007/12/05 16:31:01 christos Exp $ ---- syscall.c.orig 2006-01-12 05:18:53.000000000 -0500 -+++ syscall.c 2007-04-27 23:32:49.000000000 -0400 +--- syscall.c.orig 2006-12-21 17:13:33.000000000 -0500 ++++ syscall.c 2007-12-05 11:16:26.000000000 -0500 @@ -38,9 +38,9 @@ #include <signal.h> #include <time.h> @@ -24,7 +24,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $ #ifdef HAVE_SYS_REG_H #include <sys/reg.h> #ifndef PTRACE_PEEKUSR -@@ -634,6 +638,7 @@ +@@ -624,6 +628,7 @@ } #endif @@ -32,7 +32,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $ static void decode_subcall(tcp, subcall, nsubcalls, style) struct tcb *tcp; -@@ -719,6 +724,7 @@ +@@ -709,6 +714,7 @@ #endif /* FREEBSD */ } } @@ -40,7 +40,23 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $ #endif struct tcb *tcp_last = NULL; -@@ -855,9 +861,9 @@ +@@ -756,9 +762,12 @@ + ) + return internal_exec(tcp); + +- if ( sys_waitpid == func +- || sys_wait4 == func +-#if defined(SVR4) || defined(FREEBSD) || defined(SUNOS4) ++ if ( ++ sys_wait4 == func ++#ifndef NETBSD ++ || sys_waitpid == func ++#endif ++#if defined(SVR4) || defined(ALLBSD) || defined(SUNOS4) + || sys_wait == func + #endif + #ifdef ALPHA +@@ -811,9 +820,9 @@ static long rax; #endif #endif /* LINUX */ @@ -53,7 +69,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $ int get_scno(tcp) -@@ -1318,9 +1324,9 @@ +@@ -1283,9 +1292,9 @@ #ifdef HAVE_PR_SYSCALL scno = tcp->status.PR_SYSCALL; #else /* !HAVE_PR_SYSCALL */ @@ -65,7 +81,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $ if (pread(tcp->pfd_reg, ®s, sizeof(regs), 0) < 0) { perror("pread"); return -1; -@@ -1334,8 +1340,41 @@ +@@ -1299,8 +1308,41 @@ scno = regs.r_eax; break; } @@ -108,7 +124,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $ #endif /* USE_PROCFS */ if (!(tcp->flags & TCB_INSYSCALL)) tcp->scno = scno; -@@ -1360,7 +1399,9 @@ +@@ -1325,7 +1367,9 @@ struct tcb *tcp; { #ifndef USE_PROCFS @@ -118,7 +134,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $ #else /* USE_PROCFS */ int scno = known_scno(tcp); -@@ -1733,17 +1774,36 @@ +@@ -1698,17 +1742,36 @@ } #endif /* MIPS */ #endif /* SVR4 */ @@ -157,7 +173,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $ tcp->u_error = u_error; return 1; } -@@ -1926,6 +1986,32 @@ +@@ -1891,6 +1954,32 @@ return -1; } #endif /* FREEBSD */ @@ -190,7 +206,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $ /* All branches reach here on success (only). */ tcp->u_error = error; -@@ -1938,7 +2024,9 @@ +@@ -1903,7 +1992,9 @@ struct tcb *tcp; { #ifndef USE_PROCFS @@ -200,7 +216,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $ #endif /* !USE_PROCFS */ #ifdef LINUX #if defined(S390) || defined(S390X) -@@ -2236,6 +2324,58 @@ +@@ -2201,6 +2292,58 @@ I DONT KNOW WHAT TO DO #endif /* !HAVE_PR_SYSCALL */ #endif /* SVR4 */ @@ -259,7 +275,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $ #ifdef FREEBSD if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs > tcp->status.val) -@@ -2648,6 +2788,19 @@ +@@ -2570,6 +2713,19 @@ pread(tcp->pfd_reg, ®s, sizeof(regs), 0); val = regs.r_edx; #endif |