date:20091214

CVS commit: src/share/mk

2009-12-14 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Mon Dec 14 08:51:16 UTC 2009

Modified Files:
src/share/mk: bsd.kmodule.mk bsd.prog.mk

Log Message:
use ${CC} -r not ${CC} -Wl,-r as the latter fools GCC on some targets
and it ends up passing -r -relax to ld, which causes ld to barf.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.245 -r1.246 src/share/mk/bsd.prog.mk

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

Modified files:

Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.22 src/share/mk/bsd.kmodule.mk:1.23
--- src/share/mk/bsd.kmodule.mk:1.22	Mon Dec 14 01:00:46 2009
+++ src/share/mk/bsd.kmodule.mk	Mon Dec 14 08:51:16 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.kmodule.mk,v 1.22 2009/12/14 01:00:46 matt Exp $
+#	$NetBSD: bsd.kmodule.mk,v 1.23 2009/12/14 08:51:16 mrg Exp $
 
 # We are not building this with PIE
 MKPIE=no
@@ -43,7 +43,7 @@
 
 ${PROG}: ${OBJS} ${DPADD}
 	${_MKTARGET_LINK}
-	${CC} ${LDFLAGS} -nostdlib -Wl,-T,${KMODSCRIPT},-r,-d \
+	${CC} ${LDFLAGS} -nostdlib -r -Wl,-T,${KMODSCRIPT},-d \
 		-o ${.TARGET} ${OBJS}
 
 # Install rules

Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.245 src/share/mk/bsd.prog.mk:1.246
--- src/share/mk/bsd.prog.mk:1.245	Mon Dec 14 01:00:46 2009
+++ src/share/mk/bsd.prog.mk	Mon Dec 14 08:51:16 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.245 2009/12/14 01:00:46 matt Exp $
+#	$NetBSD: bsd.prog.mk,v 1.246 2009/12/14 08:51:16 mrg Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -309,7 +309,7 @@
 
 ${_P}.ro: ${OBJS.${_P}} ${DPADD}
 	${_MKTARGET_LINK}
-	${CC} ${LDFLAGS} -nostdlib -Wl,-r,-dc -o ${.TARGET} ${OBJS.${_P}}
+	${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
 
 .if defined(_PROGDEBUG.${_P})
 ${_PROGDEBUG.${_P}}: ${_P}

CVS commit: src/tools/gdb

2009-12-14 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Mon Dec 14 08:51:31 UTC 2009

Modified Files:
src/tools/gdb: Makefile

Log Message:
Disable parallel build, which always fails at compiling itable.c / interp.c.
Only affect MKCROSSGDB=yes.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tools/gdb/Makefile

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

Modified files:

Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.11 src/tools/gdb/Makefile:1.12
--- src/tools/gdb/Makefile:1.11	Fri Dec  5 05:12:02 2008
+++ src/tools/gdb/Makefile	Mon Dec 14 08:51:31 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2008/12/05 05:12:02 mrg Exp $
+#	$NetBSD: Makefile,v 1.12 2009/12/14 08:51:31 uebayasi Exp $
 
 .include bsd.own.mk
 
@@ -11,6 +11,7 @@
 
 MAKE_ARGS=	MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q}
 
+.MAKEFLAGS: -B	# XXX otherwise fails with itable.c / interp.c build
 ALL_TARGET=	all-gdb
 INSTALL_TARGET=	install-gdb

CVS commit: src/share/man/man4

2009-12-14 Thread Cherry G. Mathew

Module Name:src
Committed By:   cherry
Date:   Mon Dec 14 09:06:37 UTC 2009

Modified Files:
src/share/man/man4: ugensa.4

Log Message:
Add reference to Qualcom Inc AC8700 / ZTE 1x EVDO interface. Thanks 
sayspra...@gmail.com


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/ugensa.4

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

Modified files:

Index: src/share/man/man4/ugensa.4
diff -u src/share/man/man4/ugensa.4:1.8 src/share/man/man4/ugensa.4:1.9
--- src/share/man/man4/ugensa.4:1.8	Wed Apr 30 13:10:54 2008
+++ src/share/man/man4/ugensa.4	Mon Dec 14 09:06:37 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: ugensa.4,v 1.8 2008/04/30 13:10:54 martin Exp $
+.\ $NetBSD: ugensa.4,v 1.9 2009/12/14 09:06:37 cherry Exp $
 .\
 .\ Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -47,6 +47,7 @@
 .It Airprime PC5220
 .It Novatel FlexPak GPS receiver
 .It Qualcom CDMA MSM (found in Kyocera KPC650 EVDO interface)
+.It Qualcom Inc. CDMA AC8700 (found in the ZTE 1x EVDO interface)
 .It Sierra AirCard 580
 .It Sierra AirCard 595
 .It Sierra AirCard 875 [not tested]

CVS commit: src/share/man/man4

2009-12-14 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Mon Dec 14 09:33:47 UTC 2009

Modified Files:
src/share/man/man4: ugensa.4

Log Message:
Bump date for additional supported card.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/ugensa.4

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

Modified files:

Index: src/share/man/man4/ugensa.4
diff -u src/share/man/man4/ugensa.4:1.9 src/share/man/man4/ugensa.4:1.10
--- src/share/man/man4/ugensa.4:1.9	Mon Dec 14 09:06:37 2009
+++ src/share/man/man4/ugensa.4	Mon Dec 14 09:33:47 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: ugensa.4,v 1.9 2009/12/14 09:06:37 cherry Exp $
+.\ $NetBSD: ugensa.4,v 1.10 2009/12/14 09:33:47 wiz Exp $
 .\
 .\ Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -27,7 +27,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd November 29, 2007
+.Dd December 14, 2009
 .Dt UGENSA 4
 .Os
 .Sh NAME

CVS commit: src/distrib/sets/lists

2009-12-14 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Mon Dec 14 09:57:37 UTC 2009

Modified Files:
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi

Log Message:
Set list police.


To generate a diff of this commit:
cvs rdiff -u -r1.1346 -r1.1347 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1176 -r1.1177 src/distrib/sets/lists/man/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.1346 src/distrib/sets/lists/comp/mi:1.1347
--- src/distrib/sets/lists/comp/mi:1.1346	Mon Dec 14 02:01:53 2009
+++ src/distrib/sets/lists/comp/mi	Mon Dec 14 09:57:37 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1346 2009/12/14 02:01:53 matt Exp $
+#	$NetBSD: mi,v 1.1347 2009/12/14 09:57:37 uebayasi Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -2295,8 +2295,8 @@
 ./usr/lib/libasn1_g.a-unknown-		debuglib,kerberos
 ./usr/lib/libasn1_p.acomp-krb5-proflib	profile,kerberos
 ./usr/lib/libatf-c++.acomp-atf-lib		atf
-./usr/lib/libatf-c++_g.a			-unknown-		atf.debuglib
-./usr/lib/libatf-c++_p.a			comp-atf-lib		atf.profile
+./usr/lib/libatf-c++_g.a			-unknown-		atf,debuglib
+./usr/lib/libatf-c++_p.a			comp-atf-lib		atf,profile
 ./usr/lib/libatf-c.acomp-atf-lib		atf
 ./usr/lib/libatf-c_g.a-unknown-		atf,debuglib
 ./usr/lib/libatf-c_p.acomp-atf-lib		atf,profile

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1176 src/distrib/sets/lists/man/mi:1.1177
--- src/distrib/sets/lists/man/mi:1.1176	Mon Dec 14 02:01:54 2009
+++ src/distrib/sets/lists/man/mi	Mon Dec 14 09:57:37 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1176 2009/12/14 02:01:54 matt Exp $
+# $NetBSD: mi,v 1.1177 2009/12/14 09:57:37 uebayasi Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -49,6 +49,7 @@
 ./usr/share/man/cat1/at.0			man-cron-catman		.cat
 ./usr/share/man/cat1/atari/edahdi.0		man-sysutil-catman	.cat
 ./usr/share/man/cat1/atari/msconfig.0		man-sysutil-catman	.cat
+./usr/share/man/cat1/atf-check.0		man-atf-catman		.cat,atf
 ./usr/share/man/cat1/atf-cleanup.0		man-atf-catman		.cat,atf
 ./usr/share/man/cat1/atf-compile.0		man-atf-catman		.cat,atf
 ./usr/share/man/cat1/atf-config.0		man-atf-catman		.cat,atf

CVS commit: [matt-nb5-mips64] src/etc/etc.evbmips

2009-12-14 Thread Cliff Neighbors

Module Name:src
Committed By:   cliff
Date:   Mon Dec 14 12:02:24 UTC 2009

Modified Files:
src/etc/etc.evbmips [matt-nb5-mips64]: Makefile.inc

Log Message:
add XLSATX kernels to KERNEL_SETS, BUILD_KERNELS


To generate a diff of this commit:
cvs rdiff -u -r1.11.26.1 -r1.11.26.2 src/etc/etc.evbmips/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/etc/etc.evbmips/Makefile.inc
diff -u src/etc/etc.evbmips/Makefile.inc:1.11.26.1 src/etc/etc.evbmips/Makefile.inc:1.11.26.2
--- src/etc/etc.evbmips/Makefile.inc:1.11.26.1	Mon Aug 24 04:03:30 2009
+++ src/etc/etc.evbmips/Makefile.inc	Mon Dec 14 12:02:24 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.11.26.1 2009/08/24 04:03:30 matt Exp $
+#	$NetBSD: Makefile.inc,v 1.11.26.2 2009/12/14 12:02:24 cliff Exp $
 #
 #	etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
 #
@@ -13,8 +13,9 @@
 BUILD_KERNELS=		INSTALL_OMSAL400 INSTALL_MALTA
 
 .elif ${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el
-KERNEL_SETS=		MALTA32 MALTA64
+KERNEL_SETS=		MALTA32 MALTA64 XLSATX32 XLSATX64
 BUILD_KERNELS=		INSTALL_MALTA32 INSTALL_MALTA64
+BUILD_KERNELS+=		INSTALL_XLSATX32 INSTALL_XLSATX64
 
 .else
 KERNEL_SETS=		ALCHEMY DBAU1500 DBAU1550 MALTA

CVS commit: [matt-nb5-mips64] src/distrib/evbmips/instkernel/instkernel

2009-12-14 Thread Cliff Neighbors

Module Name:src
Committed By:   cliff
Date:   Mon Dec 14 12:03:49 UTC 2009

Modified Files:
src/distrib/evbmips/instkernel/instkernel [matt-nb5-mips64]: Makefile

Log Message:
add INSTALL_XLSATX32, INSTALL_XLSATX64 kernels to MDSETTARGETS


To generate a diff of this commit:
cvs rdiff -u -r1.1.34.1 -r1.1.34.2 \
src/distrib/evbmips/instkernel/instkernel/Makefile

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

Modified files:

Index: src/distrib/evbmips/instkernel/instkernel/Makefile
diff -u src/distrib/evbmips/instkernel/instkernel/Makefile:1.1.34.1 src/distrib/evbmips/instkernel/instkernel/Makefile:1.1.34.2
--- src/distrib/evbmips/instkernel/instkernel/Makefile:1.1.34.1	Mon Aug 24 04:03:30 2009
+++ src/distrib/evbmips/instkernel/instkernel/Makefile	Mon Dec 14 12:03:49 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.34.1 2009/08/24 04:03:30 matt Exp $
+#	$NetBSD: Makefile,v 1.1.34.2 2009/12/14 12:03:49 cliff Exp $
 
 .include bsd.own.mk
 .include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -14,6 +14,8 @@
 .elif ${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el
 MDSETTARGETS=		INSTALL_MALTA32		${RAMDISK}	-
 MDSETTARGETS+=		INSTALL_MALTA64		${RAMDISK}	-
+MDSETTARGETS+=		INSTALL_XLSATX32	${RAMDISK}	-
+MDSETTARGETS+=		INSTALL_XLSATX64	${RAMDISK}	-
 
 .else
 # Big endian platforms.

CVS commit: src

2009-12-14 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Mon Dec 14 12:43:48 UTC 2009

Modified Files:
src/games: Makefile
src/gnu/lib: Makefile
src/regress/usr.bin: Makefile
src/regress/usr.bin/rtld: Makefile

Log Message:
Conditionalize some build directories by ${MKCXX}.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/games/Makefile
cvs rdiff -u -r1.45 -r1.46 src/gnu/lib/Makefile
cvs rdiff -u -r1.16 -r1.17 src/regress/usr.bin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/regress/usr.bin/rtld/Makefile

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

Modified files:

Index: src/games/Makefile
diff -u src/games/Makefile:1.24 src/games/Makefile:1.25
--- src/games/Makefile:1.24	Tue Jan 24 19:01:45 2006
+++ src/games/Makefile	Mon Dec 14 12:43:48 2009
@@ -1,17 +1,23 @@
-#	$NetBSD: Makefile,v 1.24 2006/01/24 19:01:45 elad Exp $
+#	$NetBSD: Makefile,v 1.25 2009/12/14 12:43:48 uebayasi Exp $
 #	@(#)Makefile	8.3 (Berkeley) 7/24/94
 
 # Missing: dungeon warp
 # Moved: chess
 # Don't belong: xneko xroach
 
+.include bsd.own.mk
+
 SUBDIR=	adventure arithmetic atc \
 	backgammon banner battlestar bcd boggle \
 	caesar canfield ching countmail cribbage \
-	dab dm factor fish fortune gomoku \
+	dm factor fish fortune gomoku \
 	hack hangman hunt larn mille monop morse number \
 	phantasia pig pom ppt primes quiz \
 	rain random robots rogue sail snake tetris trek \
 	wargames worm worms wtf wump
 
+.if ${MKCXX} != no
+SUBDIR=	dab 
+.endif
+
 .include bsd.subdir.mk

Index: src/gnu/lib/Makefile
diff -u src/gnu/lib/Makefile:1.45 src/gnu/lib/Makefile:1.46
--- src/gnu/lib/Makefile:1.45	Sun Nov  8 15:24:36 2009
+++ src/gnu/lib/Makefile	Mon Dec 14 12:43:48 2009
@@ -1,9 +1,12 @@
-#	$NetBSD: Makefile,v 1.45 2009/11/08 15:24:36 skrll Exp $
+#	$NetBSD: Makefile,v 1.46 2009/12/14 12:43:48 uebayasi Exp $
 
 .include bsd.own.mk
 
 .if ${MKGCC} != no
-SUBDIR+= crtstuff4 libgcc4 libobjc4 libsupc++4 libstdc++-v3_4
+SUBDIR+= crtstuff4 libgcc4 libobjc4
+.if ${MKCXX} != no
+SUBDIR+= libsupc++4 libstdc++-v3_4
+.endif
 .endif
 
 SUBDIR+= libmalloc

Index: src/regress/usr.bin/Makefile
diff -u src/regress/usr.bin/Makefile:1.16 src/regress/usr.bin/Makefile:1.17
--- src/regress/usr.bin/Makefile:1.16	Fri Feb 13 05:21:24 2009
+++ src/regress/usr.bin/Makefile	Mon Dec 14 12:43:48 2009
@@ -1,6 +1,11 @@
-#	$NetBSD: Makefile,v 1.16 2009/02/13 05:21:24 jmmv Exp $
+#	$NetBSD: Makefile,v 1.17 2009/12/14 12:43:48 uebayasi Exp $
 
-SUBDIR+= c++ rtld
-SUBDIR+= sort xlint
+.include bsd.own.mk
+
+.if ${MKCXX} != no
+SUBDIR+= c++
+.endif
+
+SUBDIR+= rtld sort xlint
 
 .include bsd.subdir.mk

Index: src/regress/usr.bin/rtld/Makefile
diff -u src/regress/usr.bin/rtld/Makefile:1.2 src/regress/usr.bin/rtld/Makefile:1.3
--- src/regress/usr.bin/rtld/Makefile:1.2	Thu Nov 14 21:10:45 2002
+++ src/regress/usr.bin/rtld/Makefile	Mon Dec 14 12:43:48 2009
@@ -1,5 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2002/11/14 21:10:45 nathanw Exp $
+# $NetBSD: Makefile,v 1.3 2009/12/14 12:43:48 uebayasi Exp $
 
-SUBDIR+= dlopen testlib dlerror-false dlerror-cleared
+.include bsd.own.mk
+
+SUBDIR+= dlopen
+.if ${MKCXX} != no
+SUBDIR+= testlib
+.endif
+SUBDIR+= dlerror-false dlerror-cleared
 
 .include bsd.subdir.mk

CVS commit: src/sys/arch/mips/mips

2009-12-14 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Mon Dec 14 12:53:18 UTC 2009

Modified Files:
src/sys/arch/mips/mips: compat_13_machdep.c compat_16_machdep.c

Log Message:
We don't declare variables in for () statement.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mips/mips/compat_13_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mips/mips/compat_16_machdep.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/arch/mips/mips/compat_13_machdep.c
diff -u src/sys/arch/mips/mips/compat_13_machdep.c:1.18 src/sys/arch/mips/mips/compat_13_machdep.c:1.19
--- src/sys/arch/mips/mips/compat_13_machdep.c:1.18	Mon Dec 14 00:46:05 2009
+++ src/sys/arch/mips/mips/compat_13_machdep.c	Mon Dec 14 12:53:18 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_13_machdep.c,v 1.18 2009/12/14 00:46:05 matt Exp $	*/
+/*	$NetBSD: compat_13_machdep.c,v 1.19 2009/12/14 12:53:18 uebayasi Exp $	*/
 
 /*
  * Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -15,7 +15,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: compat_13_machdep.c,v 1.18 2009/12/14 00:46:05 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: compat_13_machdep.c,v 1.19 2009/12/14 12:53:18 uebayasi Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -84,7 +84,8 @@
 	memcpy(f-f_regs[1], scp-sc_regs[1],
 	sizeof(scp-sc_regs) - sizeof(scp-sc_regs[0]));
 #else
-	for (size_t i = 1; i  __arraycount(scp-sc_regs); i++)
+	size_t i;
+	for (i = 1; i  __arraycount(scp-sc_regs); i++)
 		f-f_regs[i] = scp-sc_regs[i];
 #endif
 	if (scp-sc_fpused) {

Index: src/sys/arch/mips/mips/compat_16_machdep.c
diff -u src/sys/arch/mips/mips/compat_16_machdep.c:1.15 src/sys/arch/mips/mips/compat_16_machdep.c:1.16
--- src/sys/arch/mips/mips/compat_16_machdep.c:1.15	Mon Dec 14 00:46:05 2009
+++ src/sys/arch/mips/mips/compat_16_machdep.c	Mon Dec 14 12:53:18 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_16_machdep.c,v 1.15 2009/12/14 00:46:05 matt Exp $	*/
+/*	$NetBSD: compat_16_machdep.c,v 1.16 2009/12/14 12:53:18 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 	
-__KERNEL_RCSID(0, $NetBSD: compat_16_machdep.c,v 1.15 2009/12/14 00:46:05 matt Exp $); 
+__KERNEL_RCSID(0, $NetBSD: compat_16_machdep.c,v 1.16 2009/12/14 12:53:18 uebayasi Exp $); 
 
 #ifdef _KERNEL_OPT
 #include opt_cputype.h
@@ -125,7 +125,8 @@
 	memcpy(ksc.sc_regs[1], f-f_regs[1],
 	sizeof(ksc.sc_regs) - sizeof(ksc.sc_regs[0]));
 #else
-	for (size_t i = 1; i  32; i++)
+	size_t i;
+	for (i = 1; i  32; i++)
 		ksc.sc_regs[i] = f-f_regs[i];
 #endif
 
@@ -272,7 +273,8 @@
 	sizeof(scp-sc_regs) - sizeof(scp-sc_regs[0]));
 
 #else
-	for (size_t i = 1; i  __arraycount(f-f_regs); i++)
+	size_t i;
+	for (i = 1; i  __arraycount(f-f_regs); i++)
 		f-f_regs[i] = ksc.sc_regs[i];
 #endif
 #ifndef	SOFTFLOAT

CVS commit: src/sys/miscfs/procfs

2009-12-14 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Mon Dec 14 13:00:07 UTC 2009

Modified Files:
src/sys/miscfs/procfs: procfs_map.c

Log Message:
gimpy invented PRIxVADDR format specifier.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/miscfs/procfs/procfs_map.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/miscfs/procfs/procfs_map.c
diff -u src/sys/miscfs/procfs/procfs_map.c:1.37 src/sys/miscfs/procfs/procfs_map.c:1.38
--- src/sys/miscfs/procfs/procfs_map.c:1.37	Sun Jan 11 02:45:53 2009
+++ src/sys/miscfs/procfs/procfs_map.c	Mon Dec 14 13:00:07 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs_map.c,v 1.37 2009/01/11 02:45:53 christos Exp $	*/
+/*	$NetBSD: procfs_map.c,v 1.38 2009/12/14 13:00:07 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1993
@@ -76,7 +76,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: procfs_map.c,v 1.37 2009/01/11 02:45:53 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: procfs_map.c,v 1.38 2009/12/14 13:00:07 uebayasi Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -184,7 +184,7 @@
 			(unsigned long long)minor(dev), fileid, path);
 		} else {
 			pos += snprintf(buffer + pos, bufsize - pos,
-			0x%lx 0x%lx %c%c%c %c%c%c %s %s %d %d %d\n,
+			0x%PRIxVADDRx 0x%PRIxVADDRx %c%c%c %c%c%c %s %s %d %d %d\n,
 			entry-start, entry-end,
 			(entry-protection  VM_PROT_READ) ? 'r' : '-',
 			(entry-protection  VM_PROT_WRITE) ? 'w' : '-',

CVS commit: src/etc/mtree

2009-12-14 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Mon Dec 14 13:23:56 UTC 2009

Added Files:
src/etc/mtree: NetBSD.dist.mips64eb NetBSD.dist.mips64el

Log Message:
NetBSD/mips64e[bl] userland is default to N32 ABI.  It needs /usr/lib/o32
for O32 ABI and /usr/lib/64 for N32 ABI.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/etc/mtree/NetBSD.dist.mips64eb \
src/etc/mtree/NetBSD.dist.mips64el

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

Added files:

Index: src/etc/mtree/NetBSD.dist.mips64eb
diff -u /dev/null src/etc/mtree/NetBSD.dist.mips64eb:1.1
--- /dev/null	Mon Dec 14 13:23:56 2009
+++ src/etc/mtree/NetBSD.dist.mips64eb	Mon Dec 14 13:23:56 2009
@@ -0,0 +1,8 @@
+#	$NetBSD: NetBSD.dist.mips64eb,v 1.1 2009/12/14 13:23:56 uebayasi Exp $
+
+./usr/lib/o32
+./usr/lib/o32/i18n
+./usr/lib/o32/security
+./usr/lib/64
+./usr/lib/64/i18n
+./usr/lib/64/security
Index: src/etc/mtree/NetBSD.dist.mips64el
diff -u /dev/null src/etc/mtree/NetBSD.dist.mips64el:1.1
--- /dev/null	Mon Dec 14 13:23:56 2009
+++ src/etc/mtree/NetBSD.dist.mips64el	Mon Dec 14 13:23:56 2009
@@ -0,0 +1,8 @@
+#	$NetBSD: NetBSD.dist.mips64el,v 1.1 2009/12/14 13:23:56 uebayasi Exp $
+
+./usr/lib/o32
+./usr/lib/o32/i18n
+./usr/lib/o32/security
+./usr/lib/64
+./usr/lib/64/i18n
+./usr/lib/64/security

CVS commit: src/gnu/usr.bin

2009-12-14 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Mon Dec 14 13:39:33 UTC 2009

Modified Files:
src/gnu/usr.bin: Makefile

Log Message:
Conditionalize gnu/usr.bin/groff build by ${MKGROFF}.


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/gnu/usr.bin/Makefile

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

Modified files:

Index: src/gnu/usr.bin/Makefile
diff -u src/gnu/usr.bin/Makefile:1.131 src/gnu/usr.bin/Makefile:1.132
--- src/gnu/usr.bin/Makefile:1.131	Sun Nov  8 15:24:49 2009
+++ src/gnu/usr.bin/Makefile	Mon Dec 14 13:39:33 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.131 2009/11/08 15:24:49 skrll Exp $
+#	$NetBSD: Makefile,v 1.132 2009/12/14 13:39:33 uebayasi Exp $
 
 # for OBJECT_FMT
 .include bsd.own.mk
@@ -6,7 +6,11 @@
 SUBDIR+=	bc
 SUBDIR+=	c89 c99
 SUBDIR+=	dc diffutils gkermit grep
-SUBDIR+=	groff rcs send-pr texinfo
+SUBDIR+=	rcs send-pr texinfo
+
+.if ${MKGROFF} != no
+SUBDIR+=	groff
+.endif
 
 SUBDIR+=	gettext

CVS commit: src/compat/mips64

2009-12-14 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Mon Dec 14 13:43:59 UTC 2009

Modified Files:
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk

Log Message:
Use GNU linker emul names which really exist.

XXX Assume big endian for now.  Better than build failure.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.1 -r1.2 src/compat/mips64/o32/bsd.o32.mk

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

Modified files:

Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.1 src/compat/mips64/64/bsd.64.mk:1.2
--- src/compat/mips64/64/bsd.64.mk:1.1	Sun Dec 13 09:07:32 2009
+++ src/compat/mips64/64/bsd.64.mk	Mon Dec 14 13:43:59 2009
@@ -1,6 +1,6 @@
-#	$NetBSD: bsd.64.mk,v 1.1 2009/12/13 09:07:32 mrg Exp $
+#	$NetBSD: bsd.64.mk,v 1.2 2009/12/14 13:43:59 uebayasi Exp $
 
-LD+=		-m elf64_mipsn64
+LD+=		-m elf64btsmip	# XXX endian
 MLIBDIR=	64
 
 COPTS+=		-mabi=64

Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.1 src/compat/mips64/o32/bsd.o32.mk:1.2
--- src/compat/mips64/o32/bsd.o32.mk:1.1	Sun Dec 13 09:07:32 2009
+++ src/compat/mips64/o32/bsd.o32.mk	Mon Dec 14 13:43:59 2009
@@ -1,6 +1,6 @@
-#	$NetBSD: bsd.o32.mk,v 1.1 2009/12/13 09:07:32 mrg Exp $
+#	$NetBSD: bsd.o32.mk,v 1.2 2009/12/14 13:43:59 uebayasi Exp $
 
-LD+=		-m elf32_mipso32
+LD+=		-m elf32btsmip	# XXX endian
 MLIBDIR=	o32
 
 COPTS+=		-mabi=32 -march=mips3

CVS commit: src/usr.bin/crunch/crunchide

2009-12-14 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Mon Dec 14 14:01:10 UTC 2009

Modified Files:
src/usr.bin/crunch/crunchide: Makefile

Log Message:
Teach crunchide(1) that mips64e[bl] is 64-bit ELF.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/crunch/crunchide/Makefile

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/crunch/crunchide/Makefile
diff -u src/usr.bin/crunch/crunchide/Makefile:1.16 src/usr.bin/crunch/crunchide/Makefile:1.17
--- src/usr.bin/crunch/crunchide/Makefile:1.16	Sun Apr  8 09:36:34 2007
+++ src/usr.bin/crunch/crunchide/Makefile	Mon Dec 14 14:01:10 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2007/04/08 09:36:34 scw Exp $
+#	$NetBSD: Makefile,v 1.17 2009/12/14 14:01:10 uebayasi Exp $
 
 .include bsd.own.mk
 
@@ -15,7 +15,9 @@
 CPPFLAGS+=-DNLIST_ELF32
 .elif	${MACHINE_ARCH} == sh3eb || ${MACHINE_ARCH} == sh3el
 CPPFLAGS+=-DNLIST_ELF32 -DNLIST_COFF
-.elif	${MACHINE_ARCH} == powerpc64 || \
+.elif	${MACHINE_ARCH} == mips64el || \
+	${MACHINE_ARCH} == mips64eb || \
+	${MACHINE_ARCH} == powerpc64 || \
 	${MACHINE_ARCH} == x86_64
 CPPFLAGS+=-DNLIST_ELF32 -DNLIST_ELF64
 .elif	${MACHINE_ARCH} == sparc64

CVS commit: src/usr.bin/elf2ecoff

2009-12-14 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Mon Dec 14 14:11:32 UTC 2009

Modified Files:
src/usr.bin/elf2ecoff: elf2ecoff.c

Log Message:
Adjust size_t format specifiers for mips64e[bl].


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/elf2ecoff/elf2ecoff.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/elf2ecoff/elf2ecoff.c
diff -u src/usr.bin/elf2ecoff/elf2ecoff.c:1.24 src/usr.bin/elf2ecoff/elf2ecoff.c:1.25
--- src/usr.bin/elf2ecoff/elf2ecoff.c:1.24	Mon Dec 14 00:43:05 2009
+++ src/usr.bin/elf2ecoff/elf2ecoff.c	Mon Dec 14 14:11:32 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: elf2ecoff.c,v 1.24 2009/12/14 00:43:05 matt Exp $	*/
+/*	$NetBSD: elf2ecoff.c,v 1.25 2009/12/14 14:11:32 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1997 Jonathan Stone
@@ -255,7 +255,7 @@
 		ph[i].p_type == PT_MIPS_REGINFO) {
 
 			if (debug) {
-fprintf(stderr,   skipping PH %d type %d flags 0x%x\n,
+fprintf(stderr,   skipping PH %zd type %d flags 0x%x\n,
 i, ph[i].p_type, ph[i].p_flags);
 			}
 			continue;
@@ -263,7 +263,7 @@
 		/* Section types we can't handle... */
 		else
 			if (ph[i].p_type != PT_LOAD) {
-fprintf(stderr, Program header %d type %d can't be converted.\n,
+fprintf(stderr, Program header %zd type %d can't be converted.\n,
 i, ph[i].p_type);
 exit(1);
 			}
@@ -278,7 +278,7 @@
 
 			if (debug) {
 fprintf(stderr,
-  combinining PH %d type %d flags 0x%x with data, ndata = %ld, nbss =%ld\n, i, ph[i].p_type, ph[i].p_flags, ndata.len, nbss.len);
+  combinining PH %zd type %d flags 0x%x with data, ndata = %ld, nbss =%ld\n, i, ph[i].p_type, ph[i].p_flags, ndata.len, nbss.len);
 			}
 			combine(data, ndata, 0);
 			combine(bss, nbss, 1);
@@ -290,7 +290,7 @@
 			if (debug) {
 
 fprintf(stderr,
-  combinining PH %d type %d flags 0x%x with text, len = %ld\n,
+  combinining PH %zd type %d flags 0x%x with text, len = %ld\n,
 i, ph[i].p_type, ph[i].p_flags, ntxt.len);
 			}
 			combine(text, ntxt, 0);

CVS commit: src/tools/gdb

2009-12-14 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Dec 14 14:13:17 UTC 2009

Modified Files:
src/tools/gdb: Makefile

Log Message:
disable only parallel make.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tools/gdb/Makefile

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

Modified files:

Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.12 src/tools/gdb/Makefile:1.13
--- src/tools/gdb/Makefile:1.12	Mon Dec 14 03:51:31 2009
+++ src/tools/gdb/Makefile	Mon Dec 14 09:13:16 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2009/12/14 08:51:31 uebayasi Exp $
+#	$NetBSD: Makefile,v 1.13 2009/12/14 14:13:16 christos Exp $
 
 .include bsd.own.mk
 
@@ -11,7 +11,7 @@
 
 MAKE_ARGS=	MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q}
 
-.MAKEFLAGS: -B	# XXX otherwise fails with itable.c / interp.c build
+.NOTPARALLEL:	# XXX otherwise fails with itable.c / interp.c build
 ALL_TARGET=	all-gdb
 INSTALL_TARGET=	install-gdb

CVS commit: src/usr.bin/pmap

2009-12-14 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Mon Dec 14 14:29:09 UTC 2009

Modified Files:
src/usr.bin/pmap: pmap.c

Log Message:
Merge from matt-nb5-mips64; adapt to vaddr_t / vsize_t format specifiers.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/usr.bin/pmap/pmap.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/pmap/pmap.c
diff -u src/usr.bin/pmap/pmap.c:1.43 src/usr.bin/pmap/pmap.c:1.44
--- src/usr.bin/pmap/pmap.c:1.43	Mon Apr 13 00:27:38 2009
+++ src/usr.bin/pmap/pmap.c	Mon Dec 14 14:29:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.43 2009/04/13 00:27:38 lukem Exp $ */
+/*	$NetBSD: pmap.c,v 1.44 2009/12/14 14:29:09 uebayasi Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 #ifndef lint
-__RCSID($NetBSD: pmap.c,v 1.43 2009/04/13 00:27:38 lukem Exp $);
+__RCSID($NetBSD: pmap.c,v 1.44 2009/12/14 14:29:09 uebayasi Exp $);
 #endif
 
 #include string.h
@@ -136,7 +136,7 @@
 		printf(%*slock = struct lock,, indent(2), );
 		printf( header = struct vm_map_entry,);
 		printf( nentries = %d,\n, D(vm_map, vm_map)-nentries);
-		printf(%*ssize = %lx,, indent(2), ,
+		printf(%*ssize = %#PRIxVSIZE,, indent(2), ,
 		   D(vm_map, vm_map)-size);
 		printf( ref_count = %d,, D(vm_map, vm_map)-ref_count);
 		printf(%*shint = %p,, indent(2), ,
@@ -161,11 +161,11 @@
 	if (print_ddb) {
 		const char *name = mapname(P(vm_map));
 
-		printf(%*s%s %p: [0x%lx-0x%lx]\n, indent(2), ,
+		printf(%*s%s %p: [0x%#PRIxVADDR-0x%#PRIxVADDR]\n, indent(2), ,
 		   recurse  2 ? MAP : SUBMAP, P(vm_map),
 		   vm_map_min(D(vm_map, vm_map)),
 		   vm_map_max(D(vm_map, vm_map)));
-		printf(\t%*s#ent=%d, sz=%ld, ref=%d, version=%d, flags=0x%x\n,
+		printf(\t%*s#ent=%d, sz=%PRIdVSIZE, ref=%d, version=%d, flags=0x%x\n,
 		   indent(2), , D(vm_map, vm_map)-nentries,
 		   D(vm_map, vm_map)-size, D(vm_map, vm_map)-ref_count,
 		   D(vm_map, vm_map)-timestamp, D(vm_map, vm_map)-flags);
@@ -284,8 +284,8 @@
 		   P(vm_map_entry));
 		printf( prev = %p,, vme-prev);
 		printf( next = %p,\n, vme-next);
-		printf(%*sstart = %lx,, indent(2), , vme-start);
-		printf( end = %lx,, vme-end);
+		printf(%*sstart = %#PRIxVADDR,, indent(2), , vme-start);
+		printf( end = %#PRIxVADDR,, vme-end);
 		printf( object.uvm_obj/sub_map = %p,\n, vme-object.uvm_obj);
 		printf(%*soffset = % PRIx64 ,, indent(2), ,
 		   vme-offset);
@@ -384,7 +384,7 @@
 	name = findname(kd, vmspace, vm_map_entry, vp, vfs, uvm_obj);
 
 	if (print_map) {
-		printf(%*s0x%lx 0x%lx %c%c%c %c%c%c %s %s %d %d %d,
+		printf(%*s0x%#PRIxVADDR 0x%#PRIxVADDR %c%c%c %c%c%c %s %s %d %d %d,
 		   indent(2), ,
 		   vme-start, vme-end,
 		   (vme-protection  VM_PROT_READ) ? 'r' : '-',
@@ -410,7 +410,7 @@
 	}
 
 	if (print_maps) {
-		printf(%*s%0*lx-%0*lx %c%c%c%c %0* PRIx64  %02llx:%02llx %llu %s\n,
+		printf(%*s%0*PRIxVADDR-%0*PRIxVADDR %c%c%c%c %0* PRIx64  %02llx:%02llx %llu %s\n,
 		   indent(2), ,
 		   (int)sizeof(void *) * 2, vme-start,
 		   (int)sizeof(void *) * 2, vme-end,
@@ -427,7 +427,7 @@
 	}
 
 	if (print_ddb) {
-		printf(%*s - %p: 0x%lx-0x%lx: obj=%p/0x% PRIx64 , amap=%p/%d\n,
+		printf(%*s - %p: 0x%PRIxVADDR-0x%PRIxVADDR: obj=%p/0x% PRIx64 , amap=%p/%d\n,
 		   indent(2), ,
 		   P(vm_map_entry), vme-start, vme-end,
 		   vme-object.uvm_obj, vme-offset,
@@ -480,8 +480,8 @@
 	if (print_all) {
 		sz = (size_t)((vme-end - vme-start) / 1024);
 		printf(A(vp) ?
-		   %*s%0*lx-%0*lx %7luk %0* PRIx64  %c%c%c%c%c (%c%c%c) %d/%d/%d %02llu:%02llu %7llu - %s [%p]\n :
-		   %*s%0*lx-%0*lx %7luk %0* PRIx64  %c%c%c%c%c (%c%c%c) %d/%d/%d %02llu:%02llu %7llu - %s\n,
+		   %*s%0*PRIxVADDR-%0*PRIxVADDR %7luk %0* PRIx64  %c%c%c%c%c (%c%c%c) %d/%d/%d %02llu:%02llu %7llu - %s [%p]\n :
+		   %*s%0*PRIxVADDR-%0*PRIxVADDR %7luk %0* PRIx64  %c%c%c%c%c (%c%c%c) %d/%d/%d %02llu:%02llu %7llu - %s\n,
 		   indent(2), ,
 		   (int)sizeof(void *) * 2,
 		   vme-start,

CVS commit: src/distrib/sets/lists

2009-12-14 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Mon Dec 14 15:27:14 UTC 2009

Modified Files:
src/distrib/sets/lists/comp: ad.arm md.amd64 md.i386 mi
src/distrib/sets/lists/xserver: md.cats

Log Message:
MKDEBUGLIB=yes fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/comp/ad.arm
cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.109 -r1.110 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.1347 -r1.1348 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/xserver/md.cats

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/ad.arm
diff -u src/distrib/sets/lists/comp/ad.arm:1.31 src/distrib/sets/lists/comp/ad.arm:1.32
--- src/distrib/sets/lists/comp/ad.arm:1.31	Fri Oct 31 20:24:52 2008
+++ src/distrib/sets/lists/comp/ad.arm	Mon Dec 14 15:27:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.31 2008/10/31 20:24:52 mrg Exp $
+# $NetBSD: ad.arm,v 1.32 2009/12/14 15:27:13 skrll Exp $
 ./usr/include/armcomp-c-include
 ./usr/include/arm/ansi.h			comp-c-include
 ./usr/include/arm/aout_machdep.h		comp-c-include
@@ -80,6 +80,7 @@
 ./usr/include/ieeefp.hcomp-c-include
 ./usr/include/pmc.hcomp-c-include
 ./usr/lib/libarm.acomp-c-lib
+./usr/lib/libarm_g.a-unknown-		debuglib
 ./usr/lib/libarm32.acomp-obsolete		obsolete
 ./usr/lib/libarm32_p.acomp-obsolete		obsolete
 ./usr/lib/libarm32_pic.a			comp-obsolete		obsolete

Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.57 src/distrib/sets/lists/comp/md.amd64:1.58
--- src/distrib/sets/lists/comp/md.amd64:1.57	Sun Dec 13 09:28:41 2009
+++ src/distrib/sets/lists/comp/md.amd64	Mon Dec 14 15:27:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.57 2009/12/13 09:28:41 mrg Exp $
+# $NetBSD: md.amd64,v 1.58 2009/12/14 15:27:13 skrll Exp $
 ./usr/include/amd64comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
 ./usr/include/amd64/aout_machdep.h		comp-c-include
@@ -446,6 +446,7 @@
 ./usr/lib/i386/libhx509_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/i386/libi386.a			comp-c-lib		compat
 ./usr/lib/i386/libi386.so			comp-sys-shlib		compat,pic
+./usr/lib/i386/libi386_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/libi386_p.a			comp-c-proflib		compat,profile
 ./usr/lib/i386/libi386_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/libiberty.a			comp-c-lib		obsolete

Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.109 src/distrib/sets/lists/comp/md.i386:1.110
--- src/distrib/sets/lists/comp/md.i386:1.109	Tue Aug 25 17:02:42 2009
+++ src/distrib/sets/lists/comp/md.i386	Mon Dec 14 15:27:14 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.109 2009/08/25 17:02:42 njoly Exp $
+# $NetBSD: md.i386,v 1.110 2009/12/14 15:27:14 skrll Exp $
 ./usr/include/emmintrin.h			comp-c-include		gcccmds
 ./usr/include/i386comp-c-include
 ./usr/include/i386/_G_config.h			comp-obsolete		obsolete
@@ -113,9 +113,11 @@
 ./usr/include/xen/xenio3.h			comp-c-include
 ./usr/include/xmmintrin.h			comp-c-include		gcccmds
 ./usr/lib/libi386.acomp-c-lib
+./usr/lib/libi386_g.a-unknown-		debuglib
 ./usr/lib/libi386_p.acomp-c-proflib		profile
 ./usr/lib/libi386_pic.acomp-c-piclib		pic
 ./usr/lib/libm387.acomp-c-lib
+./usr/lib/libm387_g.a-unknown-		debuglib
 ./usr/lib/libm387_p.acomp-c-proflib		profile
 ./usr/lib/libm387_pic.acomp-c-piclib		pic
 ./usr/lib/libpmc.acomp-c-lib

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1347 src/distrib/sets/lists/comp/mi:1.1348
--- src/distrib/sets/lists/comp/mi:1.1347	Mon Dec 14 09:57:37 2009
+++ src/distrib/sets/lists/comp/mi	Mon Dec 14 15:27:14 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1347 2009/12/14 09:57:37 uebayasi Exp $
+#	$NetBSD: mi,v 1.1348 2009/12/14 15:27:14 skrll Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -2406,7 +2406,6 @@
 ./usr/lib/libhx509.acomp-krb5-lib		kerberos
 ./usr/lib/libhx509_g.a-unknown-		debuglib,kerberos
 ./usr/lib/libhx509_p.acomp-krb5-proflib	profile,kerberos
-./usr/lib/libi386_g.a-unknown-		debuglib
 ./usr/lib/libiberty_g.a-unknown-		debuglib
 ./usr/lib/libintl.acomp-c-lib
 ./usr/lib/libintl_g.a-unknown-		debuglib
@@ -2465,7 +2464,6 @@
 ./usr/lib/liblwres_g.a-unknown-		debuglib
 ./usr/lib/liblwres_p.acomp-bind-proflib	profile
 ./usr/lib/libm.acomp-c-lib
-./usr/lib/libm387_g.a-unknown-		debuglib
 ./usr/lib/libm_g.a-unknown-		debuglib
 ./usr/lib/libm_p.acomp-c-proflib		profile
 ./usr/lib/libmagic.acomp-c-lib

Index: src/distrib/sets/lists/xserver/md.cats
diff -u src/distrib/sets/lists/xserver/md.cats:1.36 src/distrib/sets/lists/xserver/md.cats:1.37
--- src/distrib/sets/lists/xserver/md.cats:1.36	Sat Dec  5 16:39:50 2009
+++

CVS commit: src/usr.bin/pmap

2009-12-14 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Mon Dec 14 17:16:13 UTC 2009

Modified Files:
src/usr.bin/pmap: pmap.c

Log Message:
Fix typo in previous.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/usr.bin/pmap/pmap.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/pmap/pmap.c
diff -u src/usr.bin/pmap/pmap.c:1.44 src/usr.bin/pmap/pmap.c:1.45
--- src/usr.bin/pmap/pmap.c:1.44	Mon Dec 14 14:29:09 2009
+++ src/usr.bin/pmap/pmap.c	Mon Dec 14 17:16:12 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.44 2009/12/14 14:29:09 uebayasi Exp $ */
+/*	$NetBSD: pmap.c,v 1.45 2009/12/14 17:16:12 uebayasi Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 #ifndef lint
-__RCSID($NetBSD: pmap.c,v 1.44 2009/12/14 14:29:09 uebayasi Exp $);
+__RCSID($NetBSD: pmap.c,v 1.45 2009/12/14 17:16:12 uebayasi Exp $);
 #endif
 
 #include string.h
@@ -165,7 +165,7 @@
 		   recurse  2 ? MAP : SUBMAP, P(vm_map),
 		   vm_map_min(D(vm_map, vm_map)),
 		   vm_map_max(D(vm_map, vm_map)));
-		printf(\t%*s#ent=%d, sz=%PRIdVSIZE, ref=%d, version=%d, flags=0x%x\n,
+		printf(\t%*s#ent=%d, sz=%PRIxVSIZE, ref=%d, version=%d, flags=0x%x\n,
 		   indent(2), , D(vm_map, vm_map)-nentries,
 		   D(vm_map, vm_map)-size, D(vm_map, vm_map)-ref_count,
 		   D(vm_map, vm_map)-timestamp, D(vm_map, vm_map)-flags);

CVS commit: src/sys/arch/mips/mips

2009-12-14 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Mon Dec 14 18:39:19 UTC 2009

Modified Files:
src/sys/arch/mips/mips: syscall.c

Log Message:
Wrap comment.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/mips/mips/syscall.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/arch/mips/mips/syscall.c
diff -u src/sys/arch/mips/mips/syscall.c:1.39 src/sys/arch/mips/mips/syscall.c:1.40
--- src/sys/arch/mips/mips/syscall.c:1.39	Mon Dec 14 00:46:07 2009
+++ src/sys/arch/mips/mips/syscall.c	Mon Dec 14 18:39:19 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: syscall.c,v 1.39 2009/12/14 00:46:07 matt Exp $	*/
+/*	$NetBSD: syscall.c,v 1.40 2009/12/14 18:39:19 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -107,7 +107,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: syscall.c,v 1.39 2009/12/14 00:46:07 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: syscall.c,v 1.40 2009/12/14 18:39:19 skrll Exp $);
 
 #if defined(_KERNEL_OPT)
 #include opt_sa.h
@@ -240,7 +240,8 @@
 			KASSERT(nargs = __arraycount(copyargs));
 			args = copyargs;
 			/*
-			 * Copy the arguments passed via register from the * trap frame to our argument array
+			 * Copy the arguments passed via register from the
+			 * trap frame to our argument array
 			 */
 			memcpy(copyargs, fargs, nregs * sizeof(register_t));
 			/*

CVS commit: [netbsd-5] src/sys/fs/puffs

2009-12-14 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Mon Dec 14 19:36:57 UTC 2009

Modified Files:
src/sys/fs/puffs [netbsd-5]: puffs_msgif.h

Log Message:
Revert previous version bump which should not have been in the supplied
patch. This maintains compatibility between 5.0 and 5.1 (at the cost of
needing userland libraries recompiled if one's been tracking netbsd-5).


To generate a diff of this commit:
cvs rdiff -u -r1.65.20.1 -r1.65.20.2 src/sys/fs/puffs/puffs_msgif.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/fs/puffs/puffs_msgif.h
diff -u src/sys/fs/puffs/puffs_msgif.h:1.65.20.1 src/sys/fs/puffs/puffs_msgif.h:1.65.20.2
--- src/sys/fs/puffs/puffs_msgif.h:1.65.20.1	Sun Oct 18 12:46:07 2009
+++ src/sys/fs/puffs/puffs_msgif.h	Mon Dec 14 19:36:57 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_msgif.h,v 1.65.20.1 2009/10/18 12:46:07 sborrill Exp $	*/
+/*	$NetBSD: puffs_msgif.h,v 1.65.20.2 2009/12/14 19:36:57 sborrill Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -102,7 +102,7 @@
 #define PUFFS_ERR_MAX PUFFS_ERR_VPTOFH
 
 #define PUFFSDEVELVERS	0x8000
-#define PUFFSVERSION	28
+#define PUFFSVERSION	26
 #define PUFFSNAMESIZE	32
 
 #define PUFFS_TYPEPREFIX puffs|

CVS commit: src/lib/libc/time

2009-12-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Mon Dec 14 20:45:02 UTC 2009

Modified Files:
src/lib/libc/time: strptime.c

Log Message:
Back errant change due to botched merge.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/time/strptime.c

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

Modified files:

Index: src/lib/libc/time/strptime.c
diff -u src/lib/libc/time/strptime.c:1.34 src/lib/libc/time/strptime.c:1.35
--- src/lib/libc/time/strptime.c:1.34	Mon Dec 14 05:51:56 2009
+++ src/lib/libc/time/strptime.c	Mon Dec 14 20:45:02 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: strptime.c,v 1.34 2009/12/14 05:51:56 matt Exp $	*/
+/*	$NetBSD: strptime.c,v 1.35 2009/12/14 20:45:02 matt Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 #if defined(LIBC_SCCS)  !defined(lint)
-__RCSID($NetBSD: strptime.c,v 1.34 2009/12/14 05:51:56 matt Exp $);
+__RCSID($NetBSD: strptime.c,v 1.35 2009/12/14 20:45:02 matt Exp $);
 #endif
 
 #include namespace.h
@@ -267,7 +267,7 @@
 	sse *= 10;
 	sse += *bp++ - '0';
 	rulim /= 10;
-} while (((uint64_t)(sse * 10) = TIME_MAX) 
+} while ((sse * 10 = TIME_MAX) 
 	 rulim  *bp = '0'  *bp = '9');
 
 if (sse  0 || (uint64_t)sse  TIME_MAX) {

CVS commit: src/sys/external/bsd/drm/dist/bsd-core

2009-12-14 Thread Mihai Chelaru

Module Name:src
Committed By:   kefren
Date:   Mon Dec 14 21:01:07 UTC 2009

Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: radeon_drv.c

Log Message:
add suspend/resume hooks for command processor


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.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/external/bsd/drm/dist/bsd-core/radeon_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.5 src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.6
--- src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.5	Sat Dec 12 14:15:25 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c	Mon Dec 14 21:01:07 2009
@@ -134,6 +134,29 @@
 
 #elif   defined(__NetBSD__)
 
+static bool
+radeondrm_suspend(device_t self PMF_FN_ARGS)
+{
+	struct drm_device *rad_dev = device_private(self);
+	drm_radeon_cp_stop_t stop_args;
+
+	stop_args.flush = stop_args.idle = 0;
+	if (radeon_cp_stop(rad_dev, stop_args, rad_dev-lock.file_priv) != 0)
+		return false;
+
+	return true;
+}
+
+static bool
+radeondrm_resume(device_t self PMF_FN_ARGS)
+{
+	struct drm_device *rad_dev = device_private(self);
+	if (radeon_cp_resume(rad_dev, NULL, NULL) != 0)
+		return false;
+	
+	return true;
+}
+
 static int
 radeondrm_probe(device_t parent, cfdata_t match, void *aux)
 {
@@ -152,14 +175,22 @@
 
 	radeon_configure(dev);
 
-	if (!pmf_device_register(self, NULL, NULL))
+	if (!pmf_device_register(self, radeondrm_suspend, radeondrm_resume))
 		aprint_error_dev(self, couldn't establish power handler\n);
 
 	drm_attach(self, pa, radeon_pciidlist);
 }
 
+static int
+radeondrm_detach(device_t self, int flags)
+{
+	pmf_device_deregister(self);
+
+	return drm_detach(self, flags);
+}
+
 CFATTACH_DECL_NEW(radeondrm, sizeof(struct drm_device),
-radeondrm_probe, radeondrm_attach, drm_detach, NULL);
+radeondrm_probe, radeondrm_attach, radeondrm_detach, NULL);
 
 #ifdef _MODULE

CVS commit: src/sys/rump/librump/rumpkern

2009-12-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Mon Dec 14 21:19:23 UTC 2009

Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Added Files:
src/sys/rump/librump/rumpkern/arch/mips: Makefile.inc

Log Message:
Make librump play with mips nicely.  Define ARCH_ELFSIZE for mips to be 32.
This works for N64 kernels because objcopy them to be 32bit to the bootloaders
can handle them.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/arch/mips/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/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.67 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.68
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.67	Sun Dec 13 08:25:20 2009
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern	Mon Dec 14 21:19:23 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.rumpkern,v 1.67 2009/12/13 08:25:20 mrg Exp $
+#	$NetBSD: Makefile.rumpkern,v 1.68 2009/12/14 21:19:23 matt Exp $
 #
 
 .include ${RUMPTOP}/Makefile.rump
@@ -90,6 +90,8 @@
 .ifdef MLIBDIR
 ARCHDIR=	${RUMPTOP}/librump/rumpkern/arch/${MLIBDIR}
 LIBKERN_ARCH=	${MLIBDIR}
+.elif exists(${RUMPTOP}/librump/rumpkern/arch/${MACHINE_CPU})
+ARCHDIR=	${RUMPTOP}/librump/rumpkern/arch/${MACHINE_CPU}
 .else
 ARCHDIR=	${RUMPTOP}/librump/rumpkern/arch/${MACHINE_ARCH}
 .endif

Added files:

Index: src/sys/rump/librump/rumpkern/arch/mips/Makefile.inc
diff -u /dev/null src/sys/rump/librump/rumpkern/arch/mips/Makefile.inc:1.1
--- /dev/null	Mon Dec 14 21:19:23 2009
+++ src/sys/rump/librump/rumpkern/arch/mips/Makefile.inc	Mon Dec 14 21:19:23 2009
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile.inc,v 1.1 2009/12/14 21:19:23 matt Exp $
+
+CPPFLAGS+=	-DARCH_ELFSIZE=32
+SRCS+=  	kobj_stubs.c rumpcpu_generic.c
+

CVS commit: src/sys/uvm

2009-12-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Mon Dec 14 21:19:47 UTC 2009

Modified Files:
src/sys/uvm: uvm_map.c

Log Message:
Use PRIxVADDR ...


To generate a diff of this commit:
cvs rdiff -u -r1.284 -r1.285 src/sys/uvm/uvm_map.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/uvm/uvm_map.c
diff -u src/sys/uvm/uvm_map.c:1.284 src/sys/uvm/uvm_map.c:1.285
--- src/sys/uvm/uvm_map.c:1.284	Sat Nov  7 07:27:49 2009
+++ src/sys/uvm/uvm_map.c	Mon Dec 14 21:19:47 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_map.c,v 1.284 2009/11/07 07:27:49 cegger Exp $	*/
+/*	$NetBSD: uvm_map.c,v 1.285 2009/12/14 21:19:47 matt Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_map.c,v 1.284 2009/11/07 07:27:49 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_map.c,v 1.285 2009/12/14 21:19:47 matt Exp $);
 
 #include opt_ddb.h
 #include opt_uvmhist.h
@@ -572,7 +572,7 @@
 			goto error;
 		}
 		if (trtmp != NULL  trtmp-start = tmp-start) {
-			printf(corrupt: 0x%lx = 0x%lx\n,
+			printf(corrupt: 0x%PRIxVADDRx = 0x%PRIxVADDRx\n,
 			trtmp-start, tmp-start);
 			goto error;
 		}

CVS commit: src/crypto/external/bsd/netpgp

2009-12-14 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Mon Dec 14 23:29:57 UTC 2009

Modified Files:
src/crypto/external/bsd/netpgp: mkdist
src/crypto/external/bsd/netpgp/dist: TODO configure configure.ac tst
src/crypto/external/bsd/netpgp/dist/bindings/perl: netpgp.pl
src/crypto/external/bsd/netpgp/dist/include: netpgp.h
src/crypto/external/bsd/netpgp/dist/src/lib: Makefile.am Makefile.in
bufgap.c keyring.c libnetpgp.3 misc.c netpgp.c netpgpsdk.h
packet-print.c ssh2pgp.c
src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile netpgp.c
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.c
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/lib: config.h

Log Message:
Prepare for a new netpgp-20091210 portable release.

Apart from infrastructure changes, there are the following functional ones:

+ Update to version 20091210

+ provide a new netpgp_match_list_keys(3) function to perform a
regular-expression based search of all the keys in the keyring.  If no
pattern is specified to match, then all keys are returned.

+ provide a new netpgp_set_homedir(3) function, and use it to set the
home directory from the library, rather than individually in all the
programs which use the library

+ provide a new netpgp_incvar(3) function which will add a constant
increment (which may be negative) to the value of an internal
variable.  This is primarily used for the verbosity level within the
library, and is again a movement of the function into the library from
the individual programs which use the library

+ move to the specification of an ssh key file by internal variable,
rather than the directory holding an ssh key file

+ autoconf infrastructure changes

+ take a hammer to the _GNU_SOURCE definitions problems

+ don't rely on strnlen(3) being present everywhere


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/crypto/external/bsd/netpgp/mkdist
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/netpgp/dist/TODO
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/netpgp/dist/configure
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/netpgp/dist/configure.ac
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/netpgp/dist/tst
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/netpgp/dist/include/netpgp.h
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/src/lib/bufgap.c
cvs rdiff -u -r1.25 -r1.26 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c \
src/crypto/external/bsd/netpgp/dist/src/lib/misc.c
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
cvs rdiff -u -r1.32 -r1.33 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgpsdk.h
cvs rdiff -u -r1.22 -r1.23 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/netpgp/lib/config.h

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

Modified files:

Index: src/crypto/external/bsd/netpgp/mkdist
diff -u src/crypto/external/bsd/netpgp/mkdist:1.1.1.1 src/crypto/external/bsd/netpgp/mkdist:1.2
--- src/crypto/external/bsd/netpgp/mkdist:1.1.1.1	Thu Apr 23 06:31:55 2009
+++ src/crypto/external/bsd/netpgp/mkdist	Mon Dec 14 23:29:56 2009
@@ -1,6 +1,13 @@
 #! /bin/sh
 
-t=$(date +%Y%m%d)
+case $# in
+0)
+	t=$(date +%Y%m%d)
+	;;
+*)
+	t=$1
+	;;
+esac
 ac=ac.$$
 awk -F, -v t=$t '/AC_INIT/ { printf(%s,[%s],%s\n, $1, t, $3); next} { print }' dist/configure.ac  $ac  mv $ac dist/configure.ac
 (cd dist  autoconf  autoheader)

Index: src/crypto/external/bsd/netpgp/dist/TODO
diff -u src/crypto/external/bsd/netpgp/dist/TODO:1.26 src/crypto/external/bsd/netpgp/dist/TODO:1.27
--- src/crypto/external/bsd/netpgp/dist/TODO:1.26	Sat Dec  5 07:21:07 2009
+++ src/crypto/external/bsd/netpgp/dist/TODO	Mon Dec 14 23:29:56 2009
@@ -10,10 +10,11 @@
 separate from libcrypto?
 64-bit offsets
 thresholds
+Multiple recipients for encryption - 
 default compression when signing?
 elgamal enc/decryption?
-Multiple recipients for encryption
 convert tests from ./tst to

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

2009-12-14 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Mon Dec 14 23:35:06 UTC 2009

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: version.h

Log Message:
Bump the netpgp base version to 1.99.14 for the release changes.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/external/bsd/netpgp/dist/src/lib/version.h

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

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/version.h
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.20 src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.21
--- src/crypto/external/bsd/netpgp/dist/src/lib/version.h:1.20	Sat Jun 13 05:25:09 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/version.h	Mon Dec 14 23:35:06 2009
@@ -58,7 +58,7 @@
 #endif
 
 /* development versions have .99 suffix */
-#define NETPGP_BASE_VERSION	1.99.13
+#define NETPGP_BASE_VERSION	1.99.14
 
 #define NETPGP_VERSION_CAT(a, b)	NetPGP portable  a /[ b ]
 #define NETPGP_VERSION_STRING \

CVS commit: src/sys/arch/hppa/hppa

2009-12-14 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Mon Dec 14 23:36:52 UTC 2009

Modified Files:
src/sys/arch/hppa/hppa: trap.S

Log Message:
Remove redundant line.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/hppa/hppa/trap.S

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/hppa/hppa/trap.S
diff -u src/sys/arch/hppa/hppa/trap.S:1.33 src/sys/arch/hppa/hppa/trap.S:1.34
--- src/sys/arch/hppa/hppa/trap.S:1.33	Sat Dec 12 15:25:32 2009
+++ src/sys/arch/hppa/hppa/trap.S	Mon Dec 14 23:36:52 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.S,v 1.33 2009/12/12 15:25:32 skrll Exp $	*/
+/*	$NetBSD: trap.S,v 1.34 2009/12/14 23:36:52 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -2302,7 +2302,6 @@
 EXIT(TLABEL(all))
 
 	.align	32
-	.export	TLABEL(ibrk), entry
 ENTRY_NOPROFILE(TLABEL(ibrk),0)
 	/* If called by a user process then always pass it to trap() */
 	mfctl	%pcoq, %r8

CVS commit: src/sys/arch/xen/xen

2009-12-14 Thread Adam Hamsik

Module Name:src
Committed By:   haad
Date:   Tue Dec 15 00:19:52 UTC 2009

Modified Files:
src/sys/arch/xen/xen: xbdback_xenbus.c

Log Message:
Fix problem with using wedge like devicesi(LVM Logical Volumes, ZFS Zvols)
as xkbd backend. This problem was reported by Hugo Silva on port-xen.

Now we call DIOCGWEDGEINFO for all partitions, when it is not implemented
we use DIOCGPART to get information about volume size.

Fix oked by j...@.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/xen/xen/xbdback_xenbus.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/arch/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.28 src/sys/arch/xen/xen/xbdback_xenbus.c:1.29
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.28	Sun Oct 25 13:47:43 2009
+++ src/sys/arch/xen/xen/xbdback_xenbus.c	Tue Dec 15 00:19:52 2009
@@ -1,4 +1,4 @@
-/*  $NetBSD: xbdback_xenbus.c,v 1.28 2009/10/25 13:47:43 bouyer Exp $  */
+/*  $NetBSD: xbdback_xenbus.c,v 1.29 2009/12/15 00:19:52 haad Exp $  */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xbdback_xenbus.c,v 1.28 2009/10/25 13:47:43 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: xbdback_xenbus.c,v 1.29 2009/12/15 00:19:52 haad Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -721,24 +721,26 @@
 		return;
 	}
 	VOP_UNLOCK(xbdi-xbdi_vp, 0);
-	if (strcmp(devname, dk) == 0) {
-		/* dk device; get wedge data */
-		struct dkwedge_info wi;
-		err = VOP_IOCTL(xbdi-xbdi_vp, DIOCGWEDGEINFO, wi,
-		FREAD, NOCRED);
-		if (err) {
-			printf(xbdback %s: can't DIOCGWEDGEINFO device 
-			0x%PRIx64: %d\n, xbusd-xbusd_path,
-			xbdi-xbdi_dev, err);
-			xbdi-xbdi_size = xbdi-xbdi_dev = 0;
-			vn_close(xbdi-xbdi_vp, FREAD, NOCRED);
-			xbdi-xbdi_vp = NULL;
-			return;
-		}
+
+	/* dk device; get wedge data */
+	struct dkwedge_info wi;
+	if ((err = VOP_IOCTL(xbdi-xbdi_vp, DIOCGWEDGEINFO, wi,
+		FREAD, NOCRED)) == 0) {
 		xbdi-xbdi_size = wi.dkw_size;
 		printf(xbd backend: attach device %s (size % PRIu64 ) 
 		for domain %d\n, wi.dkw_devname, xbdi-xbdi_size,
 		xbdi-xbdi_domid);
+	}
+	/* ENOTTY should be returned only when device doesn't implement
+	   DIOCGWEDGEINFO and we are working with non wedge like device. */
+	if (err != ENOTTY) {
+		printf(xbdback %s: can't DIOCGWEDGEINFO device 
+		0x%PRIx64: %d\n, xbusd-xbusd_path,
+		xbdi-xbdi_dev, err);		
+		xbdi-xbdi_size = xbdi-xbdi_dev = 0;
+		vn_close(xbdi-xbdi_vp, FREAD, NOCRED);
+		xbdi-xbdi_vp = NULL;
+		return;
 	} else {
 		/* disk device, get partition data */
 		struct partinfo dpart;

CVS commit: src/lib/libc/locale

2009-12-14 Thread enami tsugutomo

Module Name:src
Committed By:   enami
Date:   Tue Dec 15 00:35:36 UTC 2009

Modified Files:
src/lib/libc/locale: nl_langinfo.3

Log Message:
Put space after comma in the C code example.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/locale/nl_langinfo.3

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

Modified files:

Index: src/lib/libc/locale/nl_langinfo.3
diff -u src/lib/libc/locale/nl_langinfo.3:1.17 src/lib/libc/locale/nl_langinfo.3:1.18
--- src/lib/libc/locale/nl_langinfo.3:1.17	Thu Mar 12 12:50:31 2009
+++ src/lib/libc/locale/nl_langinfo.3	Tue Dec 15 00:35:36 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: nl_langinfo.3,v 1.17 2009/03/12 12:50:31 joerg Exp $
+.\	$NetBSD: nl_langinfo.3,v 1.18 2009/12/15 00:35:36 enami Exp $
 .\
 .\ Written by J.T. Conklin j...@netbsd.org.
 .\ Public domain.
@@ -113,7 +113,7 @@
 	(void)setlocale(LC_ALL, );
 	ptr = nl_langinfo(D_T_FMT);
 	strftime(datestring, sizeof(datestring), ptr, tm);
-	printf(%s\en,datestring);
+	printf(%s\en, datestring);
 	return (0);
 }
 .Ed

CVS commit: src/distrib/sets/lists

2009-12-14 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Dec 15 03:01:16 UTC 2009

Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/etc: mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/misc: mi
src/distrib/sets/lists/tests: mi module.mi

Log Message:
fix a bunch of issues with MKATF=no.


To generate a diff of this commit:
cvs rdiff -u -r1.849 -r1.850 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1348 -r1.1349 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.213 -r1.214 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.1177 -r1.1178 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.162 -r1.163 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.56 -r1.57 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/tests/module.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/base/mi
diff -u src/distrib/sets/lists/base/mi:1.849 src/distrib/sets/lists/base/mi:1.850
--- src/distrib/sets/lists/base/mi:1.849	Mon Dec 14 02:01:53 2009
+++ src/distrib/sets/lists/base/mi	Tue Dec 15 03:01:15 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.849 2009/12/14 02:01:53 matt Exp $
+# $NetBSD: mi,v 1.850 2009/12/15 03:01:15 mrg Exp $
 #
 # Note:	Don't delete entries from here - mark them as obsolete instead,
 #	unless otherwise stated below.
@@ -1347,10 +1347,10 @@
 ./usr/share	base-sys-share
 ./usr/share/atf	base-atf-share		
 ./usr/share/atf/atf-run.hooks			base-atf-bin		share,atf
-./usr/share/atf/atf.config.subr			base-atf-share		share,obsolete
-./usr/share/atf/atf.footer.subr			base-atf-share		share
-./usr/share/atf/atf.header.subr			base-atf-share		share
-./usr/share/atf/atf.init.subr			base-atf-share		share
+./usr/share/atf/atf.config.subr			base-atf-share		share,obsolete,atf
+./usr/share/atf/atf.footer.subr			base-atf-share		share,atf
+./usr/share/atf/atf.header.subr			base-atf-share		share,atf
+./usr/share/atf/atf.init.subr			base-atf-share		share,atf
 ./usr/share/calendarbase-calendar-share
 ./usr/share/calendar/calendar.birthday		base-calendar-share	share
 ./usr/share/calendar/calendar.christian		base-calendar-share	share

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1348 src/distrib/sets/lists/comp/mi:1.1349
--- src/distrib/sets/lists/comp/mi:1.1348	Mon Dec 14 15:27:14 2009
+++ src/distrib/sets/lists/comp/mi	Tue Dec 15 03:01:15 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1348 2009/12/14 15:27:14 skrll Exp $
+#	$NetBSD: mi,v 1.1349 2009/12/15 03:01:15 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -4829,9 +4829,9 @@
 ./usr/share/man/cat3/atanh.0			comp-c-catman		.cat
 ./usr/share/man/cat3/atanhf.0			comp-c-catman		.cat
 ./usr/share/man/cat3/atexit.0			comp-c-catman		.cat
-./usr/share/man/cat3/atf-c++-api.0		comp-atf-catman		.cat
-./usr/share/man/cat3/atf-c-api.0		comp-atf-catman		.cat
-./usr/share/man/cat3/atf-sh-api.0		comp-atf-catman		.cat
+./usr/share/man/cat3/atf-c++-api.0		comp-atf-catman		.cat,atf
+./usr/share/man/cat3/atf-c-api.0		comp-atf-catman		.cat,atf
+./usr/share/man/cat3/atf-sh-api.0		comp-atf-catman		.cat,atf
 ./usr/share/man/cat3/atof.0			comp-c-catman		.cat
 ./usr/share/man/cat3/atoi.0			comp-c-catman		.cat
 ./usr/share/man/cat3/atol.0			comp-c-catman		.cat
@@ -10439,9 +10439,9 @@
 ./usr/share/man/html3/atanh.html		comp-c-htmlman		html
 ./usr/share/man/html3/atanhf.html		comp-c-htmlman		html
 ./usr/share/man/html3/atexit.html		comp-c-htmlman		html
-./usr/share/man/html3/atf-c++-api.html		comp-atf-htmlman	html
-./usr/share/man/html3/atf-c-api.html		comp-atf-htmlman	html
-./usr/share/man/html3/atf-sh-api.html		comp-atf-htmlman	html
+./usr/share/man/html3/atf-c++-api.html		comp-atf-htmlman	html,atf
+./usr/share/man/html3/atf-c-api.html		comp-atf-htmlman	html,atf
+./usr/share/man/html3/atf-sh-api.html		comp-atf-htmlman	html,atf
 ./usr/share/man/html3/atof.html			comp-c-htmlman		html
 ./usr/share/man/html3/atoi.html			comp-c-htmlman		html
 ./usr/share/man/html3/atol.html			comp-c-htmlman		html
@@ -15849,9 +15849,9 @@
 ./usr/share/man/man3/atanh.3			comp-c-man		.man
 ./usr/share/man/man3/atanhf.3			comp-c-man		.man
 ./usr/share/man/man3/atexit.3			comp-c-man		.man
-./usr/share/man/man3/atf-c++-api.3		comp-atf-man		.man
-./usr/share/man/man3/atf-c-api.3		comp-atf-man		.man
-./usr/share/man/man3/atf-sh-api.3		comp-atf-man		.man
+./usr/share/man/man3/atf-c++-api.3		comp-atf-man		.man,atf
+./usr/share/man/man3/atf-c-api.3		comp-atf-man		.man,atf
+./usr/share/man/man3/atf-sh-api.3		comp-atf-man		.man,atf
 ./usr/share/man/man3/atof.3			comp-c-man		.man
 ./usr/share/man/man3/atoi.3			comp-c-man		.man
 ./usr/share/man/man3/atol.3			comp-c-man		.man

Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.213 src/distrib/sets/lists/etc/mi:1.214
---

CVS commit: src/tests

2009-12-14 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Dec 15 03:01:48 UTC 2009

Modified Files:
src/tests: Makefile

Log Message:
avoid most of the SUBDIRs if MKATF == no.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/tests/Makefile

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

Modified files:

Index: src/tests/Makefile
diff -u src/tests/Makefile:1.18 src/tests/Makefile:1.19
--- src/tests/Makefile:1.18	Thu Nov  5 17:34:25 2009
+++ src/tests/Makefile	Tue Dec 15 03:01:48 2009
@@ -1,11 +1,16 @@
-# $NetBSD: Makefile,v 1.18 2009/11/05 17:34:25 dyoung Exp $
+# $NetBSD: Makefile,v 1.19 2009/12/15 03:01:48 mrg Exp $
 
 .include bsd.own.mk
 
-SUBDIR=	crypto fs games ipf kernel lib libexec net rump syscall util
+SUBDIR=	crypto games ipf util
+  
+.if ${MKATF} != no
+SUBDIR+= fs net kernel lib libexec rump syscall 
 
-.if ${MACHINE} != evbppc  ${MKKMOD} != no
+. if ${MACHINE} != evbppc  ${MKKMOD} != no
 SUBDIR+= modules
+. endif
+
 .endif
 
 TESTSDIR=	${TESTSBASE}

CVS commit: src/sys

2009-12-14 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Tue Dec 15 03:02:25 UTC 2009

Modified Files:
src/sys/kern: subr_autoconf.c
src/sys/sys: device.h

Log Message:
Per rmind@'s suggestion, avoid an acquire/release-mutex dance by
collecting garbage in two phases:  in the first stage, with
alldevs_mtx held, gather all of the objects to be freed onto a
list.  Drop alldevs_mtx, and in the second stage, free all the
collected objects.

Also per rmind@'s suggestion, remove KASSERT(!mutex_owned(alldevs_mtx))
throughout, it is not useful.

Find a free unit number and allocate it for a new device_t atomically.
Before, two threads would sometimes find the same free unit number
and race to allocate it.  The loser panicked.  Now there is no
race.

In support of the changes above, extract some new subroutines that
are private to this module: config_unit_nextfree(), config_unit_alloc(),
config_devfree(), config_dump_garbage().

Delete all of the #ifdef __BROKEN_CONFIG_UNIT_USAGE code.  Only
the sun3 port still depends on __BROKEN_CONFIG_UNIT_USAGE, it's
not hard for the port to do without, and port-sun3@ had fair warning
that it was going away (1 week, or a few years' warning, depending
how far back you look!).


To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.127 -r1.128 src/sys/sys/device.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/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.189 src/sys/kern/subr_autoconf.c:1.190
--- src/sys/kern/subr_autoconf.c:1.189	Sun Nov 29 15:17:30 2009
+++ src/sys/kern/subr_autoconf.c	Tue Dec 15 03:02:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.189 2009/11/29 15:17:30 pooka Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.190 2009/12/15 03:02:24 dyoung Exp $ */
 
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.189 2009/11/29 15:17:30 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.190 2009/12/15 03:02:24 dyoung Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_ddb.h
@@ -166,12 +166,14 @@
 static void mapply(struct matchinfo *, cfdata_t);
 static device_t config_devalloc(const device_t, const cfdata_t, const int *);
 static void config_devdelete(device_t);
+static void config_devunlink(device_t, struct devicelist *);
 static void config_makeroom(int, struct cfdriver *);
 static void config_devlink(device_t);
 static void config_alldevs_unlock(int);
 static int config_alldevs_lock(void);
 
-static void config_collect_garbage(void);
+static void config_collect_garbage(struct devicelist *);
+static void config_dump_garbage(struct devicelist *);
 
 static void pmflock_debug(device_t, const char *, int);
 
@@ -368,10 +370,11 @@
 int
 config_cfdriver_detach(struct cfdriver *cd)
 {
+	struct devicelist garbage = TAILQ_HEAD_INITIALIZER(garbage);
 	int i, rc = 0, s;
 
 	s = config_alldevs_lock();
-	config_collect_garbage();
+	config_collect_garbage(garbage);
 	/* Make sure there are no active instances. */
 	for (i = 0; i  cd-cd_ndevs; i++) {
 		if (cd-cd_devs[i] != NULL) {
@@ -380,6 +383,7 @@
 		}
 	}
 	config_alldevs_unlock(s);
+	config_dump_garbage(garbage);
 
 	if (rc != 0)
 		return rc;
@@ -441,6 +445,7 @@
 int
 config_cfattach_detach(const char *driver, struct cfattach *ca)
 {
+	struct devicelist garbage = TAILQ_HEAD_INITIALIZER(garbage);
 	struct cfdriver *cd;
 	device_t dev;
 	int i, rc = 0, s;
@@ -450,7 +455,7 @@
 		return ESRCH;
 
 	s = config_alldevs_lock();
-	config_collect_garbage();
+	config_collect_garbage(garbage);
 	/* Make sure there are no active instances. */
 	for (i = 0; i  cd-cd_ndevs; i++) {
 		if ((dev = cd-cd_devs[i]) == NULL)
@@ -461,6 +466,7 @@
 		}
 	}
 	config_alldevs_unlock(s);
+	config_dump_garbage(garbage);
 
 	if (rc != 0)
 		return rc;
@@ -951,105 +957,123 @@
 config_makeroom(int n, struct cfdriver *cd)
 {
 	int old, new;
-	device_t *nsp;
+	device_t *osp, *nsp;
 
 	alldevs_nwrite++;
-	mutex_exit(alldevs_mtx);
 
-	if (n  cd-cd_ndevs)
-		goto out;
+	for (new = MAX(4, cd-cd_ndevs); new = n; new += new)
+		;
 
-	/*
-	 * Need to expand the array.
-	 */
-	old = cd-cd_ndevs;
-	if (old == 0)
-		new = 4;
-	else
-		new = old * 2;
-	while (new = n)
-		new *= 2;
-	nsp = kmem_alloc(sizeof(device_t [new]), KM_SLEEP);
-	if (nsp == NULL)
-		panic(config_attach: %sing dev array,
-		old != 0 ? expand : creat);
-	memset(nsp + old, 0, sizeof(device_t [new - old]));
-	if (old != 0) {
-		memcpy(nsp, cd-cd_devs, sizeof(device_t [old]));
-		kmem_free(cd-cd_devs, sizeof(device_t [old]));
+	while (n = cd-cd_ndevs) {
+		/*
+		 * Need to expand the array.
+		 */
+		old = cd-cd_ndevs;
+		osp = cd-cd_devs;
+
+		/* Release alldevs_mtx around allocation, which may
+		 * sleep.
+		 */
+		mutex_exit(alldevs_mtx);
+		nsp = kmem_alloc(sizeof(device_t[new]), KM_SLEEP);
+		if (nsp ==

CVS commit: src/share/misc

2009-12-14 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Dec 15 03:38:58 UTC 2009

Modified Files:
src/share/misc: Makefile
Added Files:
src/share/misc: make.country

Log Message:
Add a script to update the countries ISO/FIPS list.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/share/misc/Makefile
cvs rdiff -u -r0 -r1.1 src/share/misc/make.country

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

Modified files:

Index: src/share/misc/Makefile
diff -u src/share/misc/Makefile:1.33 src/share/misc/Makefile:1.34
--- src/share/misc/Makefile:1.33	Sat Oct 25 18:27:36 2008
+++ src/share/misc/Makefile	Mon Dec 14 22:38:58 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.33 2008/10/25 22:27:36 apb Exp $
+#	$NetBSD: Makefile,v 1.34 2009/12/15 03:38:58 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
 NOOBJ=	# defined
@@ -27,4 +27,7 @@
 update-na.phone:
 	 /dev/null ${TOOL_AWK} -f nanpa.awk  na.phone
 
+update-country:
+	${.CURDIR}/make.country  country
+
 .include bsd.prog.mk

Added files:

Index: src/share/misc/make.country
diff -u /dev/null src/share/misc/make.country:1.1
--- /dev/null	Mon Dec 14 22:38:58 2009
+++ src/share/misc/make.country	Mon Dec 14 22:38:58 2009
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+hdr() {
+echo '#' '$'NetBSD'$'
+cat  _EOF
+#
+# ISO 3166-1 Country Codes
+#
+# The format of an entry is:
+# NameTABAlpha-2-codeTABAlpha-3-codeTABNumeric-3-codeTABFIPS
+#
+# Further information can be found at the ISO 3166 Maintenance Agency
+# (ISO 3166/MA) web site,
+# http://www.iso.org/iso/en/prods-services/iso3166ma/index.html.
+#
+# FIPS 10-4 codes compiled from several sources, including
+# http://www.statoids.com/wab.html
+#
+# ISO 3166-1 entities without exactly one corresponding FIPS code have a
+# blank entry in the column. FIPS 10-4 codes without a corresponding
+# ISO 3166-1 entity are excluded.
+#
+# This list is up-to-date as of $(date +%Y-%m-%d)
+#
+_EOF
+}
+
+I1=http://www.statoids.com/wab.html
+O1=/tmp/wab.$$
+I2=http://www.iso.org/iso/list-en1-semic-3.txt
+O2=/tmp/list.$$
+trap rm -f wab.html list-en1-semic-3.txt $O1 $O2 0 1 2 3 15
+ftp $I1
+ftp $I2
+
+grep 'tr class=[oe]' wab.html |
+sed -e 's,tr class=.td,,g' \
+-e 's,\nbsp;,,g' \
+-e 's,code,,g' \
+-e 's,/code,,g' \
+-e 's,br, ,g' \
+-e 's,/tdtd,	,g' \
+-e 's,Å,Aa,g' \
+-e 's,ô,o,g' \
+-e 's,/td/tr,,g' |
+awk -F'\t' '{ printf(%s\t%s\t%s\t%s\t%s\n, $2, $3, $4, $6, $1); }' |
+grep -v href= |
+sort  $O1
+
+grep ';[A-Z][A-Z]' list-en1-semic-3.txt |
+tr -d '\015' |
+awk -F ';' '{ print $2 }' |
+sort  $O2
+
+hdr
+join -t '	' -o 1.5,1.1,1.2,1.3,1.4 -1 1 -2 1 $O1 $O2 | sort

CVS commit: src/share/misc

2009-12-14 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Dec 15 03:39:19 UTC 2009

Modified Files:
src/share/misc: country

Log Message:
commit the auto-generated file


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/share/misc/country

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

Modified files:

Index: src/share/misc/country
diff -u src/share/misc/country:1.14 src/share/misc/country:1.15
--- src/share/misc/country:1.14	Wed Oct 20 10:07:22 2004
+++ src/share/misc/country	Mon Dec 14 22:39:19 2009
@@ -1,4 +1,4 @@
-# $NetBSD: country,v 1.14 2004/10/20 14:07:22 tsarna Exp $
+# $NetBSD: country,v 1.15 2009/12/15 03:39:19 christos Exp $
 #
 # ISO 3166-1 Country Codes
 #
@@ -16,10 +16,10 @@
 # blank entry in the column. FIPS 10-4 codes without a corresponding
 # ISO 3166-1 entity are excluded.
 #
-# This list is up-to-date as of 2004-10-20.
+# This list is up-to-date as of 2009-12-14
 #
+Aaland	AX	ALA	248	
 Afghanistan	AF	AFG	004	AF
-Aaland Islands	AX	ALA	248	
 Albania	AL	ALB	008	AL
 Algeria	DZ	DZA	012	AG
 American Samoa	AS	ASM	016	AQ
@@ -67,8 +67,8 @@
 Cocos (Keeling) Islands	CC	CCK	166	CK
 Colombia	CO	COL	170	CO
 Comoros	KM	COM	174	CN
-Congo	CG	COG	178	CF
-Congo, The Democratic Republic of the	CD	COD	180	CG
+Congo (Brazzaville)	CG	COG	178	CF
+Congo (Kinshasa)	CD	COD	180	CG
 Cook Islands	CK	COK	184	CW
 Costa Rica	CR	CRI	188	CS
 Cote d'Ivoire	CI	CIV	384	IV
@@ -87,14 +87,14 @@
 Eritrea	ER	ERI	232	ER
 Estonia	EE	EST	233	EN
 Ethiopia	ET	ETH	231	ET
-Falkland Islands (Malvinas)	FK	FLK	238	FA
+Falkland Islands	FK	FLK	238	FK
 Faroe Islands	FO	FRO	234	FO
 Fiji	FJ	FJI	242	FJ
 Finland	FI	FIN	246	FI
 France	FR	FRA	250	FR
 French Guiana	GF	GUF	254	FG
 French Polynesia	PF	PYF	258	FP
-French Southern Territories	TF	ATF	260	FS
+French Southern Lands	TF	ATF	260	FS
 Gabon	GA	GAB	266	GB
 Gambia	GM	GMB	270	GA
 Georgia	GE	GEO	268	GG
@@ -107,44 +107,46 @@
 Guadeloupe	GP	GLP	312	GP
 Guam	GU	GUM	316	GQ
 Guatemala	GT	GTM	320	GT
+Guernsey	GG	GGY	831	GK
 Guinea	GN	GIN	324	GV
 Guinea-Bissau	GW	GNB	624	PU
 Guyana	GY	GUY	328	GY
 Haiti	HT	HTI	332	HA
-Heard Island and McDonald Islands	HM	HMD	334	HM
-Holy See (Vatican City State)	VA	VAT	336	VT
+Heard and McDonald Islands	HM	HMD	334	HM
 Honduras	HN	HND	340	HO
 Hong Kong	HK	HKG	344	HK
 Hungary	HU	HUN	348	HU
 Iceland	IS	ISL	352	IC
 India	IN	IND	356	IN
 Indonesia	ID	IDN	360	ID
-Iran, Islamic Republic of	IR	IRN	364	IR
+Iran	IR	IRN	364	IR
 Iraq	IQ	IRQ	368	IZ
 Ireland	IE	IRL	372	EI
+Isle of Man	IM	IMN	833	IM
 Israel	IL	ISR	376	IS
 Italy	IT	ITA	380	IT
 Jamaica	JM	JAM	388	JM
 Japan	JP	JPN	392	JA
+Jersey	JE	JEY	832	JE
 Jordan	JO	JOR	400	JO
 Kazakhstan	KZ	KAZ	398	KZ
 Kenya	KE	KEN	404	KE
 Kiribati	KI	KIR	296	KR
-Korea, Democratic People's Republic of	KP	PRK	408	KN
-Korea, Republic of	KR	KOR	410	KS
+Korea, North	KP	PRK	408	KN
+Korea, South	KR	KOR	410	KS
 Kuwait	KW	KWT	414	KU
 Kyrgyzstan	KG	KGZ	417	KG
-Lao People's Democratic Republic	LA	LAO	418	LA
+Laos	LA	LAO	418	LA
 Latvia	LV	LVA	428	LG
 Lebanon	LB	LBN	422	LE
 Lesotho	LS	LSO	426	LT
 Liberia	LR	LBR	430	LI
-Libyan Arab Jamahiriya	LY	LBY	434	LY
+Libya	LY	LBY	434	LY
 Liechtenstein	LI	LIE	438	LS
 Lithuania	LT	LTU	440	LH
 Luxembourg	LU	LUX	442	LU
-Macao	MO	MAC	446	MC
-Macedonia, the Former Yugoslav Republic of	MK	MKD	807	MK
+Macau	MO	MAC	446	MC
+Macedonia	MK	MKD	807	MK
 Madagascar	MG	MDG	450	MA
 Malawi	MW	MWI	454	MI
 Malaysia	MY	MYS	458	MY
@@ -157,10 +159,11 @@
 Mauritius	MU	MUS	480	MP
 Mayotte	YT	MYT	175	MF
 Mexico	MX	MEX	484	MX
-Micronesia, Federated States of	FM	FSM	583	FM
-Moldova, Republic of	MD	MDA	498	MD
+Micronesia	FM	FSM	583	FM
+Moldova	MD	MDA	498	MD
 Monaco	MC	MCO	492	MN
 Mongolia	MN	MNG	496	MG
+Montenegro	ME	MNE	499	MJ
 Montserrat	MS	MSR	500	MH
 Morocco	MA	MAR	504	MO
 Mozambique	MZ	MOZ	508	MZ
@@ -182,7 +185,7 @@
 Oman	OM	OMN	512	MU
 Pakistan	PK	PAK	586	PK
 Palau	PW	PLW	585	PS
-Palestinian Territory, Occupied	PS	PSE	275	
+Palestine	PS	PSE	275	GZ WE
 Panama	PA	PAN	591	PM
 Papua New Guinea	PG	PNG	598	PP
 Paraguay	PY	PRY	600	PA
@@ -194,12 +197,14 @@
 Puerto Rico	PR	PRI	630	RQ
 Qatar	QA	QAT	634	QA
 Reunion	RE	REU	638	RE
-Romania	RO	ROM	642	RO
+Romania	RO	ROU	642	RO
 Russian Federation	RU	RUS	643	RS
 Rwanda	RW	RWA	646	RW
+Saint Barthélemy	BL	BLM	652	TB
 Saint Helena	SH	SHN	654	SH
 Saint Kitts and Nevis	KN	KNA	659	SC
 Saint Lucia	LC	LCA	662	ST
+Saint Martin (French part)	MF	MAF	663	RN
 Saint Pierre and Miquelon	PM	SPM	666	SB
 Saint Vincent and the Grenadines	VC	VCT	670	VC
 Samoa	WS	WSM	882	WS
@@ -207,7 +212,7 @@
 Sao Tome and Principe	ST	STP	678	TP
 Saudi Arabia	SA	SAU	682	SA
 Senegal	SN	SEN	686	SG
-Serbia and Montenegro	CS	SCG	891	YI
+Serbia	RS	SRB	688	RI KV
 Seychelles	SC	SYC	690	SE
 Sierra Leone	SL	SLE	694	SL
 Singapore	SG	SGP	702	SN
@@ -216,19 +221,19 @@
 Solomon Islands	SB	SLB	090	BP
 Somalia	SO	SOM	706	SO
 South Africa	ZA	ZAF	710	SF
-South Georgia and the South Sandwich Islands	GS	SGS	239	SX
+South Georgia and South Sandwich Islands	GS	SGS	239	SX

CVS commit: src/share/mk

2009-12-14 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Dec 15 04:03:55 UTC 2009

Modified Files:
src/share/mk: bsd.sys.mk

Log Message:
brace a --fatal-warnings with a NOGCCERROR check.


To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/share/mk/bsd.sys.mk

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

Modified files:

Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.188 src/share/mk/bsd.sys.mk:1.189
--- src/share/mk/bsd.sys.mk:1.188	Mon Dec 14 01:00:46 2009
+++ src/share/mk/bsd.sys.mk	Tue Dec 15 04:03:55 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.188 2009/12/14 01:00:46 matt Exp $
+#	$NetBSD: bsd.sys.mk,v 1.189 2009/12/15 04:03:55 mrg Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -89,9 +89,11 @@
 CFLAGS+=	-Wa,-Av8plus
 .endif
 
+.if !defined(NOGCCERROR)
 .if (${MACHINE_ARCH} == mips64el) || (${MACHINE_ARCH} == mips64eb)
 CPUFLAGS+=	-Wa,--fatal-warnings
 .endif
+.endif
 
 #.if ${MACHINE} == sbmips
 #CFLAGS+=	-mips64 -mtune=sb1

CVS commit: src/compat/mips64

2009-12-14 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Dec 15 04:05:35 UTC 2009

Modified Files:
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk

Log Message:
fix the previous: default the target depending the MACHINE_ARCH.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.2 -r1.3 src/compat/mips64/o32/bsd.o32.mk

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

Modified files:

Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.2 src/compat/mips64/64/bsd.64.mk:1.3
--- src/compat/mips64/64/bsd.64.mk:1.2	Mon Dec 14 13:43:59 2009
+++ src/compat/mips64/64/bsd.64.mk	Tue Dec 15 04:05:34 2009
@@ -1,6 +1,10 @@
-#	$NetBSD: bsd.64.mk,v 1.2 2009/12/14 13:43:59 uebayasi Exp $
+#	$NetBSD: bsd.64.mk,v 1.3 2009/12/15 04:05:34 mrg Exp $
 
-LD+=		-m elf64btsmip	# XXX endian
+.if ${MACHINE_ARCH} == mips64eb
+LD+=		-m elf64btsmip
+.else
+LD+=		-m elf64ltsmip
+.endif
 MLIBDIR=	64
 
 COPTS+=		-mabi=64

Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.2 src/compat/mips64/o32/bsd.o32.mk:1.3
--- src/compat/mips64/o32/bsd.o32.mk:1.2	Mon Dec 14 13:43:59 2009
+++ src/compat/mips64/o32/bsd.o32.mk	Tue Dec 15 04:05:34 2009
@@ -1,6 +1,10 @@
-#	$NetBSD: bsd.o32.mk,v 1.2 2009/12/14 13:43:59 uebayasi Exp $
+#	$NetBSD: bsd.o32.mk,v 1.3 2009/12/15 04:05:34 mrg Exp $
 
-LD+=		-m elf32btsmip	# XXX endian
+.if ${MACHINE_ARCH} == mips64eb
+LD+=		-m elf32btsmip
+.else
+LD+=		-m elf32ltsmip
+.endif
 MLIBDIR=	o32
 
 COPTS+=		-mabi=32 -march=mips3

CVS commit: src/usr.bin/ldd

2009-12-14 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Dec 15 04:06:43 UTC 2009

Modified Files:
src/usr.bin/ldd: Makefile Makefile.inc ldd.h

Log Message:
make this actually build on mips64.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/ldd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/ldd/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/ldd/ldd.h

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/ldd/Makefile
diff -u src/usr.bin/ldd/Makefile:1.14 src/usr.bin/ldd/Makefile:1.15
--- src/usr.bin/ldd/Makefile:1.14	Sun Dec 13 08:50:56 2009
+++ src/usr.bin/ldd/Makefile	Tue Dec 15 04:06:43 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2009/12/13 08:50:56 mrg Exp $
+#	$NetBSD: Makefile,v 1.15 2009/12/15 04:06:43 mrg Exp $
 
 WARNS?=	3	# XXX: -Wsign-compare issues ld.elf_so source
 
@@ -9,7 +9,7 @@
 MAN=	ldd.1
 
 
-SUBDIR+= 	elf32 elf64
+SUBDIR+= 	elf32 elf64 elf32_compat
 
 .if (${MACHINE_ARCH} != alpha)
 LIB_ELF32DIR!=	cd ${.CURDIR}/elf32  ${PRINTOBJDIR}

Index: src/usr.bin/ldd/Makefile.inc
diff -u src/usr.bin/ldd/Makefile.inc:1.3 src/usr.bin/ldd/Makefile.inc:1.4
--- src/usr.bin/ldd/Makefile.inc:1.3	Sun Dec 13 08:50:56 2009
+++ src/usr.bin/ldd/Makefile.inc	Tue Dec 15 04:06:43 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.3 2009/12/13 08:50:56 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.4 2009/12/15 04:06:43 mrg Exp $
 
 WARNS?=	3	# XXX: -Wsign-compare issues ld.elf_so source
 
@@ -18,6 +18,7 @@
 .if (${MACHINE_ARCH} == mips64eb) || (${MACHINE_ARCH} == mips64el)
 MLIBDIR=	64
 COMPAT_MLIBDIR=	o32
+CPPFLAGS+= -DLDD_ELF64
 .endif
 
 .if exists(${.CURDIR}/../../Makefile.inc)

Index: src/usr.bin/ldd/ldd.h
diff -u src/usr.bin/ldd/ldd.h:1.5 src/usr.bin/ldd/ldd.h:1.6
--- src/usr.bin/ldd/ldd.h:1.5	Sun Dec 13 08:50:56 2009
+++ src/usr.bin/ldd/ldd.h	Tue Dec 15 04:06:43 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ldd.h,v 1.5 2009/12/13 08:50:56 mrg Exp $	*/
+/*	$NetBSD: ldd.h,v 1.6 2009/12/15 04:06:43 mrg Exp $	*/
 
 /*
  * Copyright (c) 2008 Matthew R. Green
@@ -31,6 +31,10 @@
 int elf32_ldd(int, char *, const char *, const char *);
 
 #ifdef _LP64
+#define LDD_ELF64
+#endif
+
+#ifdef LDD_ELF64
 int elf64_ldd(int, char *, const char *, const char *);
 #define elf_ldd elf64_ldd
 #elif defined(ELF32_COMPAT)

CVS commit: src/compat

2009-12-14 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Dec 15 04:12:43 UTC 2009

Modified Files:
src/compat: compatsubdir.mk

Log Message:
don't build atf, openldap or binutils if their MK* == no.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/compatsubdir.mk

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

Modified files:

Index: src/compat/compatsubdir.mk
diff -u src/compat/compatsubdir.mk:1.1 src/compat/compatsubdir.mk:1.2
--- src/compat/compatsubdir.mk:1.1	Sun Dec 13 09:27:13 2009
+++ src/compat/compatsubdir.mk	Tue Dec 15 04:12:43 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: compatsubdir.mk,v 1.1 2009/12/13 09:27:13 mrg Exp $
+#	$NetBSD: compatsubdir.mk,v 1.2 2009/12/15 04:12:43 mrg Exp $
 
 # Build netbsd libraries.
 
@@ -24,13 +24,23 @@
 	../../../lib/libutil .WAIT \
 	../../../lib .WAIT \
 	../../../gnu/lib \
-	../../../external/bsd/atf/lib \
 	../../../external/bsd/bind/lib \
 	../../../external/bsd/libevent/lib \
 	../../../external/bsd/file/lib \
-	../../../external/bsd/openldap/lib \
-	../../../external/gpl3/binutils/lib \
 	../../../libexec/ld.elf_so
+
+.if ${MKATF} != no
+SUBDIR+= ../../../external/bsd/atf/lib
+.endif
+
+.if (${MKLDAP} != no)
+SUBDIR+= ../../../external/bsd/openldap/lib
+.endif
+
+.if (${MKBINUTILS} != no)
+SUBDIR+= ../../../external/gpl3/binutils/lib
+.endif
+
 .endif
 
 .include bsd.subdir.mk

CVS commit: src/distrib/sets

2009-12-14 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Tue Dec 15 05:07:11 UTC 2009

Modified Files:
src/distrib/sets: sets.subr

Log Message:
We don't need to check ${MACHINE_ARCH} == m68000 if we use shlib or not.
Because such a knowledge is concentrated in bsd.own.mk and passed to as
${MKPIC}.  Tested by build.sh -m sun2 distribution sets.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/distrib/sets/sets.subr

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/sets.subr
diff -u src/distrib/sets/sets.subr:1.114 src/distrib/sets/sets.subr:1.115
--- src/distrib/sets/sets.subr:1.114	Fri Dec 11 15:22:33 2009
+++ src/distrib/sets/sets.subr	Tue Dec 15 05:07:11 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: sets.subr,v 1.114 2009/12/11 15:22:33 he Exp $
+#	$NetBSD: sets.subr,v 1.115 2009/12/15 05:07:11 uebayasi Exp $
 #
 
 #
@@ -152,9 +152,6 @@
 if [ ${MKPIC} = no ]; then
 	shlib=no
 fi
-if [ ${MACHINE_ARCH} = m68000 ]; then
-	shlib=no			# Turn off shlibs for some ports.
-fi
 if [ $module != no ]; then
 	nlists=base comp etc games man misc modules tests text
 else
@@ -176,7 +173,7 @@
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-# 	# $NetBSD: sets.subr,v 1.114 2009/12/11 15:22:33 he Exp $
+# 	# $NetBSD: sets.subr,v 1.115 2009/12/15 05:07:11 uebayasi Exp $
 # 	.			base-sys-root	[keyword[,...]]
 # 	./altroot		base-sys-root
 # 	./bin			base-sys-root

CVS commit: src/distrib/sets

2009-12-14 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Tue Dec 15 05:11:08 UTC 2009

Modified Files:
src/distrib/sets: sets.subr

Log Message:
Factor out print_set_files() printing raw set list entries out of
list_set_files().  While here kill a useless-use-of-cat.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/distrib/sets/sets.subr

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/sets.subr
diff -u src/distrib/sets/sets.subr:1.115 src/distrib/sets/sets.subr:1.116
--- src/distrib/sets/sets.subr:1.115	Tue Dec 15 05:07:11 2009
+++ src/distrib/sets/sets.subr	Tue Dec 15 05:11:08 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: sets.subr,v 1.115 2009/12/15 05:07:11 uebayasi Exp $
+#	$NetBSD: sets.subr,v 1.116 2009/12/15 05:11:08 uebayasi Exp $
 #
 
 #
@@ -173,7 +173,7 @@
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-# 	# $NetBSD: sets.subr,v 1.115 2009/12/15 05:07:11 uebayasi Exp $
+# 	# $NetBSD: sets.subr,v 1.116 2009/12/15 05:11:08 uebayasi Exp $
 # 	.			base-sys-root	[keyword[,...]]
 # 	./altroot		base-sys-root
 # 	./bin			base-sys-root
@@ -260,15 +260,7 @@
 	else
 		verbose=true
 	fi
-	for setname; do
-		list=`list_set_lists $setname`
-		for l in $list; do
-			echo $l
-			if $verbose; then
-echo 2 DEBUG: list_set_files: $l
-			fi
-		done
-	done | xargs cat | ${SED} ${SUBST} | \
+	print_set_lists $@ | \
 	${AWK} -v obsolete=${obsolete} '
 		BEGIN {
 			if (obsolete)
@@ -475,6 +467,19 @@
 	done
 }
 
+print_set_lists()
+{
+	for setname; do
+		list=`list_set_lists $setname`
+		for l in $list; do
+			echo $l
+			if $verbose; then
+echo 2 DEBUG: list_set_files: $l
+			fi
+		done
+	done | xargs ${SED} ${SUBST}
+}
+
 # arch_to_cpu mach
 #
 # Print the ${MACHINE_CPU} for ${MACHINE_ARCH}=mach,

CVS commit: src/sys/arch

2009-12-14 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Dec 15 06:01:43 UTC 2009

Modified Files:
src/sys/arch/evbmips/evbmips: interrupt.c
src/sys/arch/hpcmips/hpcmips: interrupt.c
src/sys/arch/hpcmips/include: sysconf.h
src/sys/arch/mipsco/mipsco: interrupt.c
src/sys/arch/sgimips/sgimips: cpu.c

Log Message:
convert all mips cpu_intr() to have the standard
(uint32_t, uint32_t, vaddr_t, uint32_t) signature.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbmips/evbmips/interrupt.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcmips/hpcmips/interrupt.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hpcmips/include/sysconf.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mipsco/mipsco/interrupt.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sgimips/sgimips/cpu.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/arch/evbmips/evbmips/interrupt.c
diff -u src/sys/arch/evbmips/evbmips/interrupt.c:1.12 src/sys/arch/evbmips/evbmips/interrupt.c:1.13
--- src/sys/arch/evbmips/evbmips/interrupt.c:1.12	Mon Dec 14 00:46:02 2009
+++ src/sys/arch/evbmips/evbmips/interrupt.c	Tue Dec 15 06:01:43 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: interrupt.c,v 1.12 2009/12/14 00:46:02 matt Exp $	*/
+/*	$NetBSD: interrupt.c,v 1.13 2009/12/15 06:01:43 mrg Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.12 2009/12/14 00:46:02 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.13 2009/12/15 06:01:43 mrg Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -50,7 +50,7 @@
 }
 
 void
-cpu_intr(u_int32_t status, u_int32_t cause, vaddr_t pc, u_int32_t ipending)
+cpu_intr(uint32_t status, uint32_t cause, vaddr_t pc, uint32_t ipending)
 {
 	struct clockframe cf;
 	struct cpu_info *ci;

Index: src/sys/arch/hpcmips/hpcmips/interrupt.c
diff -u src/sys/arch/hpcmips/hpcmips/interrupt.c:1.15 src/sys/arch/hpcmips/hpcmips/interrupt.c:1.16
--- src/sys/arch/hpcmips/hpcmips/interrupt.c:1.15	Mon Dec 14 00:46:04 2009
+++ src/sys/arch/hpcmips/hpcmips/interrupt.c	Tue Dec 15 06:01:43 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: interrupt.c,v 1.15 2009/12/14 00:46:04 matt Exp $	*/
+/*	$NetBSD: interrupt.c,v 1.16 2009/12/15 06:01:43 mrg Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.15 2009/12/14 00:46:04 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.16 2009/12/15 06:01:43 mrg Exp $);
 
 #include opt_vr41xx.h
 #include opt_tx39xx.h
@@ -64,7 +64,7 @@
  * 
  */
 void
-cpu_intr(u_int32_t status, u_int32_t cause, vaddr_t pc, u_int32_t ipending)
+cpu_intr(uint32_t status, uint32_t cause, vaddr_t pc, uint32_t ipending)
 {
 
 	(*platform.cpu_intr)(status, cause, pc, ipending);

Index: src/sys/arch/hpcmips/include/sysconf.h
diff -u src/sys/arch/hpcmips/include/sysconf.h:1.14 src/sys/arch/hpcmips/include/sysconf.h:1.15
--- src/sys/arch/hpcmips/include/sysconf.h:1.14	Mon Dec 14 00:46:04 2009
+++ src/sys/arch/hpcmips/include/sysconf.h	Tue Dec 15 06:01:43 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysconf.h,v 1.14 2009/12/14 00:46:04 matt Exp $	*/
+/*	$NetBSD: sysconf.h,v 1.15 2009/12/15 06:01:43 mrg Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -62,7 +62,7 @@
 	 *	reboot		-	reboot or powerdown
 	 *	clock		-
 	 */
-	void	(*cpu_intr)(u_int32_t, u_int32_t, vaddr_t, u_int32_t);
+	void	(*cpu_intr)(uint32_t, uint32_t, vaddr_t, uint32_t);
 	void	(*cpu_idle)(void);
 	void	(*cons_init)(void);
 	void	(*fb_init)(void **);

Index: src/sys/arch/mipsco/mipsco/interrupt.c
diff -u src/sys/arch/mipsco/mipsco/interrupt.c:1.8 src/sys/arch/mipsco/mipsco/interrupt.c:1.9
--- src/sys/arch/mipsco/mipsco/interrupt.c:1.8	Mon Dec 14 00:46:09 2009
+++ src/sys/arch/mipsco/mipsco/interrupt.c	Tue Dec 15 06:01:43 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: interrupt.c,v 1.8 2009/12/14 00:46:09 matt Exp $	*/
+/*	$NetBSD: interrupt.c,v 1.9 2009/12/15 06:01:43 mrg Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.8 2009/12/14 00:46:09 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.9 2009/12/15 06:01:43 mrg Exp $);
 
 #include sys/param.h
 #include sys/malloc.h
@@ -42,7 +42,7 @@
 #include machine/sysconf.h
 
 void
-cpu_intr(u_int32_t status, u_int32_t cause, vaddr_t pc, u_int32_t ipending)
+cpu_intr(uint32_t status, uint32_t cause, vaddr_t pc, uint32_t ipending)
 {
 	struct cpu_info *ci;
 

Index: src/sys/arch/sgimips/sgimips/cpu.c
diff -u src/sys/arch/sgimips/sgimips/cpu.c:1.22 src/sys/arch/sgimips/sgimips/cpu.c:1.23
--- src/sys/arch/sgimips/sgimips/cpu.c:1.22	Mon Dec 14 00:46:13 2009
+++ src/sys/arch/sgimips/sgimips/cpu.c	Tue Dec 15 06:01:43 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.22 2009/12/14

CVS commit: src/doc

2009-12-14 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Dec 15 06:04:22 UTC 2009

Modified Files:
src/doc: CHANGES

Log Message:
note about USIII


To generate a diff of this commit:
cvs rdiff -u -r1.1330 -r1.1331 src/doc/CHANGES

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1330 src/doc/CHANGES:1.1331
--- src/doc/CHANGES:1.1330	Sun Dec 13 05:11:04 2009
+++ src/doc/CHANGES	Tue Dec 15 06:04:22 2009
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1330 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1331 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -489,6 +489,7 @@
 	ws(4): Added the xf86-input-ws input driver for touchpanels that
 		report absolute position data through wscons(4), e.g. those
 		support by ums(4). [mbalmer 20091128]
+	sparc64:  Add real UltraSPARC-III* CPU support.  [mrg 20091130]
 	build.sh: Handle externally added programs and libraries and create
 		sets.  [uebayasi 20091130]
 	udl(4): Add a driver for DisplayLink DL-1x0/1x5 based USB LCDs and

CVS commit: src/sys/arch/mips/mips

2009-12-14 Thread Mindaugas Rasiukevicius

Module Name:src
Committed By:   rmind
Date:   Tue Dec 15 06:07:14 UTC 2009

Modified Files:
src/sys/arch/mips/mips: bus_space_alignstride_chipdep.c

Log Message:
Fix MALTA32 builds, pmap_kenter_pa() needs additional argument in -current.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/arch/mips/mips/bus_space_alignstride_chipdep.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/arch/mips/mips/bus_space_alignstride_chipdep.c
diff -u src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.11 src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.12
--- src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.11	Mon Dec 14 00:46:05 2009
+++ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c	Tue Dec 15 06:07:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.11 2009/12/14 00:46:05 matt Exp $ */
+/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.12 2009/12/15 06:07:14 rmind Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space_alignstride_chipdep.c,v 1.11 2009/12/14 00:46:05 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space_alignstride_chipdep.c,v 1.12 2009/12/15 06:07:14 rmind Exp $);
 
 #ifdef CHIP_EXTENT
 #include sys/extent.h
@@ -772,7 +772,7 @@
 
 		s = splhigh();
 		while (size != 0) {
-			pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE);
+			pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
 			pa += PAGE_SIZE;
 			va += PAGE_SIZE;
 			size -= PAGE_SIZE;

CVS commit: src/sys/uvm

2009-12-14 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Tue Dec 15 06:15:11 UTC 2009

Modified Files:
src/sys/uvm: uvm_map.c uvm_unix.c

Log Message:
Use PRIxVADDR... (change a printf/panic - panic)


To generate a diff of this commit:
cvs rdiff -u -r1.285 -r1.286 src/sys/uvm/uvm_map.c
cvs rdiff -u -r1.42 -r1.43 src/sys/uvm/uvm_unix.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/uvm/uvm_map.c
diff -u src/sys/uvm/uvm_map.c:1.285 src/sys/uvm/uvm_map.c:1.286
--- src/sys/uvm/uvm_map.c:1.285	Mon Dec 14 21:19:47 2009
+++ src/sys/uvm/uvm_map.c	Tue Dec 15 06:15:11 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_map.c,v 1.285 2009/12/14 21:19:47 matt Exp $	*/
+/*	$NetBSD: uvm_map.c,v 1.286 2009/12/15 06:15:11 matt Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_map.c,v 1.285 2009/12/14 21:19:47 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_map.c,v 1.286 2009/12/15 06:15:11 matt Exp $);
 
 #include opt_ddb.h
 #include opt_uvmhist.h
@@ -2605,9 +2605,11 @@
 			if (tmpent-start  cur)
 panic(uvm_map_replace1);
 			if (tmpent-start = tmpent-end || tmpent-end  end) {
-		printf(tmpent-start=0x%lx, tmpent-end=0x%lx, end=0x%lx\n,
-			tmpent-start, tmpent-end, end);
-panic(uvm_map_replace2);
+panic(uvm_map_replace2: 
+tmpent-start=0x%PRIxVADDR
+, tmpent-end=0x%PRIxVADDR
+, end=0x%PRIxVADDR,
+tmpent-start, tmpent-end, end);
 			}
 			cur = tmpent-end;
 			if (tmpent-next) {

Index: src/sys/uvm/uvm_unix.c
diff -u src/sys/uvm/uvm_unix.c:1.42 src/sys/uvm/uvm_unix.c:1.43
--- src/sys/uvm/uvm_unix.c:1.42	Fri Nov 27 12:25:10 2009
+++ src/sys/uvm/uvm_unix.c	Tue Dec 15 06:15:11 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_unix.c,v 1.42 2009/11/27 12:25:10 njoly Exp $	*/
+/*	$NetBSD: uvm_unix.c,v 1.43 2009/12/15 06:15:11 matt Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -50,7 +50,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_unix.c,v 1.42 2009/11/27 12:25:10 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_unix.c,v 1.43 2009/12/15 06:15:11 matt Exp $);
 
 #include opt_pax.h
 
@@ -119,7 +119,7 @@
 UVM_FLAG_OVERLAY|UVM_FLAG_COPYONW));
 		if (error) {
 #ifdef DEBUG
-			uprintf(sbrk: grow %ld failed, error = %d\n,
+			uprintf(sbrk: grow %#PRIxVADDR failed, error = %d\n,
 			new - old, error);
 #endif
 			mutex_exit(p-p_auxlock);

CVS commit: src/distrib/sets

2009-12-14 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Tue Dec 15 06:18:07 UTC 2009

Modified Files:
src/distrib/sets: Makefile sets.subr

Log Message:
Clean up debug knobs.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/distrib/sets/Makefile
cvs rdiff -u -r1.116 -r1.117 src/distrib/sets/sets.subr

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/Makefile
diff -u src/distrib/sets/Makefile:1.77 src/distrib/sets/Makefile:1.78
--- src/distrib/sets/Makefile:1.77	Fri Dec 11 15:25:05 2009
+++ src/distrib/sets/Makefile	Tue Dec 15 06:18:07 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.77 2009/12/11 15:25:05 uebayasi Exp $
+#	$NetBSD: Makefile,v 1.78 2009/12/15 06:18:07 uebayasi Exp $
 
 # The `all' target must appear before bsd.own.mk is pulled in.
 all:
@@ -8,8 +8,7 @@
 .include bsd.own.mk
 .include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
 
-SETSCMD=	cd ${.CURDIR}  \
-		DESTDIR=${DESTDIR:Q} \
+SETSENV=	DESTDIR=${DESTDIR:Q} \
 		MACHINE=${MACHINE:Q} \
 		MACHINE_ARCH=${MACHINE_ARCH:Q} \
 		AWK=${TOOL_AWK:Q} \
@@ -22,7 +21,9 @@
 		PAX=${TOOL_PAX:Q} \
 		PKG_CREATE=${TOOL_PKG_CREATE:Q} \
 		SED=${TOOL_SED:Q} \
-		TSORT=${TSORT:Q} \
+		TSORT=${TSORT:Q}
+SETSCMD=	cd ${.CURDIR}  \
+		${SETSENV} \
 		${HOST_SH}
 
 MAKETARS_FLAGS=
@@ -68,8 +69,12 @@
 print_toolchain_missing: .PHONY
 	@echo ${TOOLCHAIN_MISSING}
 
-print_mkvars: .PHONY
-	@env SETS_SUBR_DEBUG=dumpmkvars rundir=${.CURDIR} ${HOST_SH} sets.subr
+print_mkvars \
+print_set_lists_base print_set_lists_x print_set_lists_ext \
+list_set_lists_base list_set_lists_x list_set_lists_ext \
+list_set_files_base list_set_files_x list_set_files_ext \
+		: .PHONY
+	@${SETSENV}; rundir=${.CURDIR}; . ./sets.subr; ${.TARGET}
 
 #
 # METALOG MANIPULATION TARGETS

Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.116 src/distrib/sets/sets.subr:1.117
--- src/distrib/sets/sets.subr:1.116	Tue Dec 15 05:11:08 2009
+++ src/distrib/sets/sets.subr	Tue Dec 15 06:18:07 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: sets.subr,v 1.116 2009/12/15 05:11:08 uebayasi Exp $
+#	$NetBSD: sets.subr,v 1.117 2009/12/15 06:18:07 uebayasi Exp $
 #
 
 #
@@ -126,16 +126,9 @@
 
 MKVARS=$( ${MAKE} -B -f ${rundir}/mkvars.mk mkvars | sed -e 's,=.*,,' | xargs )
 
-if [ $SETS_SUBR_DEBUG = dumpmkvars ]; then
-	for v in $MKVARS; do
-		eval echo $v=\$$v
-	done
-	exit 0
-fi
-
 #
 
-setsdir=${0%/*}
+setsdir=${rundir}
 obsolete=0
 module=yes
 if [ ${MKKMOD} = no ]; then
@@ -173,7 +166,7 @@
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-# 	# $NetBSD: sets.subr,v 1.116 2009/12/15 05:11:08 uebayasi Exp $
+# 	# $NetBSD: sets.subr,v 1.117 2009/12/15 06:18:07 uebayasi Exp $
 # 	.			base-sys-root	[keyword[,...]]
 # 	./altroot		base-sys-root
 # 	./bin			base-sys-root
@@ -379,6 +372,7 @@
 	list_set_lists_shl $setname
 	list_set_lists_module $setname
 	list_set_lists_rescue $setname
+	return 0
 }
 
 list_set_lists_mi()
@@ -507,3 +501,27 @@
 	@echo \${TARGET_ENDIANNESS}
 EOMAKE
 }
+
+#
+
+# print_mkvars
+print_mkvars()
+{
+	for v in $MKVARS; do
+		eval echo $v=\$$v
+	done
+}
+
+# print_set_lists_{base,x,ext}
+# list_set_lists_{base,x,ext}
+# list_set_files_{base,x,ext}
+for func in print_set_lists list_set_lists list_set_files; do
+	for x in base x ext; do
+		if [ $x = base ]; then
+			list=nlists
+		else
+			list=${x}lists
+		fi
+		eval ${func}_${x} \(\) \{ $func \$$list \; \}
+	done
+done

46 matches

Mail list logo