head 1.5; access; symbols pkgsrc-2018Q4:1.4.0.62 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.60 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.58 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.56 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.54 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.52 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.48 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.46 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.44 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.42 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.40 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.38 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.36 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.34 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.32 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.30 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.28 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.26 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.24 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.22 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.20 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.18 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.16 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.14 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.12 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.10 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.8 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.6 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.4 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.2 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.3.0.34 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.32 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.30 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.28 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.26 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.24 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.22 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.20 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.18 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.16 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.14 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.12 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.10 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.8 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.6 pkgsrc-2008Q1:1.3.0.4 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.2 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.2.0.4 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.2 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.1.0.10 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.8 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.6 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.4 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.2 pkgsrc-2006Q1-base:1.1; locks; strict; comment @# @; 1.5 date 2019.01.22.22.07.33; author christos; state dead; branches; next 1.4; commitid HGFAwVlb79iCoP8B; 1.4 date 2011.08.30.10.43.11; author christos; state Exp; branches; next 1.3; 1.3 date 2007.12.05.16.31.01; author christos; state Exp; branches; next 1.2; 1.2 date 2007.04.27.19.45.02; author christos; state Exp; branches; next 1.1; 1.1 date 2006.03.05.08.17.49; author christos; state Exp; branches; next ; desc @@ 1.5 log @make this compile again. @ text @$NetBSD: patch-aq,v 1.4 2011/08/30 10:43:11 christos Exp $ --- signal.c.orig 2007-01-12 00:08:38.000000000 +0200 +++ signal.c 2011-08-30 12:50:29.000000000 +0300 @@@@ -36,12 +36,27 @@@@ #include "defs.h" #include +#include #include #include -#ifdef SVR4 +#if defined(SVR4) || defined(NETBSD) #include #endif /* SVR4 */ +#ifdef NETBSD +#if !defined(UC_CPU) && defined(_UC_CPU) +#define UC_CPU _UC_CPU +#endif +#if !defined(UC_SIGMASK) && defined(_UC_SIGMASK) +#define UC_SIGMASK _UC_SIGMASK +#endif +#if !defined(UC_STACK) && defined(_UC_STACK) +#define UC_STACK _UC_STACK +#endif +#if !defined(UC_FPU) && defined(_UC_FPU) +#define UC_FPU _UC_FPU +#endif +#endif #ifdef HAVE_SYS_REG_H # include @@@@ -1056,14 +1071,14 @@@@ return 0; } -#if defined(SUNOS4) || defined(FREEBSD) +#if defined(SUNOS4) || defined(ALLBSD) int sys_sigblock(tcp) struct tcb *tcp; { return sys_sigsetmask(tcp); } -#endif /* SUNOS4 || FREEBSD */ +#endif /* SUNOS4 || ALLBSD */ #endif /* !SVR4 */ @@@@ -1165,13 +1180,13 @@@@ printsignal(tcp->u_arg[0]); tprintf(", "); switch (tcp->u_arg[1]) { - case (int) SIG_ERR: + case (long) SIG_ERR: tprintf("SIG_ERR"); break; - case (int) SIG_DFL: + case (long) SIG_DFL: tprintf("SIG_DFL"); break; - case (int) SIG_IGN: + case (long) SIG_IGN: #ifndef USE_PROCFS if (tcp->u_arg[0] == SIGTRAP) { tcp->flags |= TCB_SIGTRAPPED; @@@@ -1193,11 +1208,11 @@@@ } else { switch (tcp->u_rval) { - case (int) SIG_ERR: + case (long) SIG_ERR: tcp->auxstr = "SIG_ERR"; break; - case (int) SIG_DFL: + case (long) SIG_DFL: tcp->auxstr = "SIG_DFL"; break; - case (int) SIG_IGN: + case (long) SIG_IGN: tcp->auxstr = "SIG_IGN"; break; default: tcp->auxstr = NULL; @@@@ -1489,7 +1504,7 @@@@ #endif /* LINUX */ -#if defined(SVR4) || defined(FREEBSD) +#if defined(SVR4) || defined(ALLBSD) int sys_sigsuspend(tcp) @@@@ -1521,7 +1536,7 @@@@ #endif /* !FREEBSD */ #endif /* SVR4 || FREEBSD */ -#if defined SVR4 || defined LINUX || defined FREEBSD +#if defined SVR4 || defined LINUX || defined ALLBSD #if defined LINUX && !defined SS_ONSTACK #define SS_ONSTACK 1 #define SS_DISABLE 2 @@@@ -1613,7 +1628,7 @@@@ #endif /* SVR4 */ -#if defined(LINUX) || defined(FREEBSD) +#if defined(LINUX) || defined(ALLBSD) static int print_stack_t(tcp, addr) @@@@ -1702,14 +1717,14 @@@@ return 0; } -#if defined(FREEBSD) || defined(SUNOS4) +#if defined(ALLBSD) || defined(SUNOS4) int sys_killpg(tcp) struct tcb *tcp; { return sys_kill(tcp); } -#endif /* FREEBSD || SUNOS4 */ +#endif /* ALLBSD || SUNOS4 */ #ifdef LINUX int @ 1.4 log @make it work for NetBSD-current @ text @d1 1 a1 1 $NetBSD: patch-aq,v 1.3 2007/12/05 16:31:01 christos Exp $ @ 1.3 log @Use newer strace 4.5.15; various improvements in syscall parsing and split functions into more files. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- signal.c.orig 2007-01-11 17:08:38.000000000 -0500 +++ signal.c 2007-12-05 11:22:31.000000000 -0500 d51 32 @ 1.2 log @- make this work again on NetBSD/i386 - make this compile on NetBSD/x86_64 [does not work yet] - completely automate the NetBSD header generation. This should make porting to other platforms easier. @ text @d3 2 a4 2 --- signal.c.orig 2006-01-12 17:34:50.000000000 -0500 +++ signal.c 2007-04-27 11:31:51.000000000 -0400 d34 18 a51 1 @@@@ -1474,7 +1489,7 @@@@ d60 1 a60 1 @@@@ -1506,7 +1521,7 @@@@ d69 1 a69 1 @@@@ -1598,7 +1613,7 @@@@ d78 17 @ 1.1 log @add strace. This only works for NetBSD/i386 thus far. @ text @d3 58 a60 29 --- term.c 2005-06-01 15:02:38.000000000 -0400 +++ term.c 2006-03-04 18:21:07.000000000 -0500 @@@@ -184,7 +184,7 @@@@ long code, arg; { struct termios tios; -#ifndef FREEBSD +#ifndef ALLBSD struct termio tio; #else #define TCGETS TIOCGETA @@@@ -216,7 +216,7 @@@@ return 0; if (abbrev(tcp)) { tprintf(", {"); -#ifndef FREEBSD +#ifndef ALLBSD printxval(baud_options, tios.c_cflag & CBAUD, "B???"); #else printxval(baud_options, tios.c_ispeed, "B???"); @@@@ -237,7 +237,7 @@@@ (long) tios.c_iflag, (long) tios.c_oflag); tprintf("c_cflags=%#lx, c_lflags=%#lx, ", (long) tios.c_cflag, (long) tios.c_lflag); -#if !defined(SVR4) && !defined(FREEBSD) +#if !defined(SVR4) && !defined(ALLBSD) tprintf("c_line=%u, ", tios.c_line); #endif if (!(tios.c_lflag & ICANON)) @