CVS commit: src/sys/netinet6

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 14:03:04 UTC 2016

Modified Files:
src/sys/netinet6: in6_gif.c

Log Message:
make this compile again


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/netinet6/in6_gif.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/netinet6/in6_gif.c
diff -u src/sys/netinet6/in6_gif.c:1.68 src/sys/netinet6/in6_gif.c:1.69
--- src/sys/netinet6/in6_gif.c:1.68	Fri Jan 22 18:27:12 2016
+++ src/sys/netinet6/in6_gif.c	Sat Jan 23 09:03:04 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_gif.c,v 1.68 2016/01/22 23:27:12 riastradh Exp $	*/
+/*	$NetBSD: in6_gif.c,v 1.69 2016/01/23 14:03:04 christos Exp $	*/
 /*	$KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.68 2016/01/22 23:27:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.69 2016/01/23 14:03:04 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -384,6 +384,7 @@ in6_gif_attach(struct gif_softc *sc)
 	return 0;
 }
 
+#ifdef notdef
 int
 in6_gif_pause(struct gif_softc *sc)
 {
@@ -395,6 +396,7 @@ in6_gif_pause(struct gif_softc *sc)
 
 	return error;
 }
+#endif
 
 int
 in6_gif_detach(struct gif_softc *sc)

CVS commit: src/sys/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 14:03:48 UTC 2016

Modified Files:
src/sys/sys: exec.h

Log Message:
expose less to userland.


To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/sys/sys/exec.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/sys/exec.h
diff -u src/sys/sys/exec.h:1.149 src/sys/sys/exec.h:1.150
--- src/sys/sys/exec.h:1.149	Sat Oct 10 06:51:15 2015
+++ src/sys/sys/exec.h	Sat Jan 23 09:03:48 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec.h,v 1.149 2015/10/10 10:51:15 maxv Exp $	*/
+/*	$NetBSD: exec.h,v 1.150 2016/01/23 14:03:48 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -124,6 +124,7 @@ struct ps_strings32 {
 };
 #endif
 
+#ifdef _KERNEL
 /*
  * the following structures allow execve() to put together processes
  * in a more extensible and cleaner way.
@@ -245,7 +246,6 @@ struct exec_vmcmd {
 #define	VMCMD_STACK	0x0008	/* entry is for a stack */
 };
 
-#ifdef _KERNEL
 /*
  * funtions used either by execve() or the various CPU-dependent execve()
  * hooks.

CVS commit: src/lib/libpthread_dbg

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 14:02:22 UTC 2016

Modified Files:
src/lib/libpthread_dbg: pthread_dbg.c pthread_dbg_int.h

Log Message:
don't use kernel types.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/lib/libpthread_dbg/pthread_dbg.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libpthread_dbg/pthread_dbg_int.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libpthread_dbg/pthread_dbg.c
diff -u src/lib/libpthread_dbg/pthread_dbg.c:1.43 src/lib/libpthread_dbg/pthread_dbg.c:1.44
--- src/lib/libpthread_dbg/pthread_dbg.c:1.43	Fri May 29 03:37:32 2015
+++ src/lib/libpthread_dbg/pthread_dbg.c	Sat Jan 23 09:02:21 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_dbg.c,v 1.43 2015/05/29 07:37:32 manu Exp $	*/
+/*	$NetBSD: pthread_dbg.c,v 1.44 2016/01/23 14:02:21 christos Exp $	*/
 
 /*-
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: pthread_dbg.c,v 1.43 2015/05/29 07:37:32 manu Exp $");
+__RCSID("$NetBSD: pthread_dbg.c,v 1.44 2016/01/23 14:02:21 christos Exp $");
 
 #define __EXPOSE_STACK 1
 
@@ -59,6 +59,8 @@ __RCSID("$NetBSD: pthread_dbg.c,v 1.43 2
 #include 
 
 #define PT_STACKMASK (proc->stackmask)
+#define OFFSET(thread, field) \
+(((char *)(thread)->addr) + offsetof(struct __pthread_st, field))
 
 /* Compensate for debuggers that want a zero ID to be a sentinel */
 #define TN_OFFSET 1
@@ -216,9 +218,8 @@ td_thr_info(td_thread_t *thread, td_thre
 		return TD_ERR_BADTHREAD;
 
 	info->thread_addr = thread->addr;
-	if ((val = READ(thread->proc, 
-		  thread->addr + offsetof(struct __pthread_st, pt_state), 
-		  , sizeof(tmp))) != 0)
+	if ((val = READ(thread->proc,
+	OFFSET(thread, pt_state), , sizeof(tmp))) != 0)
 		return val;
 	switch (tmp) {
 	case PT_STATE_RUNNING:
@@ -238,18 +239,15 @@ td_thr_info(td_thread_t *thread, td_thre
 
 	info->thread_type = TD_TYPE_USER;
 
-	if ((val = READ(thread->proc, 
-	thread->addr + offsetof(struct __pthread_st, pt_stack),
+	if ((val = READ(thread->proc, OFFSET(thread, pt_stack),
 	>thread_stack, sizeof(stack_t))) != 0)
 		return val;
 
-	if ((val = READ(thread->proc, 
-	thread->addr + offsetof(struct __pthread_st, pt_errno),
+	if ((val = READ(thread->proc, OFFSET(thread, pt_errno),
 	>thread_errno, sizeof(info->thread_errno))) != 0)
 		return val;
 
-	if ((val = READ(thread->proc, 
-	thread->addr + offsetof(struct __pthread_st, pt_lid),
+	if ((val = READ(thread->proc, OFFSET(thread, pt_lid),
 	>thread_id, sizeof(info->thread_id))) != 0)
 		return val;
 
@@ -272,8 +270,7 @@ td_thr_getname(td_thread_t *thread, char
 	if (tmp != PT_MAGIC)
 		return TD_ERR_BADTHREAD;
 
-	if ((val = READ(thread->proc,
-	thread->addr + offsetof(struct __pthread_st, pt_name),
+	if ((val = READ(thread->proc, OFFSET(thread, pt_name),
 	, sizeof(nameaddr))) != 0)
 		return val;
 
@@ -291,9 +288,8 @@ td_thr_getregs(td_thread_t *thread, int 
 {
 	int tmp, val;
 
-	if ((val = READ(thread->proc, 
-		  thread->addr + offsetof(struct __pthread_st, pt_state), 
-		  , sizeof(tmp))) != 0)
+	if ((val = READ(thread->proc, OFFSET(thread, pt_state),
+	, sizeof(tmp))) != 0)
 		return val;
 
 	switch (tmp) {
@@ -319,9 +315,8 @@ td_thr_setregs(td_thread_t *thread, int 
 {
 	int val, tmp;
 
-	if ((val = READ(thread->proc, 
-		  thread->addr + offsetof(struct __pthread_st, pt_state), 
-		  , sizeof(tmp))) != 0)
+	if ((val = READ(thread->proc, OFFSET(thread, pt_state),
+	, sizeof(tmp))) != 0)
 		return val;
 
 	switch (tmp) {
@@ -378,8 +373,7 @@ td_map_id2thr(td_proc_t *proc, int threa
 	threadid -= TN_OFFSET;
 	next = (void *)allq.ptqh_first;
 	while (next != NULL) {
-		val = READ(proc, 
-		next + offsetof(struct __pthread_st, pt_lid), 
+		val = READ(proc, next + offsetof(struct __pthread_st, pt_lid), 
 		, sizeof(num));
 
 		if (num == threadid)
@@ -453,9 +447,7 @@ td_thr_suspend(td_thread_t *thread)
 	if (tmp != PT_MAGIC)
 		return TD_ERR_BADTHREAD;
 
-	val = READ(thread->proc, thread->addr +
-	offsetof(struct __pthread_st, pt_lid),
-	, sizeof(tmp));
+	val = READ(thread->proc, OFFSET(thread, pt_lid), , sizeof(tmp));
 	if (val != 0)
 		return val;
 
@@ -477,9 +469,7 @@ td_thr_resume(td_thread_t *thread)
 	if (tmp != PT_MAGIC)
 		return TD_ERR_BADTHREAD;
 
-	val = READ(thread->proc, thread->addr +
-	offsetof(struct __pthread_st, pt_lid),
-	, sizeof(tmp));
+	val = READ(thread->proc, OFFSET(thread, pt_lid), , sizeof(tmp));
 	if (val != 0)
 		return val;
 
@@ -522,8 +512,7 @@ td_thr_tsd(td_thread_t *thread, pthread_
 {
 	int val;
 
-	val = READ(thread->proc, thread->addr + 
-	offsetof(struct __pthread_st, pt_specific) +
+	val = READ(thread->proc, OFFSET(thread, pt_specific) +
 	key * sizeof(void *), value, sizeof(*value));
 
 	return val;

Index: src/lib/libpthread_dbg/pthread_dbg_int.h
diff -u 

CVS commit: src/sys/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 16:08:21 UTC 2016

Modified Files:
src/sys/sys: vnode.h

Log Message:
allow uvm_param.h since it defines types...


To generate a diff of this commit:
cvs rdiff -u -r1.258 -r1.259 src/sys/sys/vnode.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/sys/vnode.h
diff -u src/sys/sys/vnode.h:1.258 src/sys/sys/vnode.h:1.259
--- src/sys/sys/vnode.h:1.258	Sat Jan 23 11:02:09 2016
+++ src/sys/sys/vnode.h	Sat Jan 23 11:08:20 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnode.h,v 1.258 2016/01/23 16:02:09 christos Exp $	*/
+/*	$NetBSD: vnode.h,v 1.259 2016/01/23 16:08:20 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -68,8 +68,8 @@
 #include 
 
 /* XXX: clean up includes later */
-#if defined(_KERNEL) || defined(_KMEMUSER)
 #include 	/* XXX */
+#if defined(_KERNEL) || defined(_KMEMUSER)
 #include 	/* XXX */
 #include 	/* XXX */
 #include 	/* XXX */

CVS commit: src/usr.bin/m4

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 14:24:43 UTC 2016

Modified Files:
src/usr.bin/m4: main.c

Log Message:
Explain what REDIRECT is for.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/usr.bin/m4/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/m4/main.c
diff -u src/usr.bin/m4/main.c:1.45 src/usr.bin/m4/main.c:1.46
--- src/usr.bin/m4/main.c:1.45	Sat Jan 16 16:12:27 2016
+++ src/usr.bin/m4/main.c	Sat Jan 23 09:24:43 2016
@@ -1,5 +1,5 @@
 /*	$OpenBSD: main.c,v 1.77 2009/10/14 17:19:47 sthen Exp $	*/
-/*	$NetBSD: main.c,v 1.45 2016/01/16 21:12:27 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.46 2016/01/23 14:24:43 christos Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
 #include "nbtool_config.h"
 #endif
 #include 
-__RCSID("$NetBSD: main.c,v 1.45 2016/01/16 21:12:27 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.46 2016/01/23 14:24:43 christos Exp $");
 #include 
 #include 
 #include 
@@ -325,6 +325,11 @@ main(int argc, char *argv[])
 		}
 
 #ifdef REDIRECT
+	/*
+	 * This is meant only for debugging; it makes all output
+	 * go to a known file, even if the command line options
+	 * send it elsewhere. It should not be turned of in production code.
+	 */
 	if (freopen("/tmp/m4", "w+", stderr) == NULL)
 		err(EXIT_FAILURE, "Can't redirect errors to `%s'",
 		"/tmp/m4");

CVS commit: src/sys

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sat Jan 23 14:48:56 UTC 2016

Modified Files:
src/sys/netinet: in_gif.c
src/sys/netinet6: in6_gif.c

Log Message:
Those were local changes not meant to be part of the revert.  SORRY!


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/netinet/in_gif.c
cvs rdiff -u -r1.69 -r1.70 src/sys/netinet6/in6_gif.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/netinet/in_gif.c
diff -u src/sys/netinet/in_gif.c:1.72 src/sys/netinet/in_gif.c:1.73
--- src/sys/netinet/in_gif.c:1.72	Sat Jan 23 02:58:13 2016
+++ src/sys/netinet/in_gif.c	Sat Jan 23 14:48:55 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: in_gif.c,v 1.72 2016/01/23 02:58:13 christos Exp $	*/
+/*	$NetBSD: in_gif.c,v 1.73 2016/01/23 14:48:55 riastradh Exp $	*/
 /*	$KAME: in_gif.c,v 1.66 2001/07/29 04:46:09 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.72 2016/01/23 02:58:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.73 2016/01/23 14:48:55 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -391,9 +391,8 @@ in_gif_attach(struct gif_softc *sc)
 	return 0;
 }
 
-#ifdef notdef
 int
-in_gif_pause(struct gif_softc *sc)
+in_gif_detach(struct gif_softc *sc)
 {
 	int error;
 
@@ -401,15 +400,7 @@ in_gif_pause(struct gif_softc *sc)
 	if (error == 0)
 		sc->encap_cookie4 = NULL;
 
-	return error;
-}
-#endif
-
-int
-in_gif_detach(struct gif_softc *sc)
-{
-
 	rtcache_free(>gif_ro);
 
-	return 0;
+	return error;
 }

Index: src/sys/netinet6/in6_gif.c
diff -u src/sys/netinet6/in6_gif.c:1.69 src/sys/netinet6/in6_gif.c:1.70
--- src/sys/netinet6/in6_gif.c:1.69	Sat Jan 23 14:03:04 2016
+++ src/sys/netinet6/in6_gif.c	Sat Jan 23 14:48:55 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_gif.c,v 1.69 2016/01/23 14:03:04 christos Exp $	*/
+/*	$NetBSD: in6_gif.c,v 1.70 2016/01/23 14:48:55 riastradh Exp $	*/
 /*	$KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.69 2016/01/23 14:03:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.70 2016/01/23 14:48:55 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -384,9 +384,8 @@ in6_gif_attach(struct gif_softc *sc)
 	return 0;
 }
 
-#ifdef notdef
 int
-in6_gif_pause(struct gif_softc *sc)
+in6_gif_detach(struct gif_softc *sc)
 {
 	int error;
 
@@ -394,17 +393,9 @@ in6_gif_pause(struct gif_softc *sc)
 	if (error == 0)
 		sc->encap_cookie6 = NULL;
 
-	return error;
-}
-#endif
-
-int
-in6_gif_detach(struct gif_softc *sc)
-{
-
 	rtcache_free(>gif_ro);
 
-	return 0;
+	return error;
 }
 
 void *

CVS commit: src/distrib/sets/lists/comp

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 15:01:31 UTC 2016

Modified Files:
src/distrib/sets/lists/comp: mi shl.mi

Log Message:
Fix libproc and librtld_db from Rin Okuyama


To generate a diff of this commit:
cvs rdiff -u -r1.2013 -r1.2014 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.283 -r1.284 src/distrib/sets/lists/comp/shl.mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2013 src/distrib/sets/lists/comp/mi:1.2014
--- src/distrib/sets/lists/comp/mi:1.2013	Thu Jan 14 16:46:10 2016
+++ src/distrib/sets/lists/comp/mi	Sat Jan 23 10:01:30 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2013 2016/01/14 21:46:10 christos Exp $
+#	$NetBSD: mi,v 1.2014 2016/01/23 15:01:30 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -3328,7 +3328,7 @@
 ./usr/lib/libppath.acomp-c-lib		compatfile
 ./usr/lib/libppath_p.acomp-c-proflib		compatfile,profile
 ./usr/lib/libproc.acomp-c-lib		compatfile,dtrace
-./usr/lib/libproc_p.acomp-c-lib		compatfile,dtrace
+./usr/lib/libproc_p.acomp-c-lib		compatfile,dtrace,profile
 ./usr/lib/libprop.acomp-c-lib		compatfile
 ./usr/lib/libprop_p.acomp-c-proflib		compatfile,profile
 ./usr/lib/libpthread.acomp-c-lib		compatfile
@@ -3353,7 +3353,7 @@
 ./usr/lib/librt.acomp-c-lib		compatfile
 ./usr/lib/librt_p.acomp-c-proflib		compatfile,profile
 ./usr/lib/librtld_db.acomp-c-lib		compatfile,dtrace
-./usr/lib/librtld_db_p.a			comp-c-lib		compatfile,dtrace
+./usr/lib/librtld_db_p.a			comp-c-lib		compatfile,dtrace,profile
 ./usr/lib/librump.acomp-c-lib		compatfile,rump
 ./usr/lib/librump_p.acomp-c-proflib		compatfile,rump,profile
 ./usr/lib/librumpclient.a			comp-c-lib		compatfile,rump

Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.283 src/distrib/sets/lists/comp/shl.mi:1.284
--- src/distrib/sets/lists/comp/shl.mi:1.283	Sat Nov 21 23:44:30 2015
+++ src/distrib/sets/lists/comp/shl.mi	Sat Jan 23 10:01:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.283 2015/11/22 04:44:30 kamil Exp $
+# $NetBSD: shl.mi,v 1.284 2016/01/23 15:01:31 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -128,7 +128,7 @@
 ./usr/lib/libppath_pic.a			comp-c-piclib		compatfile,picinstall
 ./usr/lib/libproc.socomp-c-shlib		compatfile,dtrace
 ./usr/lib/libproc.so.0comp-c-shlib		compatfile,dtrace
-./usr/lib/libproc_pic.acomp-c-piclib		compatfile,dtrace
+./usr/lib/libproc_pic.acomp-c-piclib		compatfile,dtrace,picinstall
 ./usr/lib/libprop_pic.acomp-c-piclib		compatfile,picinstall
 ./usr/lib/libpthread_dbg_pic.a			comp-c-piclib		compatfile,picinstall
 ./usr/lib/libpthread_pic.a			comp-c-piclib		compatfile,picinstall
@@ -142,7 +142,7 @@
 ./usr/lib/librt_pic.acomp-c-piclib		compatfile,picinstall
 ./usr/lib/librtld_db.socomp-c-shlib		compatfile,dtrace
 ./usr/lib/librtld_db.so.0			comp-c-shlib		compatfile,dtrace
-./usr/lib/librtld_db_pic.a			comp-c-piclib		compatfile,dtrace
+./usr/lib/librtld_db_pic.a			comp-c-piclib		compatfile,dtrace,picinstall
 ./usr/lib/librump_pic.acomp-c-piclib		compatfile,picinstall,rump
 ./usr/lib/librumpclient_pic.a			comp-c-piclib		compatfile,picinstall,rump
 ./usr/lib/librumpcrypto_pic.a			comp-obsolete		obsolete

CVS commit: src/external/bsd/tcpdump/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 19:08:02 UTC 2016

Modified Files:
src/external/bsd/tcpdump/dist: print-pfsync.c

Log Message:
don't include 


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/tcpdump/dist/print-pfsync.c

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/tcpdump/dist/print-pfsync.c
diff -u src/external/bsd/tcpdump/dist/print-pfsync.c:1.2 src/external/bsd/tcpdump/dist/print-pfsync.c:1.3
--- src/external/bsd/tcpdump/dist/print-pfsync.c:1.2	Wed Nov 19 22:05:03 2014
+++ src/external/bsd/tcpdump/dist/print-pfsync.c	Sat Jan 23 14:08:02 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: print-pfsync.c,v 1.2 2014/11/20 03:05:03 christos Exp $	*/
+/*	$NetBSD: print-pfsync.c,v 1.3 2016/01/23 19:08:02 christos Exp $	*/
 /*	$OpenBSD: print-pfsync.c,v 1.30 2007/05/31 04:16:26 mcbride Exp $	*/
 
 /*
@@ -31,9 +31,9 @@
 #ifndef lint
 #if 0
 static const char rcsid[] =
-"@(#) $Header: /cvsroot/src/external/bsd/tcpdump/dist/print-pfsync.c,v 1.2 2014/11/20 03:05:03 christos Exp $";
+"@(#) $Header: /cvsroot/src/external/bsd/tcpdump/dist/print-pfsync.c,v 1.3 2016/01/23 19:08:02 christos Exp $";
 #else
-__RCSID("$NetBSD: print-pfsync.c,v 1.2 2014/11/20 03:05:03 christos Exp $");
+__RCSID("$NetBSD: print-pfsync.c,v 1.3 2016/01/23 19:08:02 christos Exp $");
 #endif
 #endif
 
@@ -49,7 +49,6 @@ __RCSID("$NetBSD: print-pfsync.c,v 1.2 2
 #include 
 #include 
 #include 
-#include 
 
 #ifdef __STDC__
 struct rtentry;

CVS commit: src/sys/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 16:02:09 UTC 2016

Modified Files:
src/sys/sys: vnode.h wapbl.h

Log Message:
protect more kernel stuff.


To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 src/sys/sys/vnode.h
cvs rdiff -u -r1.16 -r1.17 src/sys/sys/wapbl.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/sys/vnode.h
diff -u src/sys/sys/vnode.h:1.257 src/sys/sys/vnode.h:1.258
--- src/sys/sys/vnode.h:1.257	Fri Jan 22 17:43:25 2016
+++ src/sys/sys/vnode.h	Sat Jan 23 11:02:09 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnode.h,v 1.257 2016/01/22 22:43:25 dholland Exp $	*/
+/*	$NetBSD: vnode.h,v 1.258 2016/01/23 16:02:09 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -68,6 +68,7 @@
 #include 
 
 /* XXX: clean up includes later */
+#if defined(_KERNEL) || defined(_KMEMUSER)
 #include 	/* XXX */
 #include 	/* XXX */
 #include 	/* XXX */
@@ -75,6 +76,7 @@
 
 struct namecache;
 struct uvm_ractx;
+#endif
 
 /*
  * The vnode is the focus of all file activity in UNIX.  There is a
@@ -112,6 +114,7 @@ enum vtagtype	{
 "VT_TMPFS", "VT_UDF", "VT_SYSVBFS", "VT_PUFFS", "VT_HFS", "VT_EFS", \
 "VT_ZFS", "VT_RUMP", "VT_NILFS", "VT_V7FS", "VT_CHFS"
 
+#if defined(_KERNEL) || defined(_KMEMUSER)
 struct vnode;
 struct buf;
 
@@ -180,6 +183,7 @@ struct vnode {
 
 typedef struct vnodelst vnodelst_t;
 typedef struct vnode vnode_t;
+#endif
 
 /*
  * Vnode flags.  The first set are locked by vnode lock or are stable.

Index: src/sys/sys/wapbl.h
diff -u src/sys/sys/wapbl.h:1.16 src/sys/sys/wapbl.h:1.17
--- src/sys/sys/wapbl.h:1.16	Fri Sep  5 01:42:50 2014
+++ src/sys/sys/wapbl.h	Sat Jan 23 11:02:09 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: wapbl.h,v 1.16 2014/09/05 05:42:50 matt Exp $	*/
+/*	$NetBSD: wapbl.h,v 1.17 2016/01/23 16:02:09 christos Exp $	*/
 
 /*-
  * Copyright (c) 2003,2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,9 @@
 
 #include 
 
+#if defined(_KERNEL) || defined(_KMEMUSER)
 #include 
+#endif
 
 /* This header file describes the api and data structures for
  * write ahead physical block logging (WAPBL) support.

CVS commit: src/tests/rump/rumpkern

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 18:54:15 UTC 2016

Added Files:
src/tests/rump/rumpkern: Makefile.inc

Log Message:
bridge with the higher Makefile.inc


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/tests/rump/rumpkern/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/tests/rump/rumpkern/Makefile.inc
diff -u /dev/null src/tests/rump/rumpkern/Makefile.inc:1.1
--- /dev/null	Sat Jan 23 13:54:15 2016
+++ src/tests/rump/rumpkern/Makefile.inc	Sat Jan 23 13:54:15 2016
@@ -0,0 +1 @@
+.include "../Makefile.inc"

CVS commit: src/external/cddl/osnet/dist/uts/common/sys

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sat Jan 23 15:45:42 UTC 2016

Modified Files:
src/external/cddl/osnet/dist/uts/common/sys: debug.h

Log Message:
Omit spurious include of  in dtrace tools build.

Fixes dtrace tools cross-build from architectures with no dtrace
support:

#   compile  libctf/ctf_create.lo
[...]
/export/anoncvs/src/tools/libctf/../../external/cddl/osnet/sys/sys/isa_defs.h:50:2:
 error: #error "architecture not supported"
 #error "architecture not supported"
  ^


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dist/uts/common/sys/debug.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/cddl/osnet/dist/uts/common/sys/debug.h
diff -u src/external/cddl/osnet/dist/uts/common/sys/debug.h:1.2 src/external/cddl/osnet/dist/uts/common/sys/debug.h:1.3
--- src/external/cddl/osnet/dist/uts/common/sys/debug.h:1.2	Tue Dec 14 14:08:42 2010
+++ src/external/cddl/osnet/dist/uts/common/sys/debug.h	Sat Jan 23 15:45:42 2016
@@ -29,7 +29,6 @@
 #ifndef _SYS_DEBUG_H
 #define	_SYS_DEBUG_H
 
-#include 
 #include 
 #include 
 

CVS commit: src/sbin/pppoectl

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 15:41:47 UTC 2016

Modified Files:
src/sbin/pppoectl: pppoectl.c

Log Message:
don't need mbuf.h!


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sbin/pppoectl/pppoectl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/pppoectl/pppoectl.c
diff -u src/sbin/pppoectl/pppoectl.c:1.24 src/sbin/pppoectl/pppoectl.c:1.25
--- src/sbin/pppoectl/pppoectl.c:1.24	Sun Aug 28 04:43:02 2011
+++ src/sbin/pppoectl/pppoectl.c	Sat Jan 23 10:41:47 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pppoectl.c,v 1.24 2011/08/28 08:43:02 mbalmer Exp $	*/
+/*	$NetBSD: pppoectl.c,v 1.25 2016/01/23 15:41:47 christos Exp $	*/
 
 /*
  * Copyright (c) 1997 Joerg Wunsch
@@ -31,14 +31,13 @@
 #include 
 
 #ifndef lint
-__RCSID("$NetBSD: pppoectl.c,v 1.24 2011/08/28 08:43:02 mbalmer Exp $");
+__RCSID("$NetBSD: pppoectl.c,v 1.25 2016/01/23 15:41:47 christos Exp $");
 #endif
 
 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

CVS commit: src/sys/dev/usb

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sat Jan 23 17:02:25 UTC 2016

Modified Files:
src/sys/dev/usb: hid.c

Log Message:
Convert unsigned char to wider type before left shift.

Avoids undefined behaviour if shifted quantity overflows int.

CID 980971


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/usb/hid.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/hid.c
diff -u src/sys/dev/usb/hid.c:1.42 src/sys/dev/usb/hid.c:1.43
--- src/sys/dev/usb/hid.c:1.42	Sun Jan 10 17:44:48 2016
+++ src/sys/dev/usb/hid.c	Sat Jan 23 17:02:25 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: hid.c,v 1.42 2016/01/10 17:44:48 jakllsch Exp $	*/
+/*	$NetBSD: hid.c,v 1.43 2016/01/23 17:02:25 riastradh Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.42 2016/01/10 17:44:48 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.43 2016/01/23 17:02:25 riastradh Exp $");
 
 #include 
 #include 
@@ -461,7 +461,7 @@ hid_get_udata(const u_char *buf, const s
 	num = (hpos + hsize + 7) / 8 - off;
 
 	for (i = 0; i < num; i++)
-		data |= buf[off + i] << (i * 8);
+		data |= (unsigned long)buf[off + i] << (i * 8);
 
 	data >>= hpos % 8;
 	if (hsize < sizeof(data) * NBBY)

CVS commit: src/sys/dev/pci

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Sat Jan 23 17:09:51 UTC 2016

Modified Files:
src/sys/dev/pci: pci.c

Log Message:
add another special case so SM50x's framebuffer gets mapped with prefetching /
write combining enabled.
This needs to be generalized somewhere...


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/dev/pci/pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/pci.c
diff -u src/sys/dev/pci/pci.c:1.150 src/sys/dev/pci/pci.c:1.151
--- src/sys/dev/pci/pci.c:1.150	Mon Nov  2 09:29:08 2015
+++ src/sys/dev/pci/pci.c	Sat Jan 23 17:09:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci.c,v 1.150 2015/11/02 09:29:08 knakahara Exp $	*/
+/*	$NetBSD: pci.c,v 1.151 2016/01/23 17:09:51 macallan Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1997, 1998
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.150 2015/11/02 09:29:08 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.151 2016/01/23 17:09:51 macallan Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -352,8 +352,12 @@ pci_probe_device(struct pci_softc *sc, p
 nr->r_size = 0x7ff000;
 nr->r_flags = BUS_SPACE_MAP_LINEAR |
 	  BUS_SPACE_MAP_PREFETCHABLE;
+			} else if ((PCI_VENDOR(id) == PCI_VENDOR_SILMOTION) &&
+			   (PCI_PRODUCT(id) == PCI_PRODUCT_SILMOTION_SM502) &&
+			   (bar == 0x10)) {
+			   	r->r_flags = BUS_SPACE_MAP_LINEAR |
+	 BUS_SPACE_MAP_PREFETCHABLE;
 			}
-			
 		}
 	}
 

CVS commit: src/external/gpl3/gdb/dist/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 20:28:24 UTC 2016

Modified Files:
src/external/gpl3/gdb/dist/gdb: bsd-kvm.c

Log Message:
define sooner _KMEMUSER


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/bsd-kvm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/dist/gdb/bsd-kvm.c
diff -u src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.7 src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.8
--- src/external/gpl3/gdb/dist/gdb/bsd-kvm.c:1.7	Sun Aug 16 05:58:29 2015
+++ src/external/gpl3/gdb/dist/gdb/bsd-kvm.c	Sat Jan 23 15:28:24 2016
@@ -17,6 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program.  If not, see .  */
 
+#define _KMEMUSER
 #include "defs.h"
 #include "cli/cli-cmds.h"
 #include "command.h"
@@ -35,7 +36,6 @@
 #include 
 #include "readline/readline.h"
 #include 
-#define _KMEMUSER
 #include 
 #include 
 

CVS commit: src/lib/libpmc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 21:44:55 UTC 2016

Modified Files:
src/lib/libpmc: Makefile

Log Message:
pmc_evid_, pmc_ctr_t etc are defined in  but are not exposed
anymore by default since they violate the userland namespace. Either we
should create __pmc types, or a separate machine/pmc.h header.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libpmc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libpmc/Makefile
diff -u src/lib/libpmc/Makefile:1.1 src/lib/libpmc/Makefile:1.2
--- src/lib/libpmc/Makefile:1.1	Thu Aug  8 20:03:15 2002
+++ src/lib/libpmc/Makefile	Sat Jan 23 16:44:55 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2002/08/09 00:03:15 thorpej Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/23 21:44:55 christos Exp $
 
 .include 
 
@@ -8,6 +8,7 @@ MAN=	pmc.3
 LIB=	pmc
 SRCS=	pmc.c
 SRCS+=	pmc_${MACHINE_CPU}.c
+CPPFLAGS+=	-D_KERNTYPES
 
 INCS=	pmc.h
 INCSDIR=/usr/include

CVS commit: src/external/bsd/top/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 22:10:44 UTC 2016

Modified Files:
src/external/bsd/top/dist: top.1.in

Log Message:
PR/5068: Ingo Schwarze: Don't use the .af (alter format) request to display
a named register.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/top/dist/top.1.in

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/top/dist/top.1.in
diff -u src/external/bsd/top/dist/top.1.in:1.7 src/external/bsd/top/dist/top.1.in:1.8
--- src/external/bsd/top/dist/top.1.in:1.7	Thu Jan 22 21:58:40 2015
+++ src/external/bsd/top/dist/top.1.in	Sat Jan 23 17:10:44 2016
@@ -166,9 +166,7 @@ Only display the specified pid.
 .B "\-s \fItime\fP, \-\-delay=\fItime\fP"
 Set the delay between screen updates to
 .I time
-seconds.  The default delay between updates is
-.af D 1 
-seconds.
+seconds.  The default delay between updates is \nD seconds.
 .TP
 .B "\-U \fIusername\fP, \-\-user=\fIusername\fP"
 Show only those processes owned by

CVS commit: src/sys/modules/dtrace/lockstat

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Jan 24 01:12:06 UTC 2016

Modified Files:
src/sys/modules/dtrace/lockstat: Makefile

Log Message:
Grr. arm is different.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/dtrace/lockstat/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/lockstat/Makefile
diff -u src/sys/modules/dtrace/lockstat/Makefile:1.3 src/sys/modules/dtrace/lockstat/Makefile:1.4
--- src/sys/modules/dtrace/lockstat/Makefile:1.3	Sat Jan 23 20:01:43 2016
+++ src/sys/modules/dtrace/lockstat/Makefile	Sat Jan 23 20:12:06 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2016/01/24 01:01:43 christos Exp $
+#	$NetBSD: Makefile,v 1.4 2016/01/24 01:12:06 christos Exp $
 
 .include "../../Makefile.inc"
 
@@ -10,7 +10,16 @@ SRCS=		lockstat.c
 CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/sys
 CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
 CPPFLAGS+=	-DKDTRACE_HOOKS
-.if exists(${DESTDIR}/usr/include/machine/cpu_counter.h)
+
+.if !empty(MACHINE_ARCH:Mearm*)
+ARMV:= ${MACHINE_ARCH:S/earmv//}
+.elif !empty(MACHINE_ARCH:Marm*)
+ARMV:= ${MACHINE_ARCH:S/armv//}
+.else
+ARMV:= 0
+.endif
+
+.if ${ARMV} > 4
 CPPFLAGS+=	-D__HAVE_CPU_COUNTER
 .endif
 

CVS commit: src/sbin/route

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 21:05:51 UTC 2016

Modified Files:
src/sbin/route: route.c rtutil.c show.c

Log Message:
no need for 


To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/sbin/route/route.c
cvs rdiff -u -r1.6 -r1.7 src/sbin/route/rtutil.c
cvs rdiff -u -r1.48 -r1.49 src/sbin/route/show.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/route/route.c
diff -u src/sbin/route/route.c:1.152 src/sbin/route/route.c:1.153
--- src/sbin/route/route.c:1.152	Sun Jan 17 10:59:26 2016
+++ src/sbin/route/route.c	Sat Jan 23 16:05:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.152 2016/01/17 15:59:26 christos Exp $	*/
+/*	$NetBSD: route.c,v 1.153 2016/01/23 21:05:51 christos Exp $	*/
 
 /*
  * Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
 #if 0
 static char sccsid[] = "@(#)route.c	8.6 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: route.c,v 1.152 2016/01/17 15:59:26 christos Exp $");
+__RCSID("$NetBSD: route.c,v 1.153 2016/01/23 21:05:51 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -47,7 +47,6 @@ __RCSID("$NetBSD: route.c,v 1.152 2016/0
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 

Index: src/sbin/route/rtutil.c
diff -u src/sbin/route/rtutil.c:1.6 src/sbin/route/rtutil.c:1.7
--- src/sbin/route/rtutil.c:1.6	Mon Mar 23 14:33:17 2015
+++ src/sbin/route/rtutil.c	Sat Jan 23 16:05:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtutil.c,v 1.6 2015/03/23 18:33:17 roy Exp $	*/
+/*	$NetBSD: rtutil.c,v 1.7 2016/01/23 21:05:51 christos Exp $	*/
 /*	$OpenBSD: show.c,v 1.1 2006/05/27 19:16:37 claudio Exp $	*/
 
 /*
@@ -33,7 +33,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 

Index: src/sbin/route/show.c
diff -u src/sbin/route/show.c:1.48 src/sbin/route/show.c:1.49
--- src/sbin/route/show.c:1.48	Mon Mar 23 14:33:17 2015
+++ src/sbin/route/show.c	Sat Jan 23 16:05:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: show.c,v 1.48 2015/03/23 18:33:17 roy Exp $	*/
+/*	$NetBSD: show.c,v 1.49 2016/01/23 21:05:51 christos Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -34,14 +34,13 @@
 #if 0
 static char sccsid[] = "from: @(#)route.c	8.3 (Berkeley) 3/9/94";
 #else
-__RCSID("$NetBSD: show.c,v 1.48 2015/03/23 18:33:17 roy Exp $");
+__RCSID("$NetBSD: show.c,v 1.49 2016/01/23 21:05:51 christos Exp $");
 #endif
 #endif /* not lint */
 
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 

CVS commit: src/tests/dev/dm

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 21:18:27 UTC 2016

Modified Files:
src/tests/dev/dm: h_dm.c

Log Message:
XXX: use unused variables.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/dev/dm/h_dm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/dev/dm/h_dm.c
diff -u src/tests/dev/dm/h_dm.c:1.1 src/tests/dev/dm/h_dm.c:1.2
--- src/tests/dev/dm/h_dm.c:1.1	Wed Oct  6 07:24:55 2010
+++ src/tests/dev/dm/h_dm.c	Sat Jan 23 16:18:27 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: h_dm.c,v 1.1 2010/10/06 11:24:55 haad Exp $	*/
+/*	$NetBSD: h_dm.c,v 1.2 2016/01/23 21:18:27 christos Exp $	*/
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -83,6 +83,7 @@ dm_test_versions(void) {
 	dict_out = prop_dictionary_internalize(prefp.pref_plist);
 	
 	xml = prop_dictionary_externalize(dict_out);
+	__USE(xml);
 
 	rump_sys_close(fd);
 
@@ -122,6 +123,7 @@ dm_test_targets(void) {
 	dict_out = prop_dictionary_internalize(prefp.pref_plist);
 	
 	xml = prop_dictionary_externalize(dict_out);
+	__USE(xml);
 
 	rump_sys_close(fd);
 

CVS commit: src/sys/arch/zaurus/stand

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 22:28:09 UTC 2016

Modified Files:
src/sys/arch/zaurus/stand: Makefile.inc

Log Message:
revert previous, we'll do differently


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/zaurus/stand/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/sys/arch/zaurus/stand/Makefile.inc
diff -u src/sys/arch/zaurus/stand/Makefile.inc:1.4 src/sys/arch/zaurus/stand/Makefile.inc:1.5
--- src/sys/arch/zaurus/stand/Makefile.inc:1.4	Sat Jan 23 17:20:45 2016
+++ src/sys/arch/zaurus/stand/Makefile.inc	Sat Jan 23 17:28:09 2016
@@ -1,5 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.4 2016/01/23 22:20:45 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2016/01/23 22:28:09 christos Exp $
 
 BINDIR=		/usr/mdec
 KLINK_MACHINE=	zaurus
-CPPFLAGS+=	-D_KERNTYPES

CVS commit: src/libexec/ld.elf_so

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Jan 24 01:56:04 UTC 2016

Modified Files:
src/libexec/ld.elf_so: paths.c

Log Message:
we don't need 


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/libexec/ld.elf_so/paths.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/libexec/ld.elf_so/paths.c
diff -u src/libexec/ld.elf_so/paths.c:1.41 src/libexec/ld.elf_so/paths.c:1.42
--- src/libexec/ld.elf_so/paths.c:1.41	Mon May  6 04:02:20 2013
+++ src/libexec/ld.elf_so/paths.c	Sat Jan 23 20:56:04 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: paths.c,v 1.41 2013/05/06 08:02:20 skrll Exp $	 */
+/*	$NetBSD: paths.c,v 1.42 2016/01/24 01:56:04 christos Exp $	 */
 
 /*
  * Copyright 1996 Matt Thomas 
@@ -30,7 +30,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: paths.c,v 1.41 2013/05/06 08:02:20 skrll Exp $");
+__RCSID("$NetBSD: paths.c,v 1.42 2016/01/24 01:56:04 christos Exp $");
 #endif /* not lint */
 
 #include 
@@ -49,7 +49,6 @@ __RCSID("$NetBSD: paths.c,v 1.41 2013/05
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 

CVS commit: src/sys/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 20:44:06 UTC 2016

Modified Files:
src/sys/sys: systm.h

Log Message:
move more kernel stuff under #ifdef _KERNEL


To generate a diff of this commit:
cvs rdiff -u -r1.269 -r1.270 src/sys/sys/systm.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/sys/systm.h
diff -u src/sys/sys/systm.h:1.269 src/sys/sys/systm.h:1.270
--- src/sys/sys/systm.h:1.269	Wed Oct 28 20:27:08 2015
+++ src/sys/sys/systm.h	Sat Jan 23 15:44:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: systm.h,v 1.269 2015/10/29 00:27:08 mrg Exp $	*/
+/*	$NetBSD: systm.h,v 1.270 2016/01/23 20:44:06 christos Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1988, 1991, 1993
@@ -114,6 +114,7 @@ extern struct vnode *swapdev_vp;/* vnode
 
 extern const dev_t zerodev;	/* /dev/zero */
 
+#if defined(_KERNEL)
 typedef int	sy_call_t(struct lwp *, const void *, register_t *);
 
 extern struct sysent {		/* system call table */
@@ -125,6 +126,8 @@ extern struct sysent {		/* system call t
 	uint32_t sy_return;	/* DTrace return ID for systrace. */
 } sysent[];
 extern int nsysent;
+#endif
+
 #if	BYTE_ORDER == BIG_ENDIAN
 #define	SCARG(p,k)	((p)->k.be.datum)	/* get arg from args pointer */
 #elif	BYTE_ORDER == LITTLE_ENDIAN
@@ -486,7 +489,6 @@ extern int db_fromconsole; /* XXX ddb/dd
 #else
 #define console_debugger() do {} while (/* CONSTCOND */ 0) /* NOP */
 #endif
-#endif /* _KERNEL */
 
 /* For SYSCALL_DEBUG */
 void scdebug_init(void);
@@ -498,7 +500,6 @@ void	_kernel_lock(int);
 void	_kernel_unlock(int, int *);
 bool	_kernel_locked_p(void);
 
-#ifdef _KERNEL
 void	kernconfig_lock_init(void);
 void	kernconfig_lock(void);
 void	kernconfig_unlock(void);
@@ -523,11 +524,13 @@ do {		\
 #define	KERNEL_UNLOCK_ALL(l, p)		KERNEL_UNLOCK(0, (l), (p))
 #define	KERNEL_UNLOCK_ONE(l)		KERNEL_UNLOCK(1, (l), NULL)
 
-/* Preemption control. */
 #ifdef _KERNEL
+/* Preemption control. */
 void	kpreempt_disable(void);
 void	kpreempt_enable(void);
 bool	kpreempt_disabled(void);
+
+vaddr_t calc_cache_size(vsize_t , int, int);
 #endif
 
 void assert_sleepable(void);
@@ -537,6 +540,5 @@ void assert_sleepable(void);
 #define	ASSERT_SLEEPABLE()	do {} while (0)
 #endif /* defined(DEBUG) */
 
-vaddr_t calc_cache_size(vsize_t , int, int);
 
 #endif	/* !_SYS_SYSTM_H_ */

CVS commit: src/distrib/sets/lists

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Jan 24 00:14:50 UTC 2016

Modified Files:
src/distrib/sets/lists/xcomp: md.evbarm
src/distrib/sets/lists/xdebug: md.evbarm

Log Message:
fix evbarm sets.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/xcomp/md.evbarm
cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/xdebug/md.evbarm

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/xcomp/md.evbarm
diff -u src/distrib/sets/lists/xcomp/md.evbarm:1.4 src/distrib/sets/lists/xcomp/md.evbarm:1.5
--- src/distrib/sets/lists/xcomp/md.evbarm:1.4	Sat Oct 24 10:30:28 2015
+++ src/distrib/sets/lists/xcomp/md.evbarm	Sat Jan 23 19:14:50 2016
@@ -1,5 +1,19 @@
-# $NetBSD: md.evbarm,v 1.4 2015/10/24 14:30:28 jmcneill Exp $
-./usr/X11R7/lib/libdrm_nouveau.a			-unknown-	xorg
-./usr/X11R7/lib/libdrm_nouveau_p.a			-unknown-	profile,xorg
-./usr/X11R7/lib/libdrm_nouveau_pic.a			-unknown-	xorg,picinstall
-./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc		-unknown-	xorg
+# $NetBSD: md.evbarm,v 1.5 2016/01/24 00:14:50 christos Exp $
+./usr/X11R7/lib/libdrm_nouveau.a		-unknown-	xorg
+./usr/X11R7/lib/libdrm_nouveau_p.a		-unknown-	profile,xorg
+./usr/X11R7/lib/libdrm_nouveau_pic.a		-unknown-	xorg,picinstall
+./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc	-unknown-	xorg
+./usr/libdata/lint/llib-ldbe.ln			-unknown-	lint,xorg
+./usr/libdata/lint/llib-ldri.ln			-unknown-	lint,xorg
+./usr/libdata/lint/llib-ldri2.ln		-unknown-	lint,xorg
+./usr/libdata/lint/llib-ldrm_nouveau.ln		-unknown-	lint,xorg
+./usr/libdata/lint/llib-lexa.ln			-unknown-	lint,xorg
+./usr/libdata/lint/llib-lextmod.ln		-unknown-	lint,xorg
+./usr/libdata/lint/llib-lfb.ln			-unknown-	lint,xorg
+./usr/libdata/lint/llib-lglx.ln			-unknown-	lint,xorg
+./usr/libdata/lint/llib-lrecord.ln		-unknown-	lint,xorg
+./usr/libdata/lint/llib-lshadow.ln		-unknown-	lint,xorg
+./usr/libdata/lint/llib-lshadowfb.ln		-unknown-	lint,xorg
+./usr/libdata/lint/llib-lvbe.ln			-unknown-	lint,xorg
+./usr/libdata/lint/llib-lvgahw.ln		-unknown-	lint,xorg
+./usr/libdata/lint/llib-lxaa.ln			-unknown-	lint,xorg

Index: src/distrib/sets/lists/xdebug/md.evbarm
diff -u src/distrib/sets/lists/xdebug/md.evbarm:1.12 src/distrib/sets/lists/xdebug/md.evbarm:1.13
--- src/distrib/sets/lists/xdebug/md.evbarm:1.12	Thu Nov  5 20:17:08 2015
+++ src/distrib/sets/lists/xdebug/md.evbarm	Sat Jan 23 19:14:50 2016
@@ -1,19 +1,19 @@
-# $NetBSD: md.evbarm,v 1.12 2015/11/06 01:17:08 jmcneill Exp $
+# $NetBSD: md.evbarm,v 1.13 2016/01/24 00:14:50 christos Exp $
 ./usr/X11R7/lib/libdrm_nouveau_g.a			-unknown-	debuglib,xorg
-./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/libdri_g.a		-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/libextmod_g.a	-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/libglx_g.a		-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/librecord_g.a	-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/libshadow_g.a	-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libexa_g.a			-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libfb_g.a			-unknown-	debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdri_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libextmod_g.a	-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libglx_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/librecord_g.a	-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libshadow_g.a	-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libexa_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libfb_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/libi2c_g.a			-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libshadowfb_g.a			-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libvbe_g.a			-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libvgahw_g.a			-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libxaa_g.a			-unknown-	debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libshadowfb_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libvbe_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libvgahw_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libxaa_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/libxf8_16bpp_g.a		-unknown-	obsolete
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug	-unknown-	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	-unknown-	xorg,debug

CVS commit: src

[Christos Zoulas]

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 

CVS commit: src/sys/arch

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 21:22:15 UTC 2016

Modified Files:
src/sys/arch/aarch64/include: types.h
src/sys/arch/alpha/include: types.h
src/sys/arch/amd64/include: types.h
src/sys/arch/arm/include: types.h
src/sys/arch/hppa/include: types.h
src/sys/arch/i386/include: types.h
src/sys/arch/ia64/include: types.h
src/sys/arch/m68k/include: types.h
src/sys/arch/mips/include: types.h
src/sys/arch/or1k/include: types.h
src/sys/arch/powerpc/include: types.h
src/sys/arch/riscv/include: types.h
src/sys/arch/sh3/include: types.h
src/sys/arch/sparc/include: types.h
src/sys/arch/usermode/include: types.h
src/sys/arch/vax/include: types.h

Log Message:
Hide {p,v}{addr,size}_t and register_t (and a couple more types that
are machine-specific) from userland unless _KERNEL/_KMEMUSER and a
new _KERNTYPES variables is defined. The _KERNTYPES should be fixed
for many subsystems that should not be using it (rump)...


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/include/types.h
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/alpha/include/types.h
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amd64/include/types.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/include/types.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hppa/include/types.h
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/i386/include/types.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/include/types.h
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/m68k/include/types.h
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/mips/include/types.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/or1k/include/types.h
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/powerpc/include/types.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/include/types.h
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/sh3/include/types.h
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/sparc/include/types.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/usermode/include/types.h
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/vax/include/types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/aarch64/include/types.h
diff -u src/sys/arch/aarch64/include/types.h:1.2 src/sys/arch/aarch64/include/types.h:1.3
--- src/sys/arch/aarch64/include/types.h:1.2	Thu Aug 27 08:30:50 2015
+++ src/sys/arch/aarch64/include/types.h	Sat Jan 23 16:22:13 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.2 2015/08/27 12:30:50 pooka Exp $ */
+/* $NetBSD: types.h,v 1.3 2016/01/23 21:22:13 christos Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -38,8 +38,13 @@
 #include 
 #include 
 
-/* NB: This should probably be if defined(_KERNEL) */
-#if defined(_NETBSD_SOURCE)
+#if defined(_KERNEL)
+typedef struct label_t {	/* Used by setjmp & longjmp */
+register_t lb_reg[13];	/* x19 .. x30, sp */
+} label_t;
+#endif
+
+#if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES)
 typedef	unsigned long	vm_offset_t;	/* depreciated */
 typedef	unsigned long	vm_size_t;	/* depreciated */
 
@@ -53,7 +58,6 @@ typedef unsigned long	vsize_t;
 #define PRIxVADDR	"lx"
 #define PRIxVSIZE	"lx"
 #define PRIuVSIZE	"lu"
-#endif
 
 typedef unsigned long long int register_t;
 typedef unsigned int register32_t;
@@ -65,16 +69,13 @@ typedef unsigned long	pmc_evid_t;
 typedef unsigned long	pmc_ctr_t;
 typedef unsigned short	tlb_asid_t;
 
-#if defined(_KERNEL)
-typedef struct label_t {	/* Used by setjmp & longjmp */
-register_t lb_reg[13];	/* x19 .. x30, sp */
-} label_t;
 #endif
  
 /*
  * This should have always been an 8-bit type.
  */
 typedef	unsigned char	__cpu_simple_lock_nv_t;
+typedef unsigned long long int __register_t;
 
 #define __SIMPLELOCK_LOCKED	1
 #define __SIMPLELOCK_UNLOCKED	0

Index: src/sys/arch/alpha/include/types.h
diff -u src/sys/arch/alpha/include/types.h:1.51 src/sys/arch/alpha/include/types.h:1.52
--- src/sys/arch/alpha/include/types.h:1.51	Fri Aug 28 05:30:01 2015
+++ src/sys/arch/alpha/include/types.h	Sat Jan 23 16:22:13 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.51 2015/08/28 09:30:01 pooka Exp $ */
+/* $NetBSD: types.h,v 1.52 2016/01/23 21:22:13 christos Exp $ */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -44,8 +44,7 @@ typedef struct label_t {
 } label_t;
 #endif
 
-/* NB: This should probably be if defined(_KERNEL) */
-#if defined(_NETBSD_SOURCE)
+#if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES)
 typedef unsigned long	paddr_t;
 typedef unsigned long	psize_t;
 typedef unsigned long	vaddr_t;
@@ -56,14 +55,13 @@ typedef unsigned long	vsize_t;
 #define	PRIxVADDR	"lx"
 #define	PRIxVSIZE	"lx"
 #define	PRIuVSIZE	"lu"
-#endif
 
 typedef long int	register_t;
-#if defined(_NETBSD_SOURCE)
 #define	PRIxREGISTER	"lx"
 #endif
 
 typedef	int		__cpu_simple_lock_nv_t;
+typedef long int	__register_t;
 
 #define	__SIMPLELOCK_LOCKED	1
 #define	__SIMPLELOCK_UNLOCKED	0

CVS commit: src/sys/arch/zaurus/stand

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 22:20:45 UTC 2016

Modified Files:
src/sys/arch/zaurus/stand: Makefile.inc

Log Message:
Add -D_KERNTYPES


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/stand/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/sys/arch/zaurus/stand/Makefile.inc
diff -u src/sys/arch/zaurus/stand/Makefile.inc:1.3 src/sys/arch/zaurus/stand/Makefile.inc:1.4
--- src/sys/arch/zaurus/stand/Makefile.inc:1.3	Thu May  2 00:22:45 2013
+++ src/sys/arch/zaurus/stand/Makefile.inc	Sat Jan 23 17:20:45 2016
@@ -1,4 +1,5 @@
-#	$NetBSD: Makefile.inc,v 1.3 2013/05/02 04:22:45 matt Exp $
+#	$NetBSD: Makefile.inc,v 1.4 2016/01/23 22:20:45 christos Exp $
 
 BINDIR=		/usr/mdec
 KLINK_MACHINE=	zaurus
+CPPFLAGS+=	-D_KERNTYPES

CVS commit: src/external/gpl3/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 23:02:32 UTC 2016

Modified Files:
src/external/gpl3/gdb: Makefile.inc

Log Message:
expose kernel types for gdb so that we don't have to fix each arch separately
for now.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gdb/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/gpl3/gdb/Makefile.inc
diff -u src/external/gpl3/gdb/Makefile.inc:1.9 src/external/gpl3/gdb/Makefile.inc:1.10
--- src/external/gpl3/gdb/Makefile.inc:1.9	Sun Aug 16 05:51:58 2015
+++ src/external/gpl3/gdb/Makefile.inc	Sat Jan 23 18:02:31 2016
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.9 2015/08/16 09:51:58 christos Exp $
+# $NetBSD: Makefile.inc,v 1.10 2016/01/23 23:02:31 christos Exp $
 
 USE_LIBEDIT=no
 USE_TUI=yes
 BINDIR=/usr/bin
 WARNS?=		0
+CPPFLAGS+=	-D_KERNTYPES
 
 GDB_MACHINE_ARCH=	${MACHINE_ARCH:C/armv[4-7]/arm/}
 

CVS commit: src/sys/arch

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 22:31:20 UTC 2016

Modified Files:
src/sys/arch/aarch64/include: types.h
src/sys/arch/alpha/include: types.h
src/sys/arch/amd64/include: types.h
src/sys/arch/arm/include: types.h
src/sys/arch/hppa/include: types.h
src/sys/arch/i386/include: types.h
src/sys/arch/ia64/include: types.h
src/sys/arch/m68k/include: types.h
src/sys/arch/mips/include: types.h
src/sys/arch/or1k/include: types.h
src/sys/arch/powerpc/include: types.h
src/sys/arch/riscv/include: types.h
src/sys/arch/sh3/include: types.h
src/sys/arch/sparc/include: types.h
src/sys/arch/usermode/include: types.h
src/sys/arch/vax/include: types.h

Log Message:
expose the kernel types for standalone code.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/aarch64/include/types.h
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/alpha/include/types.h
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/amd64/include/types.h
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/include/types.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hppa/include/types.h
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/i386/include/types.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/include/types.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/m68k/include/types.h
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/mips/include/types.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/or1k/include/types.h
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/powerpc/include/types.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/include/types.h
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/sh3/include/types.h
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/sparc/include/types.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/usermode/include/types.h
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/vax/include/types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/aarch64/include/types.h
diff -u src/sys/arch/aarch64/include/types.h:1.3 src/sys/arch/aarch64/include/types.h:1.4
--- src/sys/arch/aarch64/include/types.h:1.3	Sat Jan 23 16:22:13 2016
+++ src/sys/arch/aarch64/include/types.h	Sat Jan 23 17:31:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.3 2016/01/23 21:22:13 christos Exp $ */
+/* $NetBSD: types.h,v 1.4 2016/01/23 22:31:19 christos Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@ typedef struct label_t {	/* Used by setj
 } label_t;
 #endif
 
-#if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES)
+#if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES) || defined(_STANDALONE)
 typedef	unsigned long	vm_offset_t;	/* depreciated */
 typedef	unsigned long	vm_size_t;	/* depreciated */
 

Index: src/sys/arch/alpha/include/types.h
diff -u src/sys/arch/alpha/include/types.h:1.52 src/sys/arch/alpha/include/types.h:1.53
--- src/sys/arch/alpha/include/types.h:1.52	Sat Jan 23 16:22:13 2016
+++ src/sys/arch/alpha/include/types.h	Sat Jan 23 17:31:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.52 2016/01/23 21:22:13 christos Exp $ */
+/* $NetBSD: types.h,v 1.53 2016/01/23 22:31:19 christos Exp $ */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -44,7 +44,7 @@ typedef struct label_t {
 } label_t;
 #endif
 
-#if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES)
+#if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES) || defined(_STANDALONE)
 typedef unsigned long	paddr_t;
 typedef unsigned long	psize_t;
 typedef unsigned long	vaddr_t;

Index: src/sys/arch/amd64/include/types.h
diff -u src/sys/arch/amd64/include/types.h:1.49 src/sys/arch/amd64/include/types.h:1.50
--- src/sys/arch/amd64/include/types.h:1.49	Sat Jan 23 16:22:13 2016
+++ src/sys/arch/amd64/include/types.h	Sat Jan 23 17:31:19 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.49 2016/01/23 21:22:13 christos Exp $	*/
+/*	$NetBSD: types.h,v 1.50 2016/01/23 22:31:19 christos Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -46,7 +46,7 @@ typedef struct label_t {
 } label_t;
 #endif
 
-#if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES)
+#if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES) || defined(_STANDALONE)
 typedef unsigned long	paddr_t;
 typedef unsigned long	psize_t;
 typedef unsigned long	vaddr_t;

Index: src/sys/arch/arm/include/types.h
diff -u src/sys/arch/arm/include/types.h:1.31 src/sys/arch/arm/include/types.h:1.32
--- src/sys/arch/arm/include/types.h:1.31	Sat Jan 23 16:22:13 2016
+++ src/sys/arch/arm/include/types.h	Sat Jan 23 17:31:19 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.31 2016/01/23 21:22:13 christos Exp $	*/
+/*	$NetBSD: types.h,v 1.32 2016/01/23 22:31:19 christos Exp $	*/
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -44,7 +44,7 @@ typedef struct label_t {	/* Used by setj
 } label_t;
 #endif
  
-#if defined(_KERNEL) || 

CVS commit: src/sys/arch/i386/stand

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 22:29:29 UTC 2016

Modified Files:
src/sys/arch/i386/stand/boot: Makefile.boot
src/sys/arch/i386/stand/dosboot: Makefile
src/sys/arch/i386/stand/pxeboot: Makefile

Log Message:
We'll define the kernel types for standalone code.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/i386/stand/boot/Makefile.boot
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/i386/stand/dosboot/Makefile
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/stand/pxeboot/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.68 src/sys/arch/i386/stand/boot/Makefile.boot:1.69
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.68	Sat Jan 23 16:22:47 2016
+++ src/sys/arch/i386/stand/boot/Makefile.boot	Sat Jan 23 17:29:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.68 2016/01/23 21:22:47 christos Exp $
+# $NetBSD: Makefile.boot,v 1.69 2016/01/23 22:29:29 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} -D_KERNTYPES
+CPPFLAGS+= -I ${.OBJDIR}
 # 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.29 src/sys/arch/i386/stand/dosboot/Makefile:1.30
--- src/sys/arch/i386/stand/dosboot/Makefile:1.29	Sat Jan 23 16:22:47 2016
+++ src/sys/arch/i386/stand/dosboot/Makefile	Sat Jan 23 17:29:29 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.29 2016/01/23 21:22:47 christos Exp $
+#	$NetBSD: Makefile,v 1.30 2016/01/23 22:29:29 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 -D_KERNTYPES
+CPPFLAGS+= -DXMS
 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.23 src/sys/arch/i386/stand/pxeboot/Makefile:1.24
--- src/sys/arch/i386/stand/pxeboot/Makefile:1.23	Sat Jan 23 16:22:47 2016
+++ src/sys/arch/i386/stand/pxeboot/Makefile	Sat Jan 23 17:29:29 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2016/01/23 21:22:47 christos Exp $
+#	$NetBSD: Makefile,v 1.24 2016/01/23 22:29:29 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 -D_KERNTYPES
+CPPFLAGS+= -DDIRECT_SERIAL
 # Various serial line configurations
 #CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_PC -DDIRECT_SERIAL
 #	or

CVS commit: src/distrib/sets/lists

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Jan 24 02:41:56 UTC 2016

Modified Files:
src/distrib/sets/lists/xcomp: md.dreamcast
src/distrib/sets/lists/xdebug: md.dreamcast

Log Message:
fix dreamcast sets.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xcomp/md.dreamcast
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xdebug/md.dreamcast

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/xcomp/md.dreamcast
diff -u src/distrib/sets/lists/xcomp/md.dreamcast:1.3 src/distrib/sets/lists/xcomp/md.dreamcast:1.4
--- src/distrib/sets/lists/xcomp/md.dreamcast:1.3	Wed Jan 16 11:01:08 2013
+++ src/distrib/sets/lists/xcomp/md.dreamcast	Sat Jan 23 21:41:56 2016
@@ -1 +1,15 @@
-# $NetBSD: md.dreamcast,v 1.3 2013/01/16 16:01:08 christos Exp $
+# $NetBSD: md.dreamcast,v 1.4 2016/01/24 02:41:56 christos Exp $
+./usr/libdata/lint/llib-ldbe.ln		-unknown-	lint,xorg
+./usr/libdata/lint/llib-ldri.ln		-unknown-	lint,xorg
+./usr/libdata/lint/llib-ldri2.ln	-unknown-	lint,xorg
+./usr/libdata/lint/llib-lexa.ln		-unknown-	lint,xorg
+./usr/libdata/lint/llib-lextmod.ln	-unknown-	lint,xorg
+./usr/libdata/lint/llib-lfb.ln		-unknown-	lint,xorg
+./usr/libdata/lint/llib-lglx.ln		-unknown-	lint,xorg
+./usr/libdata/lint/llib-lrecord.ln	-unknown-	lint,xorg
+./usr/libdata/lint/llib-lshadow.ln	-unknown-	lint,xorg
+./usr/libdata/lint/llib-lshadowfb.ln	-unknown-	lint,xorg
+./usr/libdata/lint/llib-lvbe.ln		-unknown-	lint,xorg
+./usr/libdata/lint/llib-lvgahw.ln	-unknown-	lint,xorg
+./usr/libdata/lint/llib-lxaa.ln		-unknown-	lint,xorg
+

Index: src/distrib/sets/lists/xdebug/md.dreamcast
diff -u src/distrib/sets/lists/xdebug/md.dreamcast:1.3 src/distrib/sets/lists/xdebug/md.dreamcast:1.4
--- src/distrib/sets/lists/xdebug/md.dreamcast:1.3	Sat Jul 18 04:56:06 2015
+++ src/distrib/sets/lists/xdebug/md.dreamcast	Sat Jan 23 21:41:56 2016
@@ -1,16 +1,18 @@
-# $NetBSD: md.dreamcast,v 1.3 2015/07/18 08:56:06 mrg Exp $
-./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/libdri_g.a		-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/libextmod_g.a	-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/librecord_g.a	-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/libshadow_g.a	-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libfb_g.a			-unknown-	debuglib,xorg,obsolete
+# $NetBSD: md.dreamcast,v 1.4 2016/01/24 02:41:56 christos Exp $
+./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdri_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libextmod_g.a	-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libglx_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/librecord_g.a	-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libshadow_g.a	-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libexa_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libfb_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/libi2c_g.a			-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libshadowfb_g.a			-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libvbe_g.a			-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libvgahw_g.a			-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libxaa_g.a			-unknown-	debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libshadowfb_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libvbe_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libvgahw_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libxaa_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/libxf8_16bpp_g.a		-unknown-	obsolete
 ./usr/libdata/debug/usr/X11R6/bin/Xdreamcast.debug	-unknown-	debug,x11
 ./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug		-unknown-	debug,x11
@@ -20,6 +22,10 @@
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	-unknown-	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	-unknown-	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	-unknown-	debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	-unknown-	debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	-unknown-	debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug	-unknown-	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri.so.0.debug	-unknown-	xorg,debug
 

CVS commit: src/sys/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 21:19:24 UTC 2016

Modified Files:
src/sys/sys: clockctl.h ktrace.h

Log Message:
Rename the two register_t uses that leaked to userland __register_t so that
they can be fixed later if we want.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/sys/clockctl.h
cvs rdiff -u -r1.61 -r1.62 src/sys/sys/ktrace.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/sys/clockctl.h
diff -u src/sys/sys/clockctl.h:1.17 src/sys/sys/clockctl.h:1.18
--- src/sys/sys/clockctl.h:1.17	Mon Dec  7 01:28:22 2015
+++ src/sys/sys/clockctl.h	Sat Jan 23 16:19:24 2016
@@ -1,4 +1,4 @@
-/*  $NetBSD: clockctl.h,v 1.17 2015/12/07 06:28:22 pgoyette Exp $ */
+/*  $NetBSD: clockctl.h,v 1.18 2016/01/23 21:19:24 christos Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@ struct clockctl_clock_settime {
 
 struct clockctl_ntp_adjtime {
 	struct timex *tp;
-	register_t retval;
+	__register_t retval;
 };
 
 #define CLOCKCTL_NTP_ADJTIME _IOWR('C', 0x8, struct clockctl_ntp_adjtime)

Index: src/sys/sys/ktrace.h
diff -u src/sys/sys/ktrace.h:1.61 src/sys/sys/ktrace.h:1.62
--- src/sys/sys/ktrace.h:1.61	Mon Dec  9 12:43:58 2013
+++ src/sys/sys/ktrace.h	Sat Jan 23 16:19:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ktrace.h,v 1.61 2013/12/09 17:43:58 pooka Exp $	*/
+/*	$NetBSD: ktrace.h,v 1.62 2016/01/23 21:19:24 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -126,8 +126,8 @@ struct ktr_sysret {
 	short	ktr_code;
 	short	ktr_eosys;		/* XXX unused */
 	int	ktr_error;
-	register_t ktr_retval;
-	register_t ktr_retval_1;
+	__register_t ktr_retval;
+	__register_t ktr_retval_1;
 };
 
 /*

CVS commit: src/sys/arch/arm

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan 23 21:39:18 UTC 2016

Modified Files:
src/sys/arch/arm/arm: cpufunc.c
src/sys/arch/arm/arm32: cpu.c
src/sys/arch/arm/include: cpufunc.h
src/sys/arch/arm/include/arm32: psl.h

Log Message:
Rename the cpu_id() define to cpu_idnum() so that it does not conflict with
dtrace and friends.


To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sys/arch/arm/arm/cpufunc.c
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/arm/arm32/cpu.c
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/arm/include/cpufunc.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/include/arm32/psl.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.159 src/sys/arch/arm/arm/cpufunc.c:1.160
--- src/sys/arch/arm/arm/cpufunc.c:1.159	Thu Dec 10 17:04:54 2015
+++ src/sys/arch/arm/arm/cpufunc.c	Sat Jan 23 16:39:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.c,v 1.159 2015/12/10 22:04:54 skrll Exp $	*/
+/*	$NetBSD: cpufunc.c,v 1.160 2016/01/23 21:39:17 christos Exp $	*/
 
 /*
  * arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.159 2015/12/10 22:04:54 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.160 2016/01/23 21:39:17 christos Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_cpuoptions.h"
@@ -1573,7 +1573,7 @@ get_cachetype_cp15(void)
 	 * reserved ID register is encountered, the System Control
 	 * processor returns the value of the main ID register.
 	 */
-	if (ctype == cpu_id())
+	if (ctype == cpu_idnum())
 		goto out;
 
 #if (ARM_MMU_V6 + ARM_MMU_V7) > 0
@@ -1587,7 +1587,7 @@ get_cachetype_cp15(void)
 			arm_cache_prefer_mask = PAGE_SIZE;
 		}
 #ifdef CPU_CORTEX
-		if (CPU_ID_CORTEX_P(cpu_id())) {
+		if (CPU_ID_CORTEX_P(cpu_idnum())) {
 			arm_pcache.dcache_type = CACHE_TYPE_PIPT;
 		} else
 #endif
@@ -1730,7 +1730,7 @@ static void
 get_cachetype_table(void)
 {
 	int i;
-	uint32_t cpuid = cpu_id();
+	uint32_t cpuid = cpu_idnum();
 
 	for (i = 0; cachetab[i].ct_cpuid != 0; i++) {
 		if (cachetab[i].ct_cpuid == (cpuid & CPU_ID_CPU_MASK)) {
@@ -3184,7 +3184,7 @@ arm11x6_setup(char *args)
 	uint32_t sbz=0;
 	uint32_t cpuid;
 
-	cpuid = cpu_id();
+	cpuid = cpu_idnum();
 
 	cpuctrl =
 		CPU_CONTROL_MMU_ENABLE  |

Index: src/sys/arch/arm/arm32/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.111 src/sys/arch/arm/arm32/cpu.c:1.112
--- src/sys/arch/arm/arm32/cpu.c:1.111	Thu Nov 12 05:49:35 2015
+++ src/sys/arch/arm/arm32/cpu.c	Sat Jan 23 16:39:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.111 2015/11/12 10:49:35 jmcneill Exp $	*/
+/*	$NetBSD: cpu.c,v 1.112 2016/01/23 21:39:17 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.111 2015/11/12 10:49:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.112 2016/01/23 21:39:17 christos Exp $");
 
 #include 
 #include 
@@ -89,7 +89,7 @@ cpu_attach(device_t dv, cpuid_t id)
 
 		/* Get the CPU ID from coprocessor 15 */
 
-		ci->ci_arm_cpuid = cpu_id();
+		ci->ci_arm_cpuid = cpu_idnum();
 		ci->ci_arm_cputype = ci->ci_arm_cpuid & CPU_ID_CPU_MASK;
 		ci->ci_arm_cpurev = ci->ci_arm_cpuid & CPU_ID_REVISION_MASK;
 	} else {

Index: src/sys/arch/arm/include/cpufunc.h
diff -u src/sys/arch/arm/include/cpufunc.h:1.75 src/sys/arch/arm/include/cpufunc.h:1.76
--- src/sys/arch/arm/include/cpufunc.h:1.75	Sat Oct 17 12:34:43 2015
+++ src/sys/arch/arm/include/cpufunc.h	Sat Jan 23 16:39:18 2016
@@ -169,7 +169,7 @@ struct cpu_functions {
 extern struct cpu_functions cpufuncs;
 extern u_int cputype;
 
-#define cpu_id()		cpufuncs.cf_id()
+#define cpu_idnum()		cpufuncs.cf_id()
 
 #define cpu_control(c, e)	cpufuncs.cf_control(c, e)
 #define cpu_domains(d)		cpufuncs.cf_domains(d)

Index: src/sys/arch/arm/include/arm32/psl.h
diff -u src/sys/arch/arm/include/arm32/psl.h:1.20 src/sys/arch/arm/include/arm32/psl.h:1.21
--- src/sys/arch/arm/include/arm32/psl.h:1.20	Tue Feb  4 13:51:16 2014
+++ src/sys/arch/arm/include/arm32/psl.h	Sat Jan 23 16:39:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: psl.h,v 1.20 2014/02/04 18:51:16 matt Exp $	*/
+/*	$NetBSD: psl.h,v 1.21 2016/01/23 21:39:18 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -66,6 +66,8 @@
 
 #ifdef _KERNEL
 #ifndef _LOCORE
+#include 
+
 int raisespl	(int);
 int lowerspl	(int);
 void splx	(int);

CVS commit: src/sys/dev

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Jan 24 01:01:11 UTC 2016

Modified Files:
src/sys/dev: lockstat.h

Log Message:
Fix non-cpu counter build.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/lockstat.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/lockstat.h
diff -u src/sys/dev/lockstat.h:1.13 src/sys/dev/lockstat.h:1.14
--- src/sys/dev/lockstat.h:1.13	Sun Mar  8 21:41:41 2015
+++ src/sys/dev/lockstat.h	Sat Jan 23 20:01:11 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: lockstat.h,v 1.13 2015/03/09 01:41:41 christos Exp $	*/
+/*	$NetBSD: lockstat.h,v 1.14 2016/01/24 01:01:11 christos Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -181,9 +181,6 @@ do {	\
 
 void	lockstat_event(uintptr_t, uintptr_t, u_int, u_int, uint64_t);
 
-extern volatile u_int	lockstat_enabled;
-extern volatile u_int	lockstat_dev_enabled;
-
 #else
 
 #define	LOCKSTAT_FLAG(name)	/* nothing */
@@ -216,9 +213,14 @@ void		lockstat_probe_stub(uint32_t, uint
 #define KDTRACE_LOCKSTAT_ENABLED 0
 #endif
 
+#if defined(_KERNEL) && NLOCKSTAT > 0
+extern volatile u_int	lockstat_enabled;
+extern volatile u_int	lockstat_dev_enabled;
+
 #define LOCKSTAT_ENABLED_UPDATE() do { \
 	lockstat_enabled = lockstat_dev_enabled | KDTRACE_LOCKSTAT_ENABLED; \
 	membar_producer(); \
 } while (/*CONSTCOND*/0)
+#endif
 
 #endif	/* _SYS_LOCKSTAT_H_ */

CVS commit: src/sys/modules/dtrace/lockstat

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Jan 24 01:01:43 UTC 2016

Modified Files:
src/sys/modules/dtrace/lockstat: Makefile

Log Message:
Instead of hard-coding who has cpu counters why don't you look for them?


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/dtrace/lockstat/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/dtrace/lockstat/Makefile
diff -u src/sys/modules/dtrace/lockstat/Makefile:1.2 src/sys/modules/dtrace/lockstat/Makefile:1.3
--- src/sys/modules/dtrace/lockstat/Makefile:1.2	Thu Sep 10 15:57:48 2015
+++ src/sys/modules/dtrace/lockstat/Makefile	Sat Jan 23 20:01:43 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2015/09/10 19:57:48 riz Exp $
+#	$NetBSD: Makefile,v 1.3 2016/01/24 01:01:43 christos Exp $
 
 .include "../../Makefile.inc"
 
@@ -10,7 +10,7 @@ SRCS=		lockstat.c
 CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/sys
 CPPFLAGS+=	-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
 CPPFLAGS+=	-DKDTRACE_HOOKS
-.if (!empty(MACHINE_ARCH:Mearm*) || !empty(MACHINE_ARCH:Marm*))
+.if exists(${DESTDIR}/usr/include/machine/cpu_counter.h)
 CPPFLAGS+=	-D__HAVE_CPU_COUNTER
 .endif
 

CVS commit: src/distrib/sets/lists

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Jan 24 01:27:33 UTC 2016

Modified Files:
src/distrib/sets/lists/xcomp: md.shark
src/distrib/sets/lists/xdebug: md.shark

Log Message:
fix shark sets


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/xcomp/md.shark
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/xdebug/md.shark

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/xcomp/md.shark
diff -u src/distrib/sets/lists/xcomp/md.shark:1.14 src/distrib/sets/lists/xcomp/md.shark:1.15
--- src/distrib/sets/lists/xcomp/md.shark:1.14	Wed Jan 16 11:01:08 2013
+++ src/distrib/sets/lists/xcomp/md.shark	Sat Jan 23 20:27:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.shark,v 1.14 2013/01/16 16:01:08 christos Exp $
+# $NetBSD: md.shark,v 1.15 2016/01/24 01:27:33 christos Exp $
 ./usr/X11R6/include/xf86Optrec.h			-unknown-	x11
 ./usr/X11R6/include/xf86Parser.h			-unknown-	x11
 ./usr/X11R6/man/cat3/XF86VidMode.0			-unknown-	.cat,x11
@@ -70,3 +70,16 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3		-unknown-	.man,x11
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3	-unknown-	.man,x11
 ./usr/X11R6/man/man4/fpit.4-unknown-	.man,x11
+./usr/libdata/lint/llib-ldbe.ln-unknown-	lint,xorg
+./usr/libdata/lint/llib-ldri.ln-unknown-	lint,xorg
+./usr/libdata/lint/llib-ldri2.ln			-unknown-	lint,xorg
+./usr/libdata/lint/llib-lexa.ln-unknown-	lint,xorg
+./usr/libdata/lint/llib-lextmod.ln			-unknown-	lint,xorg
+./usr/libdata/lint/llib-lfb.ln-unknown-	lint,xorg
+./usr/libdata/lint/llib-lglx.ln-unknown-	lint,xorg
+./usr/libdata/lint/llib-lrecord.ln			-unknown-	lint,xorg
+./usr/libdata/lint/llib-lshadow.ln			-unknown-	lint,xorg
+./usr/libdata/lint/llib-lshadowfb.ln			-unknown-	lint,xorg
+./usr/libdata/lint/llib-lvbe.ln-unknown-	lint,xorg
+./usr/libdata/lint/llib-lvgahw.ln			-unknown-	lint,xorg
+./usr/libdata/lint/llib-lxaa.ln-unknown-	lint,xorg

Index: src/distrib/sets/lists/xdebug/md.shark
diff -u src/distrib/sets/lists/xdebug/md.shark:1.4 src/distrib/sets/lists/xdebug/md.shark:1.5
--- src/distrib/sets/lists/xdebug/md.shark:1.4	Sat Jul 18 04:56:06 2015
+++ src/distrib/sets/lists/xdebug/md.shark	Sat Jan 23 20:27:33 2016
@@ -1,27 +1,27 @@
-# $NetBSD: md.shark,v 1.4 2015/07/18 08:56:06 mrg Exp $
+# $NetBSD: md.shark,v 1.5 2016/01/24 01:27:33 christos Exp $
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		-unknown-	obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		-unknown-	obsolete
-./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/libdri_g.a		-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/libextmod_g.a	-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/libglx_g.a		-unknown-	debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdri_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libextmod_g.a	-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libglx_g.a		-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/extensions/libmfb_g.a		-unknown-	obsolete
-./usr/X11R7/lib/modules/extensions/librecord_g.a	-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/extensions/libshadow_g.a	-unknown-	debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/extensions/librecord_g.a	-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libshadow_g.a	-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/extensions/libxtrap_g.a		-unknown-	obsolete
 ./usr/X11R7/lib/modules/fonts/libfreetype_g.a		-unknown-	obsolete
 ./usr/X11R7/lib/modules/fonts/libtype1_g.a		-unknown-	obsolete
-./usr/X11R7/lib/modules/libexa_g.a			-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libfb_g.a			-unknown-	debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libexa_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libfb_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/libi2c_g.a			-unknown-	debuglib,xorg,obsolete
 ./usr/X11R7/lib/modules/libint10_g.a			-unknown-	obsolete,obsolete
 ./usr/X11R7/lib/modules/libpcidata_g.a			-unknown-	obsolete
 ./usr/X11R7/lib/modules/libscanpci_g.a			-unknown-	obsolete
-./usr/X11R7/lib/modules/libshadowfb_g.a			-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libvbe_g.a			-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libvgahw_g.a			-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libxaa_g.a			-unknown-	debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libshadowfb_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libvbe_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libvgahw_g.a			-unknown-	debuglib,xorg

CVS commit: src/tools/gcc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Jan 24 05:02:24 UTC 2016

Modified Files:
src/tools/gcc: mknative-gcc

Log Message:
add a comment saying this is for GCC 4.8


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/tools/gcc/mknative-gcc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.81 src/tools/gcc/mknative-gcc:1.82
--- src/tools/gcc/mknative-gcc:1.81	Sat Jan 31 08:50:01 2015
+++ src/tools/gcc/mknative-gcc	Sun Jan 24 05:02:23 2016
@@ -1,9 +1,10 @@
 #!/bin/sh
-#	$NetBSD: mknative-gcc,v 1.81 2015/01/31 08:50:01 mrg Exp $
+#	$NetBSD: mknative-gcc,v 1.82 2016/01/24 05:02:23 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
 #
+# This version is for GCC 4.8.
 
 # initialise
 

CVS commit: src/tools/gcc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Jan 24 05:10:26 UTC 2016

Modified Files:
src/tools/gcc: Makefile mknative-gcc.old

Log Message:
prepare for GCC 5:
- remove GCC 4.5 stuff, add most very basic GCC 5 stuff.
- use mknative-gcc.old for GCC 4.8
- copy mknative-gcc to mknative-gcc.old (should have done this when we
  switched to using gcc.old.)

this should not affect current builds.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/tools/gcc/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tools/gcc/mknative-gcc.old

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.74 src/tools/gcc/Makefile:1.75
--- src/tools/gcc/Makefile:1.74	Fri Jan 16 20:10:26 2015
+++ src/tools/gcc/Makefile	Sun Jan 24 05:10:26 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.74 2015/01/16 20:10:26 christos Exp $
+#	$NetBSD: Makefile,v 1.75 2016/01/24 05:10:26 mrg Exp $
 
 .include 
 
@@ -9,16 +9,11 @@ GCCDIST=	${.CURDIR}/../../external/gpl3/
 GNUHOSTDIST=	${GCCDIST}
 
 .if ${HAVE_GCC} == 48
-CC_FOR_BUILD=		${HOST_CXX:Q}
-LIB_INTL=
-.elif ${HAVE_GCC} == 45
-UNWIND_H=unwind.h
 MKNATIVE=		${.CURDIR}/mknative-gcc.old
 .endif
 
 # Defaults
-CC_FOR_BUILD?=		${HOST_CC:Q}
-LIB_INTL?=		"LIBS=-lintl"
+CC_FOR_BUILD=		${HOST_CXX:Q}
 MKNATIVE?=		${.CURDIR}/mknative-gcc
 
 .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64"
@@ -88,13 +83,14 @@ BUILD_MAKE=${TOOL_GMAKE}
 
 MKNATIVE_CONFIG_TARGET_LIBS=
 
-.if ${HAVE_GCC} == 48
+.if ${HAVE_GCC} == 5
 MKNATIVE_CONFIG_TARGET_LIBS+=	configure-target-libgcc
 MKNATIVE_CONFIG_TARGET_LIBS+=	configure-target-libgomp
-MKNATIVE_TARGET=	gcc48
-.elif ${HAVE_GCC} == 45
+MKNATIVE_TARGET=	gcc5
+.elif ${HAVE_GCC} == 48
+MKNATIVE_CONFIG_TARGET_LIBS+=	configure-target-libgcc
 MKNATIVE_CONFIG_TARGET_LIBS+=	configure-target-libgomp
-MKNATIVE_TARGET=	gcc45
+MKNATIVE_TARGET=	gcc48
 .endif
 
 MKNATIVE_CONFIG_TARGET_LIBS+= \
@@ -116,7 +112,6 @@ MKNATIVE_ENV=	${BINENV} ${CONFIGURE_ENV:
 			MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \
 			NM=${NM:Q} OBJDUMP=${OBJDUMP:Q} \
 			XGETTEXT=${TOOLDIR}/bin/${_TOOL_PREFIX}xgettext \
-			${LIB_INTL} \
 			ac_cv_prog_cc_cross=yes \
 			ac_cv_func_strcoll_works=yes \
 			ac_cv_func_elf_getshstrndx=no \
@@ -141,14 +136,12 @@ bootstrap-libgcc: .configure_done
 		${.OBJDIR}/build ${NEWCONFIGDIR} ${NETBSDSRCDIR} \
 		${MACHINE_GNU_PLATFORM} ${DESTDIR} ${TOOLDIR}
 
-.if ${HAVE_GCC} == "48"
 bootstrap-libstdc++: .configure_done
 	@echo 'Creating files needed for libstdc++ by a native bootstrap build.'
 	(cd ${.OBJDIR}/build && ${BUILD_COMMAND} configure-target-libstdc++-v3)
 	@MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} libstdc++-bootstrap \
 		${.OBJDIR}/build ${NEWCONFIGDIR} ${NETBSDSRCDIR} \
 		${MACHINE_GNU_PLATFORM} ${DESTDIR} ${TOOLDIR}
-.endif
 
 native-gcc: .native/.configure_done
 	@echo 'Extracting GNU GCC configury for a native toolchain.'
@@ -201,8 +194,7 @@ MKENV_BUILD_MAKE=cd .native && ${MKNATIV
 			${HOST_SH} ${GNUHOSTDIST}/configure \
 			${NATIVE_CONFIGURE_ARGS}) && \
 		(${MKENV_BUILD_MAKE} all-build-libiberty) && \
-		([ "${HAVE_GCC}" = "48" ] && \
-		 (${MKENV_BUILD_MAKE} all-libcpp) && \
+		((${MKENV_BUILD_MAKE} all-libcpp) && \
 		 (${MKENV_BUILD_MAKE} all-libbacktrace) && \
 		 (${MKENV_BUILD_MAKE} all-libdecnumber) || true)
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
@@ -217,7 +209,7 @@ MKENV_BUILD_MAKE=cd .native && ${MKNATIV
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
 		(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e tree-check.h config.h multilib.h gcov-iov.h)
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
-		(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h ${UNWIND_H})
+		(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h unwind.h
 		(cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so)
 .for _lib in ${MKNATIVE_CONFIG_TARGET_LIBS}
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \

Index: src/tools/gcc/mknative-gcc.old
diff -u src/tools/gcc/mknative-gcc.old:1.1 src/tools/gcc/mknative-gcc.old:1.2
--- src/tools/gcc/mknative-gcc.old:1.1	Wed Feb 26 09:54:34 2014
+++ src/tools/gcc/mknative-gcc.old	Sun Jan 24 05:10:26 2016
@@ -1,13 +1,10 @@
 #!/bin/sh
-#	$NetBSD: mknative-gcc.old,v 1.1 2014/02/26 09:54:34 mrg Exp $
-#
-# was: NetBSD: mknative-gcc,v 1.75 2014/02/16 11:26:31 skrll Exp
+#	$NetBSD: mknative-gcc.old,v 1.2 2016/01/24 05:10:26 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
 #
-
-# XXX split out GCC 4.1 support
+# This version is for GCC 4.8.
 
 # initialise
 
@@ -16,7 +13,7 @@ _TOP=$3
 _SRC=$4
 _PLATFORM=$5
 _DESTDIR=$6
-_ABI=$7
+_TOOLDIR=$7
 _VPATH=`grep VPATH ${_TMPDIR}/Makefile | sed 's,^.*=[ 	]*,,'`
 _GNU_DIST=`cd ${_VPATH}; pwd`
 
@@ -36,11 +33,12 @@ sanitise_includes () {
 		-e "s,-I$_DESTDIR/usr/include,,g" \
 		-e