Module Name: src
Committed By: christos
Date: Sat Jan 23 21:22:50 UTC 2016
Modified Files:
src/external/bsd/ipf/bin/ipftest: Makefile
src/external/bsd/iscsi/initiator: Makefile
src/external/bsd/libproc: Makefile.inc
src/external/bsd/top/bin: Makefile
src/external/cddl/osnet: Makefile.inc
src/external/cddl/osnet/lib: Makefile.inc
src/external/cddl/osnet/sbin: Makefile.inc
src/external/cddl/osnet/usr.bin: Makefile.inc
src/external/cddl/osnet/usr.sbin: Makefile.inc
src/lib/libarch: Makefile
src/lib/libkern: Makefile
src/lib/libp2k: Makefile
src/lib/libperfuse: Makefile
src/lib/libpuffs: Makefile
src/lib/librefuse: Makefile
src/lib/librumpclient: Makefile
src/lib/librumphijack: Makefile
src/lib/librumpuser: Makefile
src/lib/libukfs: Makefile
src/libexec/ld.elf_so: Makefile
src/libexec/rpc.rstatd: Makefile
src/sbin/dkscan_bsdlabel: Makefile
src/sbin/fsirand: Makefile
src/sbin/mount: Makefile
src/sbin/mount_portal: Makefile
src/sbin/mount_puffs: Makefile
src/share/mk: bsd.prog.mk
src/sys/arch/i386/stand/boot: Makefile.boot
src/sys/arch/i386/stand/dosboot: Makefile
src/sys/arch/i386/stand/pxeboot: Makefile
src/tests/dev: Makefile.inc
src/tests/dev/audio: Makefile
src/tests/dev/dm: Makefile
src/tests/dev/md: Makefile
src/tests/dev/scsipi: Makefile
src/tests/dev/sysmon: Makefile
src/tests/fs: Makefile.inc
src/tests/fs/puffs/h_dtfs: Makefile
src/tests/include/sys: Makefile
src/tests/kernel: Makefile
src/tests/kernel/tty: Makefile
src/tests/lib/libc/sys: Makefile
src/tests/lib/librumpclient: Makefile
src/tests/lib/semaphore/pthread: Makefile
src/tests/modules: Makefile Makefile.inc
src/tests/net: Makefile.inc
src/tests/rump: Makefile.inc
src/usr.bin/kdump: Makefile
src/usr.bin/ktruss: Makefile
src/usr.bin/ldd: Makefile.inc
src/usr.bin/pmap: Makefile
src/usr.bin/rump_allserver: Makefile
src/usr.bin/rump_dhcpclient: Makefile
src/usr.bin/rump_halt: Makefile
src/usr.bin/rump_server: Makefile
src/usr.bin/systat: Makefile
src/usr.sbin: Makefile.inc
src/usr.sbin/acpitools/acpidump: Makefile
src/usr.sbin/acpitools/amldb: Makefile
src/usr.sbin/cpuctl: Makefile
src/usr.sbin/perfused: Makefile
src/usr.sbin/puffs: Makefile.inc
Added Files:
src/tests/fs/nfs: Makefile.inc
Log Message:
Define _KERNTYPES for things that need it.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/bin/ipftest/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/iscsi/initiator/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libproc/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/top/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/lib/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sbin/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/usr.bin/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/usr.sbin/Makefile.inc
cvs rdiff -u -r1.29 -r1.30 src/lib/libarch/Makefile
cvs rdiff -u -r1.6 -r1.7 src/lib/libkern/Makefile
cvs rdiff -u -r1.3 -r1.4 src/lib/libp2k/Makefile
cvs rdiff -u -r1.10 -r1.11 src/lib/libperfuse/Makefile
cvs rdiff -u -r1.25 -r1.26 src/lib/libpuffs/Makefile
cvs rdiff -u -r1.9 -r1.10 src/lib/librefuse/Makefile
cvs rdiff -u -r1.10 -r1.11 src/lib/librumpclient/Makefile
cvs rdiff -u -r1.16 -r1.17 src/lib/librumphijack/Makefile
cvs rdiff -u -r1.23 -r1.24 src/lib/librumpuser/Makefile
cvs rdiff -u -r1.7 -r1.8 src/lib/libukfs/Makefile
cvs rdiff -u -r1.129 -r1.130 src/libexec/ld.elf_so/Makefile
cvs rdiff -u -r1.21 -r1.22 src/libexec/rpc.rstatd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sbin/dkscan_bsdlabel/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sbin/fsirand/Makefile
cvs rdiff -u -r1.31 -r1.32 src/sbin/mount/Makefile
cvs rdiff -u -r1.25 -r1.26 src/sbin/mount_portal/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sbin/mount_puffs/Makefile
cvs rdiff -u -r1.293 -r1.294 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/i386/stand/boot/Makefile.boot
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/i386/stand/dosboot/Makefile
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/i386/stand/pxeboot/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/dev/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/tests/dev/audio/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/dev/dm/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/dev/md/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tests/dev/scsipi/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/dev/sysmon/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/tests/fs/nfs/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/puffs/h_dtfs/Makefile
cvs rdiff -u -r1.8 -r1.9 src/tests/include/sys/Makefile
cvs rdiff -u -r1.37 -r1.38 src/tests/kernel/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/kernel/tty/Makefile
cvs rdiff -u -r1.39 -r1.40 src/tests/lib/libc/sys/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/librumpclient/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/semaphore/pthread/Makefile
cvs rdiff -u -r1.11 -r1.12 src/tests/modules/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/modules/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/tests/net/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/tests/rump/Makefile.inc
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/kdump/Makefile
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/ktruss/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/ldd/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/pmap/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/rump_allserver/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/rump_dhcpclient/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/rump_halt/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/rump_server/Makefile
cvs rdiff -u -r1.37 -r1.38 src/usr.bin/systat/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/acpitools/acpidump/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/acpitools/amldb/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/cpuctl/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/perfused/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/puffs/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ipf/bin/ipftest/Makefile
diff -u src/external/bsd/ipf/bin/ipftest/Makefile:1.3 src/external/bsd/ipf/bin/ipftest/Makefile:1.4
--- src/external/bsd/ipf/bin/ipftest/Makefile:1.3 Sat Jan 17 06:25:30 2015
+++ src/external/bsd/ipf/bin/ipftest/Makefile Sat Jan 23 16:22:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/01/17 11:25:30 martin Exp $
+# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:45 christos Exp $
.include <bsd.own.mk>
@@ -12,7 +12,7 @@ MAN= ipftest.1
CPPFLAGS+= -DIPFILTER_LOG -DIPFILTER_LOOKUP \
-DIPFILTER_SYNC -DIPFILTER_CKSUM \
- -I.
+ -I. -D_KERNTYPES
COPTS.radix.c= -Wno-error
COPTS+= -fno-strict-aliasing
Index: src/external/bsd/iscsi/initiator/Makefile
diff -u src/external/bsd/iscsi/initiator/Makefile:1.5 src/external/bsd/iscsi/initiator/Makefile:1.6
--- src/external/bsd/iscsi/initiator/Makefile:1.5 Wed Aug 17 05:24:23 2011
+++ src/external/bsd/iscsi/initiator/Makefile Sat Jan 23 16:22:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/17 09:24:23 christos Exp $
+# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:45 christos Exp $
.sinclude "${.CURDIR}/../Makefile.inc"
@@ -13,7 +13,7 @@ PROG=iscsi-initiator
SRCS=iscsi-initiator.c virtdir.c libkmod.c
LDADD+= -lrefuse -liscsi -lpuffs
DPADD+= ${LIBREFUSE} ${LIBISCSI} ${LIBPUFFS}
-CPPFLAGS+= -I${ISCSIDIST}/include
+CPPFLAGS+= -I${ISCSIDIST}/include -D_KERNTYPES
CPPFLAGS+= -pthread
LDFLAGS+= -pthread
MAN=iscsi-initiator.8
Index: src/external/bsd/libproc/Makefile.inc
diff -u src/external/bsd/libproc/Makefile.inc:1.1 src/external/bsd/libproc/Makefile.inc:1.2
--- src/external/bsd/libproc/Makefile.inc:1.1 Thu Sep 24 10:12:48 2015
+++ src/external/bsd/libproc/Makefile.inc Sat Jan 23 16:22:45 2016
@@ -1,3 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2015/09/24 14:12:48 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2016/01/23 21:22:45 christos Exp $
LIBPROCDIR:= ${.PARSEDIR}/dist
+CPPFLAGS+= -D_KERNTYPES
Index: src/external/bsd/top/bin/Makefile
diff -u src/external/bsd/top/bin/Makefile:1.9 src/external/bsd/top/bin/Makefile:1.10
--- src/external/bsd/top/bin/Makefile:1.9 Thu Mar 21 17:43:22 2013
+++ src/external/bsd/top/bin/Makefile Sat Jan 23 16:22:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/03/21 21:43:22 christos Exp $
+# $NetBSD: Makefile,v 1.10 2016/01/23 21:22:45 christos Exp $
.include <bsd.own.mk>
@@ -11,7 +11,7 @@ TOPDIR=${.CURDIR}/../dist
WARNS= 4
CWARNFLAGS+= -Wno-missing-noreturn
-CPPFLAGS+=-I${.CURDIR} -I${TOPDIR} -I.
+CPPFLAGS+=-I${.CURDIR} -I${TOPDIR} -I. -D_KERNTYPES
SRCS= color.c commands.c display.c hash.c screen.c \
top.c username.c utils.c version.c m_netbsd.c
DPSRCS+=sigdesc.h config.h
Index: src/external/cddl/osnet/Makefile.inc
diff -u src/external/cddl/osnet/Makefile.inc:1.2 src/external/cddl/osnet/Makefile.inc:1.3
--- src/external/cddl/osnet/Makefile.inc:1.2 Sat Feb 7 15:30:03 2015
+++ src/external/cddl/osnet/Makefile.inc Sat Jan 23 16:22:45 2016
@@ -5,4 +5,4 @@ OSNETDIR= ${NETBSDSRCDIR}/external/cddl/
OPENSOLARIS_USR_DISTDIR=${OSNETDIR}/dist
OPENSOLARIS_SYS_DISTDIR=${OSNETDIR}/dist
-CPPFLAGS+=-Wno-unknown-pragmas -Wno-sign-compare
+CPPFLAGS+=-Wno-unknown-pragmas -Wno-sign-compare -D_KERNTYPES
Index: src/external/cddl/osnet/lib/Makefile.inc
diff -u src/external/cddl/osnet/lib/Makefile.inc:1.3 src/external/cddl/osnet/lib/Makefile.inc:1.4
--- src/external/cddl/osnet/lib/Makefile.inc:1.3 Sat Feb 20 20:46:34 2010
+++ src/external/cddl/osnet/lib/Makefile.inc Sat Jan 23 16:22:45 2016
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.3 2010/02/21 01:46:34 darran Exp $
+# $NetBSD: Makefile.inc,v 1.4 2016/01/23 21:22:45 christos Exp $
MKLINT=no
MKLINTLIB=no
+CPPFLAGS+= -D_KERNTYPES
Index: src/external/cddl/osnet/sbin/Makefile.inc
diff -u src/external/cddl/osnet/sbin/Makefile.inc:1.1 src/external/cddl/osnet/sbin/Makefile.inc:1.2
--- src/external/cddl/osnet/sbin/Makefile.inc:1.1 Fri Aug 7 16:57:56 2009
+++ src/external/cddl/osnet/sbin/Makefile.inc Sat Jan 23 16:22:45 2016
@@ -1,3 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/08/07 20:57:56 haad Exp $
+# $NetBSD: Makefile.inc,v 1.2 2016/01/23 21:22:45 christos Exp $
BINDIR?= /sbin
+CPPFLAGS+= -D_KERNTYPES
Index: src/external/cddl/osnet/usr.bin/Makefile.inc
diff -u src/external/cddl/osnet/usr.bin/Makefile.inc:1.1 src/external/cddl/osnet/usr.bin/Makefile.inc:1.2
--- src/external/cddl/osnet/usr.bin/Makefile.inc:1.1 Fri Aug 7 16:57:59 2009
+++ src/external/cddl/osnet/usr.bin/Makefile.inc Sat Jan 23 16:22:46 2016
@@ -1,3 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/08/07 20:57:59 haad Exp $
+# $NetBSD: Makefile.inc,v 1.2 2016/01/23 21:22:46 christos Exp $
BINDIR?= /usr/bin
+CPPFLAGS+= -D_KERNTYPES
Index: src/external/cddl/osnet/usr.sbin/Makefile.inc
diff -u src/external/cddl/osnet/usr.sbin/Makefile.inc:1.1 src/external/cddl/osnet/usr.sbin/Makefile.inc:1.2
--- src/external/cddl/osnet/usr.sbin/Makefile.inc:1.1 Fri Aug 7 16:57:59 2009
+++ src/external/cddl/osnet/usr.sbin/Makefile.inc Sat Jan 23 16:22:46 2016
@@ -1,3 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/08/07 20:57:59 haad Exp $
+# $NetBSD: Makefile.inc,v 1.2 2016/01/23 21:22:46 christos Exp $
BINDIR?= /usr/sbin
+CPPFLAGS+= -D_KERNTYPES
Index: src/lib/libarch/Makefile
diff -u src/lib/libarch/Makefile:1.29 src/lib/libarch/Makefile:1.30
--- src/lib/libarch/Makefile:1.29 Mon Jun 8 00:08:30 2015
+++ src/lib/libarch/Makefile Sat Jan 23 16:22:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/06/08 04:08:30 matt Exp $
+# $NetBSD: Makefile,v 1.30 2016/01/23 21:22:46 christos Exp $
.include <bsd.own.mk>
@@ -13,6 +13,7 @@ ARCHDIRS= alpha arm i386 m68k sparc x86_
OBJS+= ${ASM}
POBJS+= ${ASM:.o=.po}
CLEANFILES+= ${ASM} ${POBJS}
+CPPFLAGS+= -D_KERNTYPES
LIBC_MACHINE_CPU?= ${MACHINE_CPU}
Index: src/lib/libkern/Makefile
diff -u src/lib/libkern/Makefile:1.6 src/lib/libkern/Makefile:1.7
--- src/lib/libkern/Makefile:1.6 Sun Aug 25 10:20:30 2013
+++ src/lib/libkern/Makefile Sat Jan 23 16:22:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/08/25 14:20:30 matt Exp $
+# $NetBSD: Makefile,v 1.7 2016/01/23 21:22:46 christos Exp $
.include <bsd.obj.mk> # Pull in OBJDIR name rules.
.include <bsd.own.mk>
@@ -18,6 +18,7 @@ COPTS+= -fno-stack-protector
COPTS+= -fno-unwind-tables
CWARNFLAGS+= -Werror
CWARNFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
+CPPFLAGS+= -D_KERNTYPES
### find out what to use for libkern
KERN_AS= library
Index: src/lib/libp2k/Makefile
diff -u src/lib/libp2k/Makefile:1.3 src/lib/libp2k/Makefile:1.4
--- src/lib/libp2k/Makefile:1.3 Wed Sep 11 19:04:10 2013
+++ src/lib/libp2k/Makefile Sat Jan 23 16:22:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/09/11 23:04:10 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:46 christos Exp $
#
LIB= p2k
@@ -9,6 +9,7 @@ LIBDPLIBS+= puffs ${.CURDIR}/../libpuffs
INCS= p2k.h
INCSDIR= /usr/include/rump
+CPPFLAGS+= -D_KERNTYPES
SRCS= p2k.c
MAN= p2k.3
Index: src/lib/libperfuse/Makefile
diff -u src/lib/libperfuse/Makefile:1.10 src/lib/libperfuse/Makefile:1.11
--- src/lib/libperfuse/Makefile:1.10 Thu Sep 6 12:39:07 2012
+++ src/lib/libperfuse/Makefile Sat Jan 23 16:22:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/09/06 16:39:07 riz Exp $
+# $NetBSD: Makefile,v 1.11 2016/01/23 21:22:46 christos Exp $
LIB= perfuse
LIBDPLIBS+= puffs ${.CURDIR}/../libpuffs
@@ -8,7 +8,7 @@ PERFUSE_OPT_DEBUG_FLAGS= -g -DPERFUSE_
CWARNFLAGS.clang+= -Wno-format-security
#CFLAGS+= ${PERFUSE_OPT_DEBUG_FLAGS}
-CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR} -D_KERNTYPES
CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libpuffs
SRCS= perfuse.c ops.c subr.c debug.c
MAN= libperfuse.3
Index: src/lib/libpuffs/Makefile
diff -u src/lib/libpuffs/Makefile:1.25 src/lib/libpuffs/Makefile:1.26
--- src/lib/libpuffs/Makefile:1.25 Wed Mar 21 01:37:43 2012
+++ src/lib/libpuffs/Makefile Sat Jan 23 16:22:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/03/21 05:37:43 matt Exp $
+# $NetBSD: Makefile,v 1.26 2016/01/23 21:22:46 christos Exp $
#
.include <bsd.own.mk>
@@ -16,6 +16,7 @@ MAN= puffs.3 puffs_cc.3 puffs_cred.3 pu
puffs_framebuf.3 puffs_node.3 puffs_ops.3 puffs_path.3
INCS= puffs.h puffsdump.h
INCSDIR= /usr/include
+CPPFLAGS+= -D_KERNTYPES
LINTFLAGS+=-S -w
.include <bsd.lib.mk>
Index: src/lib/librefuse/Makefile
diff -u src/lib/librefuse/Makefile:1.9 src/lib/librefuse/Makefile:1.10
--- src/lib/librefuse/Makefile:1.9 Wed Mar 21 01:37:43 2012
+++ src/lib/librefuse/Makefile Sat Jan 23 16:22:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/03/21 05:37:43 matt Exp $
+# $NetBSD: Makefile,v 1.10 2016/01/23 21:22:46 christos Exp $
USE_FORT?= yes # data driven bugs?
@@ -11,6 +11,7 @@ FUSE_OPT_DEBUG_FLAGS= -g -DFUSE_OPT_DEBU
.endif
CFLAGS+= ${FUSE_OPT_DEBUG_FLAGS}
+CPPFLAGS+= -D_KERNTYPES
SRCS= refuse.c refuse_opt.c
MAN= refuse.3
WARNS?= 5
Index: src/lib/librumpclient/Makefile
diff -u src/lib/librumpclient/Makefile:1.10 src/lib/librumpclient/Makefile:1.11
--- src/lib/librumpclient/Makefile:1.10 Tue Sep 10 13:39:10 2013
+++ src/lib/librumpclient/Makefile Sat Jan 23 16:22:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/09/10 17:39:10 pooka Exp $
+# $NetBSD: Makefile,v 1.11 2016/01/23 21:22:46 christos Exp $
#
.PATH: ${.CURDIR}/../../sys/rump/librump/rumpkern
@@ -17,7 +17,7 @@ LIBDO.${lib}= _external
LIBDPLIBS+= ${lib} lib
.endfor
-CPPFLAGS+= -DRUMP_CLIENT
+CPPFLAGS+= -DRUMP_CLIENT -D_KERNTYPES
CPPFLAGS+= -I${.OBJDIR} -I${.CURDIR}
CPPFLAGS+= -I${.CURDIR}/../librumpuser
SRCS= rumpclient.c
Index: src/lib/librumphijack/Makefile
diff -u src/lib/librumphijack/Makefile:1.16 src/lib/librumphijack/Makefile:1.17
--- src/lib/librumphijack/Makefile:1.16 Sat Jan 18 13:37:30 2014
+++ src/lib/librumphijack/Makefile Sat Jan 23 16:22:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/01/18 18:37:30 tron Exp $
+# $NetBSD: Makefile,v 1.17 2016/01/23 21:22:46 christos Exp $
#
LIB= rumphijack
@@ -10,7 +10,7 @@ MAN= rumphijack.3
SRCS= hijack.c hijackdlsym.c
-CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT
+CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT -D_KERNTYPES
WARNS?= 5
Index: src/lib/librumpuser/Makefile
diff -u src/lib/librumpuser/Makefile:1.23 src/lib/librumpuser/Makefile:1.24
--- src/lib/librumpuser/Makefile:1.23 Sun Nov 9 12:39:37 2014
+++ src/lib/librumpuser/Makefile Sat Jan 23 16:22:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/11/09 17:39:37 pooka Exp $
+# $NetBSD: Makefile,v 1.24 2016/01/23 21:22:46 christos Exp $
#
.include <bsd.own.mk>
@@ -19,7 +19,7 @@ LIBDPLIBS+= pthread ${.CURDIR}/../libpth
LIBDO.${lib}= _external
LIBDPLIBS+= ${lib} lib
.endfor
-CPPFLAGS+= -DLIBRUMPUSER
+CPPFLAGS+= -DLIBRUMPUSER -D_KERNTYPES
#CPPFLAGS+= -D_DIAGNOSTIC
Index: src/lib/libukfs/Makefile
diff -u src/lib/libukfs/Makefile:1.7 src/lib/libukfs/Makefile:1.8
--- src/lib/libukfs/Makefile:1.7 Wed Sep 11 19:04:11 2013
+++ src/lib/libukfs/Makefile Sat Jan 23 16:22:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/09/11 23:04:11 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2016/01/23 21:22:47 christos Exp $
#
WARNS= 2
@@ -7,7 +7,7 @@ LIB= ukfs
LIBDPLIBS+= rump ${.CURDIR}/../librump \
rumpvfs ${.CURDIR}/../librumpvfs \
pthread ${.CURDIR}/../libpthread
-CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR} -D_KERNTYPES
INCS= ukfs.h
INCSDIR= /usr/include/rump
Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.129 src/libexec/ld.elf_so/Makefile:1.130
--- src/libexec/ld.elf_so/Makefile:1.129 Fri Sep 19 13:43:33 2014
+++ src/libexec/ld.elf_so/Makefile Sat Jan 23 16:22:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2014/09/19 17:43:33 matt Exp $
+# $NetBSD: Makefile,v 1.130 2016/01/23 21:22:47 christos Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
@@ -91,7 +91,7 @@ CLEANFILES+= errlist_concat.h ${PROG}.ma
BINDIR= ${SHLINKINSTALLDIR}
CPPFLAGS+= -DLIBDIR=\"${LIBDIR}\" -D_PATH_RTLD=\"${BINDIR}/${PROG}\"
-CPPFLAGS+= -I${.CURDIR} -I.
+CPPFLAGS+= -I${.CURDIR} -I. -D_KERNTYPES
CPPFLAGS+= -DRTLD_LOADER
CPPFLAGS+= -D_RTLD_SOURCE
CPPFLAGS+= -DCOMBRELOC
Index: src/libexec/rpc.rstatd/Makefile
diff -u src/libexec/rpc.rstatd/Makefile:1.21 src/libexec/rpc.rstatd/Makefile:1.22
--- src/libexec/rpc.rstatd/Makefile:1.21 Mon Jun 2 15:29:58 2014
+++ src/libexec/rpc.rstatd/Makefile Sat Jan 23 16:22:47 2016
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2014/06/02 19:29:58 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2016/01/23 21:22:47 christos Exp $
.include <bsd.own.mk>
PROG = rpc.rstatd
.PATH: ${NETBSDSRCDIR}/usr.bin/vmstat
-CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/vmstat
+CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/vmstat -D_KERNTYPES
SRCS = drvstats.c rstatd.c rstat_proc.c
MAN = rpc.rstatd.8
MLINKS= rpc.rstatd.8 rstatd.8
Index: src/sbin/dkscan_bsdlabel/Makefile
diff -u src/sbin/dkscan_bsdlabel/Makefile:1.2 src/sbin/dkscan_bsdlabel/Makefile:1.3
--- src/sbin/dkscan_bsdlabel/Makefile:1.2 Thu Mar 1 23:03:17 2007
+++ src/sbin/dkscan_bsdlabel/Makefile Sat Jan 23 16:22:47 2016
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/03/02 04:03:17 riz Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/23 21:22:47 christos Exp $
PROG= dkscan_bsdlabel
MAN= dkscan_bsdlabel.8
-CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dev/dkwedge
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dev/dkwedge -D_KERNTYPES
SRCS= dkscan_bsdlabel.c dkscan_util.c
LDADD+= -lutil
Index: src/sbin/fsirand/Makefile
diff -u src/sbin/fsirand/Makefile:1.8 src/sbin/fsirand/Makefile:1.9
--- src/sbin/fsirand/Makefile:1.8 Sun Jun 26 21:00:05 2005
+++ src/sbin/fsirand/Makefile Sat Jan 23 16:22:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/27 01:00:05 christos Exp $
+# $NetBSD: Makefile,v 1.9 2016/01/23 21:22:47 christos Exp $
.include <bsd.own.mk>
@@ -7,6 +7,7 @@ SRCS= fsirand.c ffs_bswap.c
MAN= fsirand.8
LDADD+= -lutil
+CPPFLAGS+= -D_KERNTYPES
.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs
Index: src/sbin/mount/Makefile
diff -u src/sbin/mount/Makefile:1.31 src/sbin/mount/Makefile:1.32
--- src/sbin/mount/Makefile:1.31 Sat Apr 7 01:58:55 2012
+++ src/sbin/mount/Makefile Sat Jan 23 16:22:47 2016
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2012/04/07 05:58:55 christos Exp $
+# $NetBSD: Makefile,v 1.32 2016/01/23 21:22:47 christos Exp $
# @(#)Makefile 8.6 (Berkeley) 5/8/95
.include <bsd.own.mk>
+CPPFLAGS+= -D_KERNTYPES
PROG= mount
MAN= mount.8
SRCS= mount.c vfslist.c
Index: src/sbin/mount_portal/Makefile
diff -u src/sbin/mount_portal/Makefile:1.25 src/sbin/mount_portal/Makefile:1.26
--- src/sbin/mount_portal/Makefile:1.25 Sun Aug 14 07:34:11 2011
+++ src/sbin/mount_portal/Makefile Sat Jan 23 16:22:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2011/08/14 11:34:11 christos Exp $
+# $NetBSD: Makefile,v 1.26 2016/01/23 21:22:47 christos Exp $
# @(#)Makefile 8.3 (Berkeley) 3/27/94
.include <bsd.own.mk>
@@ -12,6 +12,7 @@ MAN= mount_portal.8
DPADD+=${LIBUTIL} ${LIBPUFFS}
LDADD+=-lutil -lpuffs
+CPPFLAGS+= -D_KERNTYPES
COPTS.pt_filter.c = -Wno-format-nonliteral
Index: src/sbin/mount_puffs/Makefile
diff -u src/sbin/mount_puffs/Makefile:1.1 src/sbin/mount_puffs/Makefile:1.2
--- src/sbin/mount_puffs/Makefile:1.1 Thu Jan 14 16:25:48 2010
+++ src/sbin/mount_puffs/Makefile Sat Jan 23 16:22:47 2016
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2010/01/14 21:25:48 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/23 21:22:47 christos Exp $
#
PROG= mount_puffs
DPADD+= ${LIBUTIL}
LDADD+= -lutil
+CPPFLAGS+= -D_KERNTYPES
MAN= mount_puffs.8
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.293 src/share/mk/bsd.prog.mk:1.294
--- src/share/mk/bsd.prog.mk:1.293 Sat Nov 7 18:41:58 2015
+++ src/share/mk/bsd.prog.mk Sat Jan 23 16:22:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.293 2015/11/07 23:41:58 joerg Exp $
+# $NetBSD: bsd.prog.mk,v 1.294 2016/01/23 21:22:47 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -330,6 +330,7 @@ _CCLINK= ${CXX} ${_CCLINKFLAGS}
.endif
.if defined(RUMPPRG)
+CPPFLAGS+= -D_KERNTYPES
PROG= ${RUMPPRG}
. ifndef CRUNCHEDPROG
. if (${MKRUMP} != "no")
Index: src/sys/arch/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.67 src/sys/arch/i386/stand/boot/Makefile.boot:1.68
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.67 Thu Aug 20 07:39:28 2015
+++ src/sys/arch/i386/stand/boot/Makefile.boot Sat Jan 23 16:22:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.67 2015/08/20 11:39:28 uebayasi Exp $
+# $NetBSD: Makefile.boot,v 1.68 2016/01/23 21:22:47 christos Exp $
S= ${.CURDIR}/../../../../..
@@ -36,7 +36,7 @@ BINMODE=444
LDFLAGS+= -nostdlib -Wl,-N -Wl,-e,boot_start
CPPFLAGS+= -I ${.CURDIR}/.. -I ${.CURDIR}/../../lib -I ${S}/lib/libsa
-CPPFLAGS+= -I ${.OBJDIR}
+CPPFLAGS+= -I ${.OBJDIR} -D_KERNTYPES
# Make sure we override any optimization options specified by the user
COPTS= -Os
Index: src/sys/arch/i386/stand/dosboot/Makefile
diff -u src/sys/arch/i386/stand/dosboot/Makefile:1.28 src/sys/arch/i386/stand/dosboot/Makefile:1.29
--- src/sys/arch/i386/stand/dosboot/Makefile:1.28 Wed Jan 15 17:25:22 2014
+++ src/sys/arch/i386/stand/dosboot/Makefile Sat Jan 23 16:22:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/01/15 22:25:22 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2016/01/23 21:22:47 christos Exp $
S= ${.CURDIR}/../../../..
@@ -13,7 +13,7 @@ SRCS= main.c devopen.c exec.c
CPPFLAGS+= -DSLOW # for libz
CPPFLAGS+= -DCOMPAT_386BSD_MBRPART
-CPPFLAGS+= -DXMS
+CPPFLAGS+= -DXMS -D_KERNTYPES
CPPFLAGS+= -DLIBSA_ENABLE_LS_OP
#uncomment if there are problems with memory detection
#CPPFLAGS+= -DCONSERVATIVE_MEMDETECT
Index: src/sys/arch/i386/stand/pxeboot/Makefile
diff -u src/sys/arch/i386/stand/pxeboot/Makefile:1.22 src/sys/arch/i386/stand/pxeboot/Makefile:1.23
--- src/sys/arch/i386/stand/pxeboot/Makefile:1.22 Wed Jan 15 17:25:22 2014
+++ src/sys/arch/i386/stand/pxeboot/Makefile Sat Jan 23 16:22:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/01/15 22:25:22 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2016/01/23 21:22:47 christos Exp $
S= ${.CURDIR}/../../../..
@@ -40,7 +40,7 @@ CPPFLAGS+= -DSUPPORT_SERIAL=boot_params.
CPPFLAGS+= -DCONSPEED=boot_params.bp_conspeed
CPPFLAGS+= -DCONSADDR=boot_params.bp_consaddr
CPPFLAGS+= -DCONSOLE_KEYMAP=boot_params.bp_keymap
-CPPFLAGS+= -DDIRECT_SERIAL
+CPPFLAGS+= -DDIRECT_SERIAL -D_KERNTYPES
# Various serial line configurations
#CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_PC -DDIRECT_SERIAL
# or
Index: src/tests/dev/Makefile.inc
diff -u src/tests/dev/Makefile.inc:1.1 src/tests/dev/Makefile.inc:1.2
--- src/tests/dev/Makefile.inc:1.1 Wed Nov 3 12:10:19 2010
+++ src/tests/dev/Makefile.inc Sat Jan 23 16:22:48 2016
@@ -1 +1,2 @@
.include "../Makefile.inc"
+CPPFlAGS+=-D_KERNTYPES
Index: src/tests/dev/audio/Makefile
diff -u src/tests/dev/audio/Makefile:1.4 src/tests/dev/audio/Makefile:1.5
--- src/tests/dev/audio/Makefile:1.4 Sun Dec 2 13:39:53 2012
+++ src/tests/dev/audio/Makefile Sat Jan 23 16:22:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/12/02 18:39:53 pgoyette Exp $
+# $NetBSD: Makefile,v 1.5 2016/01/23 21:22:48 christos Exp $
#
.include <bsd.own.mk>
@@ -13,6 +13,7 @@ MKMAN=no
PROGS= h_pad
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -lrumpdev_pad -lrumpdev_audio -lrumpdev -lrumpvfs
LDADD+= -lrump
LDADD+= -lrumpuser
Index: src/tests/dev/dm/Makefile
diff -u src/tests/dev/dm/Makefile:1.2 src/tests/dev/dm/Makefile:1.3
--- src/tests/dev/dm/Makefile:1.2 Sun Dec 2 13:39:53 2012
+++ src/tests/dev/dm/Makefile Sat Jan 23 16:22:48 2016
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2012/12/02 18:39:53 pgoyette Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/23 21:22:48 christos Exp $
#
.include <bsd.own.mk>
@@ -14,6 +14,7 @@ MKMAN=no
PROGS= h_dm
+CPPFLAGS+=-D_KERNTYPES
LDADD+= -lprop -lutil
LDADD+= -lrumpdev_disk -lrumpdev_dm
LDADD+= -lrumpdev -lrumpvfs
Index: src/tests/dev/md/Makefile
diff -u src/tests/dev/md/Makefile:1.5 src/tests/dev/md/Makefile:1.6
--- src/tests/dev/md/Makefile:1.5 Wed Jan 7 17:24:03 2015
+++ src/tests/dev/md/Makefile Sat Jan 23 16:22:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/01/07 22:24:03 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:48 christos Exp $
#
.include <bsd.own.mk>
@@ -13,6 +13,7 @@ MKMAN=no
PROGS= h_mdserv
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -lrumpdev_md -lrumpdev_disk -lrumpdev -lrumpvfs
LDADD+= -lrumpkern_sysproxy -lrump
LDADD+= -lrumpuser
Index: src/tests/dev/scsipi/Makefile
diff -u src/tests/dev/scsipi/Makefile:1.6 src/tests/dev/scsipi/Makefile:1.7
--- src/tests/dev/scsipi/Makefile:1.6 Tue Jun 10 00:28:39 2014
+++ src/tests/dev/scsipi/Makefile Sat Jan 23 16:22:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.7 2016/01/23 21:22:48 christos Exp $
#
.include <bsd.own.mk>
@@ -7,7 +7,7 @@ TESTSDIR= ${TESTSBASE}/dev/scsipi
TESTS_C= t_cd
-CPPFLAGS+= -I${.CURDIR}/libscsitest
+CPPFLAGS+= -I${.CURDIR}/libscsitest -D_KERNTYPES
# kernel component required by test
SUBDIR= libscsitest
Index: src/tests/dev/sysmon/Makefile
diff -u src/tests/dev/sysmon/Makefile:1.3 src/tests/dev/sysmon/Makefile:1.4
--- src/tests/dev/sysmon/Makefile:1.3 Tue Jun 10 00:28:39 2014
+++ src/tests/dev/sysmon/Makefile Sat Jan 23 16:22:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:48 christos Exp $
#
.include <bsd.own.mk>
@@ -7,6 +7,7 @@ TESTSDIR= ${TESTSBASE}/dev/sysmon
TESTS_C= t_swwdog
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -lrumpdev_sysmon -lrumpdev -lrumpvfs
LDADD+= -lrump
LDADD+= -lrumpuser
Index: src/tests/fs/Makefile.inc
diff -u src/tests/fs/Makefile.inc:1.1 src/tests/fs/Makefile.inc:1.2
--- src/tests/fs/Makefile.inc:1.1 Wed Nov 3 12:10:20 2010
+++ src/tests/fs/Makefile.inc Sat Jan 23 16:22:48 2016
@@ -1 +1,2 @@
.include "../Makefile.inc"
+CPPFLAGS+= -D_KERNTYPES
Index: src/tests/fs/puffs/h_dtfs/Makefile
diff -u src/tests/fs/puffs/h_dtfs/Makefile:1.4 src/tests/fs/puffs/h_dtfs/Makefile:1.5
--- src/tests/fs/puffs/h_dtfs/Makefile:1.4 Tue Jul 13 17:13:23 2010
+++ src/tests/fs/puffs/h_dtfs/Makefile Sat Jan 23 16:22:48 2016
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2010/07/13 21:13:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2016/01/23 21:22:48 christos Exp $
TESTSDIR= ${TESTSBASE}/fs/puffs/h_dtfs
ATFFILE= no
TESTS_C= h_dtfs
+CPPFLAGS+= -D_KERNTYPES
SRCS.h_dtfs= dtfs.c dtfs_vfsops.c dtfs_vnops.c dtfs_subr.c
LDADD+= -lpuffs -lutil
Index: src/tests/include/sys/Makefile
diff -u src/tests/include/sys/Makefile:1.8 src/tests/include/sys/Makefile:1.9
--- src/tests/include/sys/Makefile:1.8 Sun Jun 21 20:05:23 2015
+++ src/tests/include/sys/Makefile Sat Jan 23 16:22:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/06/22 00:05:23 matt Exp $
+# $NetBSD: Makefile,v 1.9 2016/01/23 21:22:48 christos Exp $
NOMAN= # defined
@@ -12,6 +12,7 @@ LDADD.t_bitops+= -lm
.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
TESTS_C+= t_socket
+CPPFLAGS.t_socket.c+= -D_KERNTYPES
LDADD.t_socket+= -lrumpnet_local -lrumpnet_net -lrumpnet
LDADD.t_socket+= -lrumpvfs -lrump -lrumpuser -lpthread
.endif
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.37 src/tests/kernel/Makefile:1.38
--- src/tests/kernel/Makefile:1.37 Sun Jun 21 20:05:23 2015
+++ src/tests/kernel/Makefile Sat Jan 23 16:22:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2015/06/22 00:05:23 matt Exp $
+# $NetBSD: Makefile,v 1.38 2016/01/23 21:22:48 christos Exp $
NOMAN= # defined
@@ -38,6 +38,7 @@ LDADD.t_extattrctl+= -lrump -lpthread
LDADD.t_filedesc+= ${LDADD.t_rnd}
LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser
LDADD.t_rnd+= -lrump -lpthread
+CPPFLAGS+= -D_KERNTYPES
.endif
Index: src/tests/kernel/tty/Makefile
diff -u src/tests/kernel/tty/Makefile:1.2 src/tests/kernel/tty/Makefile:1.3
--- src/tests/kernel/tty/Makefile:1.2 Tue Jun 10 00:28:39 2014
+++ src/tests/kernel/tty/Makefile Sat Jan 23 16:22:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/23 21:22:49 christos Exp $
.include <bsd.own.mk>
@@ -6,6 +6,7 @@ TESTSDIR= ${TESTSBASE}/kernel/tty
TESTS_C= t_pr
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -lrumpkern_tty -lrumpvfs -lrump -lrumpuser
LDADD+= -lrump
LDADD+= -lpthread
Index: src/tests/lib/libc/sys/Makefile
diff -u src/tests/lib/libc/sys/Makefile:1.39 src/tests/lib/libc/sys/Makefile:1.40
--- src/tests/lib/libc/sys/Makefile:1.39 Sun Jun 21 20:05:23 2015
+++ src/tests/lib/libc/sys/Makefile Sat Jan 23 16:22:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2015/06/22 00:05:23 matt Exp $
+# $NetBSD: Makefile,v 1.40 2016/01/23 21:22:49 christos Exp $
MKMAN= no
@@ -72,6 +72,7 @@ SRCS.t_mprotect= t_mprotect.c ${SRCS_EXE
LDADD.t_getpid+= -lpthread
.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
+CPPFLAGS.t_posix_fadvise.c += -D_KERNTYPES
TESTS_C+= t_posix_fadvise
LDADD.t_posix_fadvise+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
.endif
Index: src/tests/lib/librumpclient/Makefile
diff -u src/tests/lib/librumpclient/Makefile:1.5 src/tests/lib/librumpclient/Makefile:1.6
--- src/tests/lib/librumpclient/Makefile:1.5 Sun Dec 2 12:36:10 2012
+++ src/tests/lib/librumpclient/Makefile Sat Jan 23 16:22:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/12/02 17:36:10 pgoyette Exp $
+# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:49 christos Exp $
#
.include <bsd.own.mk>
@@ -14,6 +14,7 @@ MKMAN= no
PROGS+= h_exec
PROGS+= h_execthr
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -lrumpclient
LDADD.h_execthr= -lpthread
Index: src/tests/lib/semaphore/pthread/Makefile
diff -u src/tests/lib/semaphore/pthread/Makefile:1.3 src/tests/lib/semaphore/pthread/Makefile:1.4
--- src/tests/lib/semaphore/pthread/Makefile:1.3 Tue Jun 10 00:28:39 2014
+++ src/tests/lib/semaphore/pthread/Makefile Sat Jan 23 16:22:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:49 christos Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@ TESTSDIR= ${TESTSBASE}/lib/semaphore/pth
TESTS_C= t_sem_pth
-CPPFLAGS+= -I${.CURDIR}/..
+CPPFLAGS+= -I${.CURDIR}/.. -D_KERNTYPES
LDADD+= -lrump -lrumpuser -lrump -lpthread
Index: src/tests/modules/Makefile
diff -u src/tests/modules/Makefile:1.11 src/tests/modules/Makefile:1.12
--- src/tests/modules/Makefile:1.11 Tue Jun 10 00:28:40 2014
+++ src/tests/modules/Makefile Sat Jan 23 16:22:49 2016
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2014/06/10 04:28:40 he Exp $
+# $NetBSD: Makefile,v 1.12 2016/01/23 21:22:49 christos Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/modules
+CPPFLAGS+= -D_KERNTYPES
# Ideally this test could be in the parent Makefile, which could not descend
# into this directory at all. Unfortunately, the etc/mtree/NetBSD.dist file
Index: src/tests/modules/Makefile.inc
diff -u src/tests/modules/Makefile.inc:1.1 src/tests/modules/Makefile.inc:1.2
--- src/tests/modules/Makefile.inc:1.1 Wed Nov 3 12:10:23 2010
+++ src/tests/modules/Makefile.inc Sat Jan 23 16:22:49 2016
@@ -1 +1,2 @@
.include "../Makefile.inc"
+CPPFLAGS+= -D_KERNTYPES
Index: src/tests/net/Makefile.inc
diff -u src/tests/net/Makefile.inc:1.1 src/tests/net/Makefile.inc:1.2
--- src/tests/net/Makefile.inc:1.1 Wed Nov 3 12:10:24 2010
+++ src/tests/net/Makefile.inc Sat Jan 23 16:22:49 2016
@@ -1 +1,2 @@
.include "../Makefile.inc"
+CPPFLAGS+=-D_KERNTYPES
Index: src/tests/rump/Makefile.inc
diff -u src/tests/rump/Makefile.inc:1.1 src/tests/rump/Makefile.inc:1.2
--- src/tests/rump/Makefile.inc:1.1 Wed Nov 3 12:10:25 2010
+++ src/tests/rump/Makefile.inc Sat Jan 23 16:22:49 2016
@@ -1 +1,2 @@
.include "../Makefile.inc"
+CPPFLAGS+= -D_KERNTYPES
Index: src/usr.bin/kdump/Makefile
diff -u src/usr.bin/kdump/Makefile:1.31 src/usr.bin/kdump/Makefile:1.32
--- src/usr.bin/kdump/Makefile:1.31 Fri Sep 25 23:31:11 2015
+++ src/usr.bin/kdump/Makefile Sat Jan 23 16:22:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2015/09/26 03:31:11 christos Exp $
+# $NetBSD: Makefile,v 1.32 2016/01/23 21:22:49 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk> # for MKDYNAMICROOT & NETBSDSRCDIR
@@ -17,7 +17,7 @@ LDSTATIC?=-static
.include "Makefile.ioctl-c"
.include "Makefile.siginfo-c"
-CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys
+CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys -D_KERNTYPES
LDADD+=-lutil
DPADD+=${LIBUTIL}
Index: src/usr.bin/ktruss/Makefile
diff -u src/usr.bin/ktruss/Makefile:1.29 src/usr.bin/ktruss/Makefile:1.30
--- src/usr.bin/ktruss/Makefile:1.29 Sat Sep 26 09:31:27 2015
+++ src/usr.bin/ktruss/Makefile Sat Jan 23 16:22:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/09/26 13:31:27 christos Exp $
+# $NetBSD: Makefile,v 1.30 2016/01/23 21:22:49 christos Exp $
NOMAN= # defined
@@ -30,7 +30,7 @@ misc.c misc.h: ${DESTDIR}/usr/include/sy
.include "${NETBSDSRCDIR}/usr.bin/kdump/Makefile.ioctl-c"
CPPFLAGS+= -I. -I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys \
- -I${NETBSDSRCDIR}/usr.bin/kdump -DKTRUSS
+ -I${NETBSDSRCDIR}/usr.bin/kdump -DKTRUSS -D_KERNTYPES
.include <bsd.prog.mk>
Index: src/usr.bin/ldd/Makefile.inc
diff -u src/usr.bin/ldd/Makefile.inc:1.6 src/usr.bin/ldd/Makefile.inc:1.7
--- src/usr.bin/ldd/Makefile.inc:1.6 Sat Jun 13 16:38:52 2015
+++ src/usr.bin/ldd/Makefile.inc Sat Jan 23 16:22:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2015/06/13 20:38:52 martin Exp $
+# $NetBSD: Makefile.inc,v 1.7 2016/01/23 21:22:49 christos Exp $
WARNS?= 3 # XXX: -Wsign-compare issues ld.elf_so source
@@ -22,6 +22,7 @@ MLIBDIR= 64
COMPAT_MLIBDIR= o32
CPPFLAGS+= -DLDD_ELF64 -DMIPS_N32
.endif
+CPPFLAGS+= -D_KERNTYPES
.endif # MKCOMPAT
Index: src/usr.bin/pmap/Makefile
diff -u src/usr.bin/pmap/Makefile:1.6 src/usr.bin/pmap/Makefile:1.7
--- src/usr.bin/pmap/Makefile:1.6 Sun Dec 13 22:15:10 2015
+++ src/usr.bin/pmap/Makefile Sat Jan 23 16:22:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/12/14 03:15:10 christos Exp $
+# $NetBSD: Makefile,v 1.7 2016/01/23 21:22:49 christos Exp $
USE_FORT?= yes # setgid
PROG= pmap
@@ -9,5 +9,6 @@ LDADD= -lutil -lkvm
DPADD= ${LIBUTIL} ${LIBKVM}
CWARNFLAGS.clang+= -Wno-format-extra-args
+CPPFLAGS+= -D_KMEMUSER
.include <bsd.prog.mk>
Index: src/usr.bin/rump_allserver/Makefile
diff -u src/usr.bin/rump_allserver/Makefile:1.7 src/usr.bin/rump_allserver/Makefile:1.8
--- src/usr.bin/rump_allserver/Makefile:1.7 Wed Nov 13 12:47:27 2013
+++ src/usr.bin/rump_allserver/Makefile Sat Jan 23 16:22:49 2016
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2013/11/13 17:47:27 pooka Exp $
+# $NetBSD: Makefile,v 1.8 2016/01/23 21:22:49 christos Exp $
#
PROG= rump_allserver
MLINKS+=rump_allserver.1 rump_server.1
RUMPTOP=${.CURDIR}/../../sys/rump
+CPPFLAGS+= -D_KERNTYPES
.include "${RUMPTOP}/dev/Makefile.rumpdevcomp"
.include "${RUMPTOP}/fs/Makefile.rumpfscomp"
Index: src/usr.bin/rump_dhcpclient/Makefile
diff -u src/usr.bin/rump_dhcpclient/Makefile:1.1 src/usr.bin/rump_dhcpclient/Makefile:1.2
--- src/usr.bin/rump_dhcpclient/Makefile:1.1 Thu Jan 20 13:47:19 2011
+++ src/usr.bin/rump_dhcpclient/Makefile Sat Jan 23 16:22:50 2016
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2011/01/20 18:47:19 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/23 21:22:50 christos Exp $
#
PROG= rump.dhcpclient
SRCS= main.c bpf.c common.c configure.c dhcp.c if-bsd.c net.c
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -lrumpclient
Index: src/usr.bin/rump_halt/Makefile
diff -u src/usr.bin/rump_halt/Makefile:1.1 src/usr.bin/rump_halt/Makefile:1.2
--- src/usr.bin/rump_halt/Makefile:1.1 Sun Dec 12 07:48:31 2010
+++ src/usr.bin/rump_halt/Makefile Sat Jan 23 16:22:50 2016
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2010/12/12 12:48:31 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/23 21:22:50 christos Exp $
#
PROG= rump.halt
LDADD+= -lrumpclient
DPADD+= ${RUMPCLIENT}
+CPPFLAGS+= -D_KERNTYPES
.include <bsd.prog.mk>
Index: src/usr.bin/rump_server/Makefile
diff -u src/usr.bin/rump_server/Makefile:1.8 src/usr.bin/rump_server/Makefile:1.9
--- src/usr.bin/rump_server/Makefile:1.8 Wed Jan 7 17:24:03 2015
+++ src/usr.bin/rump_server/Makefile Sat Jan 23 16:22:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/01/07 22:24:03 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2016/01/23 21:22:50 christos Exp $
#
.PATH: ${.CURDIR}/../rump_allserver
@@ -7,6 +7,7 @@ PROG= rump_server
SRCS= rump_allserver.c
NOMAN= installed by ../rump_allserver
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -Wl,--whole-archive -lrumpkern_sysproxy -lrump \
-lrumpuser -Wl,--no-whole-archive -lpthread
Index: src/usr.bin/systat/Makefile
diff -u src/usr.bin/systat/Makefile:1.37 src/usr.bin/systat/Makefile:1.38
--- src/usr.bin/systat/Makefile:1.37 Fri Jan 6 09:08:08 2012
+++ src/usr.bin/systat/Makefile Sat Jan 23 16:22:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2012/01/06 14:08:08 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2016/01/23 21:22:50 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -9,7 +9,7 @@ PROG= systat
.PATH: ${NETBSDSRCDIR}/usr.bin/vmstat ${NETBSDSRCDIR}/usr.bin/who
CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/vmstat -DSUPPORT_UTMP -DSUPPORT_UTMPX \
- -I${NETBSDSRCDIR}/usr.bin/who
+ -I${NETBSDSRCDIR}/usr.bin/who -D_KMEMUSER
CWARNFLAGS+= -Wno-format-y2k
SRCS= bufcache.c cmds.c cmdtab.c disks.c df.c drvstats.c fetch.c \
globalcmds.c icmp.c iostat.c ip.c keyboard.c main.c mbufs.c \
Index: src/usr.sbin/Makefile.inc
diff -u src/usr.sbin/Makefile.inc:1.6 src/usr.sbin/Makefile.inc:1.7
--- src/usr.sbin/Makefile.inc:1.6 Wed Apr 22 11:23:01 2009
+++ src/usr.sbin/Makefile.inc Sat Jan 23 16:22:50 2016
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.6 2009/04/22 15:23:01 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.7 2016/01/23 21:22:50 christos Exp $
# from: @(#)Makefile.inc 8.1 (Berkeley) 6/6/93
BINDIR?= /usr/sbin
WARNS?= 4
+CPPFLAGS+= -D_KERNTYPES
Index: src/usr.sbin/acpitools/acpidump/Makefile
diff -u src/usr.sbin/acpitools/acpidump/Makefile:1.5 src/usr.sbin/acpitools/acpidump/Makefile:1.6
--- src/usr.sbin/acpitools/acpidump/Makefile:1.5 Sun Dec 27 16:42:22 2009
+++ src/usr.sbin/acpitools/acpidump/Makefile Sat Jan 23 16:22:50 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/12/27 21:42:22 abs Exp $
+# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:50 christos Exp $
# $FreeBSD: src/usr.sbin/acpi/acpidump/Makefile,v 1.7 2003/08/28 03:33:07 njl Exp $
.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
-CPPFLAGS+=-I${.CURDIR}/../../../sys
+CPPFLAGS+=-I${.CURDIR}/../../../sys -D_KERNTYPES
CPPFLAGS+=-I${.CURDIR}/..
PROG= acpidump
SRCS= acpi.c acpi_user.c acpidump.c
Index: src/usr.sbin/acpitools/amldb/Makefile
diff -u src/usr.sbin/acpitools/amldb/Makefile:1.3 src/usr.sbin/acpitools/amldb/Makefile:1.4
--- src/usr.sbin/acpitools/amldb/Makefile:1.3 Sat Feb 14 08:56:41 2009
+++ src/usr.sbin/acpitools/amldb/Makefile Sat Jan 23 16:22:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/02/14 13:56:41 abs Exp $
+# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:50 christos Exp $
# Id: Makefile,v 1.5 2000/07/14 18:16:30 iwasaki Exp
# $FreeBSD: src/usr.sbin/acpi/amldb/Makefile,v 1.7 2001/10/22 17:25:32 iwasaki Exp $
@@ -8,7 +8,7 @@ SRCS= amldb.c debug.c region.c
SRCS+= aml_parse.c aml_name.c aml_amlmem.c aml_memman.c aml_store.c \
aml_obj.c aml_evalobj.c aml_common.c
-CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR} -D_KERNTYPES
.endif
MAN= amldb.8
Index: src/usr.sbin/cpuctl/Makefile
diff -u src/usr.sbin/cpuctl/Makefile:1.7 src/usr.sbin/cpuctl/Makefile:1.8
--- src/usr.sbin/cpuctl/Makefile:1.7 Thu Aug 1 19:19:39 2013
+++ src/usr.sbin/cpuctl/Makefile Sat Jan 23 16:22:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/08/01 23:19:39 matt Exp $
+# $NetBSD: Makefile,v 1.8 2016/01/23 21:22:50 christos Exp $
.include <bsd.own.mk>
@@ -19,6 +19,7 @@ SRCS+= noarch.c
SRCS+= ${MACHINE_ARCH}-asm.S
.endif
+CPPFLAGS+= -D_KERNTYPES
LDADD+=-lutil
DPADD+=${LIBUTIL}
Index: src/usr.sbin/perfused/Makefile
diff -u src/usr.sbin/perfused/Makefile:1.5 src/usr.sbin/perfused/Makefile:1.6
--- src/usr.sbin/perfused/Makefile:1.5 Thu Sep 6 12:39:08 2012
+++ src/usr.sbin/perfused/Makefile Sat Jan 23 16:22:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/09/06 16:39:08 riz Exp $
+# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:50 christos Exp $
PROG= perfused
@@ -9,6 +9,7 @@ SRCS= perfused.c msg.c debug.c
MAN= perfused.8
WARNS= 4
+CPPFLAGS+= -D_KERNTYPES
LDADD+= -lperfuse -lpuffs
DPADD+= ${LIBPUFFS}
Index: src/usr.sbin/puffs/Makefile.inc
diff -u src/usr.sbin/puffs/Makefile.inc:1.14 src/usr.sbin/puffs/Makefile.inc:1.15
--- src/usr.sbin/puffs/Makefile.inc:1.14 Wed Jan 15 20:15:34 2014
+++ src/usr.sbin/puffs/Makefile.inc Sat Jan 23 16:22:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.14 2014/01/16 01:15:34 christos Exp $
+# $NetBSD: Makefile.inc,v 1.15 2016/01/23 21:22:50 christos Exp $
WARNS?= 4
@@ -19,6 +19,7 @@ MOUNTDIR= ${.CURDIR}/../../../sbin
MOUNT= ${MOUNTDIR}/mount
CPPFLAGS+= -I${MOUNTDIR}/mount_${MOUNTNAME} -I${MOUNT} -DMOUNT_NOMAIN
+CPPFLAGS+= -D_KERNTYPES
SRCS+= mount_${MOUNTNAME}.c rump_${MOUNTNAME}.c pathadj.c fattr.c
# on select archs use the kernel module directly, otherwise fallback
Added files:
Index: src/tests/fs/nfs/Makefile.inc
diff -u /dev/null src/tests/fs/nfs/Makefile.inc:1.1
--- /dev/null Sat Jan 23 16:22:51 2016
+++ src/tests/fs/nfs/Makefile.inc Sat Jan 23 16:22:48 2016
@@ -0,0 +1 @@
+.include "../Makefile.inc"
