Re: CVS commit: src/distrib/alpha/instkernel/ramdisk

[J. Hannken-Illjes]

Looks like an error in the `list' file:

SPECIAL pingsrcdir  distrib/utils/x_gzip


SPECIAL pingsrcdir  distrib/utils/x_ping

--
Juergen Hannken-Illjes - hann...@eis.cs.tu-bs.de - TU Braunschweig (Germany)





On Jun 21, 2011, at 1:36 AM, Christos Zoulas wrote:

 In article 20110620230053.9893c17...@cvs.netbsd.org,
 Havard Eidnes source-changes-d@NetBSD.org wrote:
 -=-=-=-=-=-
 
 Module Name: src
 Committed By:he
 Date:Mon Jun 20 23:00:53 UTC 2011
 
 Modified Files:
  src/distrib/alpha/instkernel/ramdisk: list
 
 Log Message:
 Add -lbz2 and -llzma so that this links again.
 
 But that should not be needed for x_gzip. What needs those?
 
 christos
 

Re: CVS commit: src/external/gpl3/gcc/dist

[Thomas Klausner]

Is someone working on submitting (the interesting ones of) these
upstream?
Now that the patches are fresh is probably the easiest time...
 Thomas

On Tue, Jun 21, 2011 at 02:41:40AM +, matthew green wrote:
 Module Name:  src
 Committed By: mrg
 Date: Tue Jun 21 02:41:39 UTC 2011
 
 Modified Files:
   src/external/gpl3/gcc/dist: configure configure.ac
   src/external/gpl3/gcc/dist/gcc: Makefile.in c-opts.c c.opt cfgexpand.c
   config.gcc configure configure.ac gcc.c gcc.h genemit.c genmultilib
   genrecog.c hwint.h libgcc2.c tree-cfg.c
   src/external/gpl3/gcc/dist/gcc/config: netbsd-elf.h netbsd.h
   src/external/gpl3/gcc/dist/gcc/config/arm: t-arm
   src/external/gpl3/gcc/dist/gcc/config/m68k: m68k.md
   src/external/gpl3/gcc/dist/gcc/config/mips: netbsd.h
   src/external/gpl3/gcc/dist/gcc/config/pa: milli64.S pa.c pa.h
   src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd.h rs6000.c sysv4.h
   t-netbsd
   src/external/gpl3/gcc/dist/gcc/config/sh: t-netbsd
   src/external/gpl3/gcc/dist/gcc/config/sparc: netbsd-elf.h t-netbsd64
   src/external/gpl3/gcc/dist/gcc/doc: cpp.texi cppenv.texi cppopts.texi
   gcov.texi invoke.texi
   src/external/gpl3/gcc/dist/gcc/ginclude: stddef.h
   src/external/gpl3/gcc/dist/libcpp: Makefile.in files.c init.c
   internal.h lex.c macro.c
   src/external/gpl3/gcc/dist/libcpp/include: cpplib.h
   src/external/gpl3/gcc/dist/libiberty: floatformat.c strerror.c
   src/external/gpl3/gcc/dist/libobjc: hash.c
   src/external/gpl3/gcc/dist/libstdc++-v3: crossconfig.m4
   src/external/gpl3/gcc/dist/libstdc++-v3/config/os/bsd/netbsd:
   ctype_base.h
 
 Log Message:
 merge forward our changes into the GCC 4.5.3 tree.  mostly from chuq.
 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/configure \
 src/external/gpl3/gcc/dist/configure.ac
 cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/gcc/Makefile.in \
 src/external/gpl3/gcc/dist/gcc/c-opts.c \
 src/external/gpl3/gcc/dist/gcc/c.opt \
 src/external/gpl3/gcc/dist/gcc/cfgexpand.c \
 src/external/gpl3/gcc/dist/gcc/config.gcc \
 src/external/gpl3/gcc/dist/gcc/configure \
 src/external/gpl3/gcc/dist/gcc/configure.ac \
 src/external/gpl3/gcc/dist/gcc/gcc.c src/external/gpl3/gcc/dist/gcc/gcc.h 
 \
 src/external/gpl3/gcc/dist/gcc/genemit.c \
 src/external/gpl3/gcc/dist/gcc/genmultilib \
 src/external/gpl3/gcc/dist/gcc/genrecog.c \
 src/external/gpl3/gcc/dist/gcc/hwint.h \
 src/external/gpl3/gcc/dist/gcc/libgcc2.c \
 src/external/gpl3/gcc/dist/gcc/tree-cfg.c
 cvs rdiff -u -r1.1.1.1 -r1.2 \
 src/external/gpl3/gcc/dist/gcc/config/netbsd-elf.h \
 src/external/gpl3/gcc/dist/gcc/config/netbsd.h
 cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/gcc/config/arm/t-arm
 cvs rdiff -u -r1.1.1.1 -r1.2 \
 src/external/gpl3/gcc/dist/gcc/config/m68k/m68k.md
 cvs rdiff -u -r1.1.1.1 -r1.2 \
 src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h
 cvs rdiff -u -r1.1.1.1 -r1.2 \
 src/external/gpl3/gcc/dist/gcc/config/pa/milli64.S \
 src/external/gpl3/gcc/dist/gcc/config/pa/pa.c \
 src/external/gpl3/gcc/dist/gcc/config/pa/pa.h
 cvs rdiff -u -r1.1.1.1 -r1.2 \
 src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h \
 src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c \
 src/external/gpl3/gcc/dist/gcc/config/rs6000/sysv4.h \
 src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd
 cvs rdiff -u -r1.1.1.1 -r1.2 \
 src/external/gpl3/gcc/dist/gcc/config/sh/t-netbsd
 cvs rdiff -u -r1.1.1.1 -r1.2 \
 src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h \
 src/external/gpl3/gcc/dist/gcc/config/sparc/t-netbsd64
 cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/gcc/doc/cpp.texi \
 src/external/gpl3/gcc/dist/gcc/doc/cppenv.texi \
 src/external/gpl3/gcc/dist/gcc/doc/cppopts.texi \
 src/external/gpl3/gcc/dist/gcc/doc/gcov.texi \
 src/external/gpl3/gcc/dist/gcc/doc/invoke.texi
 cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/gcc/ginclude/stddef.h
 cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/libcpp/Makefile.in \
 src/external/gpl3/gcc/dist/libcpp/files.c \
 src/external/gpl3/gcc/dist/libcpp/init.c \
 src/external/gpl3/gcc/dist/libcpp/internal.h \
 src/external/gpl3/gcc/dist/libcpp/lex.c \
 src/external/gpl3/gcc/dist/libcpp/macro.c
 cvs rdiff -u -r1.1.1.1 -r1.2 \
 src/external/gpl3/gcc/dist/libcpp/include/cpplib.h
 cvs rdiff -u -r1.1.1.1 -r1.2 \
 src/external/gpl3/gcc/dist/libiberty/floatformat.c \
 src/external/gpl3/gcc/dist/libiberty/strerror.c
 cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/libobjc/hash.c
 cvs rdiff -u -r1.1.1.1 -r1.2 \
 src/external/gpl3/gcc/dist/libstdc++-v3/crossconfig.m4
 cvs rdiff -u -r1.1.1.1 -r1.2 \
 

CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3/src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 06:18:56 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/libstdc++-v3/src: locale-inst.cc

Log Message:
pull across from gcc 4.1:

revision 1.2
date: 2011/05/25 15:51:55;  author: joerg;  state: Exp;  lines: +2 -2
Don't define explicit instantiation as inline.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/libstdc++-v3/src/locale-inst.cc

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

Modified files:

Index: src/external/gpl3/gcc/dist/libstdc++-v3/src/locale-inst.cc
diff -u src/external/gpl3/gcc/dist/libstdc++-v3/src/locale-inst.cc:1.1.1.1 src/external/gpl3/gcc/dist/libstdc++-v3/src/locale-inst.cc:1.2
--- src/external/gpl3/gcc/dist/libstdc++-v3/src/locale-inst.cc:1.1.1.1	Tue Jun 21 01:24:05 2011
+++ src/external/gpl3/gcc/dist/libstdc++-v3/src/locale-inst.cc	Tue Jun 21 06:18:56 2011
@@ -175,11 +175,11 @@
   template class messages_bynameC;
   
   // ctype
-  inline template class __ctype_abstract_baseC;
+  template class __ctype_abstract_baseC;
   template class ctype_bynameC;
   
   // codecvt
-  inline template class __codecvt_abstract_baseC, char, mbstate_t;
+  template class __codecvt_abstract_baseC, char, mbstate_t;
   template class codecvt_bynameC, char, mbstate_t;
 
   // collate

CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 06:22:06 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/libstdc++-v3/include/ext: ropeimpl.h

Log Message:
pull across from gcc 4.1:

revision 1.2
date: 2011/02/05 00:37:40;  author: joerg;  state: Exp;  lines: +2 -2
Explicitly use template to allow building with the more strict
template lookup in clang. From FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h

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

Modified files:

Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h
diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h:1.1.1.1 src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h:1.2
--- src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h:1.1.1.1	Tue Jun 21 01:24:44 2011
+++ src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h	Tue Jun 21 06:22:06 2011
@@ -428,7 +428,7 @@
 {
   size_t __old_len = __r-_M_size;
   _CharT* __new_data = (_CharT*)
-	_Data_allocate(_S_rounded_up_size(__old_len + __len));
+	_Rope_rep_base_CharT, _Alloc::_Data_allocate(_S_rounded_up_size(__old_len + __len));
   _RopeLeaf* __result;
 
   uninitialized_copy_n(__r-_M_data, __old_len, __new_data);
@@ -812,7 +812,7 @@
 	if (__result_len  __lazy_threshold)
 	  goto lazy;
 	__section = (_CharT*)
-	  _Data_allocate(_S_rounded_up_size(__result_len));
+	  _Rope_rep_base_CharT, _Alloc::_Data_allocate(_S_rounded_up_size(__result_len));
 	__try
 	  {	(*(__f-_M_fn))(__start, __result_len, __section); }
 	__catch(...)

CVS commit: src/sys/dev

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Tue Jun 21 06:23:38 UTC 2011

Modified Files:
src/sys/dev: ccd.c cgd.c

Log Message:
Adjust the #ifdefs such that ccd(4) and cgd(4) show in
modstat(8) even if built into the kernel.


To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/sys/dev/ccd.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/cgd.c

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

Modified files:

Index: src/sys/dev/ccd.c
diff -u src/sys/dev/ccd.c:1.139 src/sys/dev/ccd.c:1.140
--- src/sys/dev/ccd.c:1.139	Sun Jun 12 03:35:51 2011
+++ src/sys/dev/ccd.c	Tue Jun 21 06:23:38 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ccd.c,v 1.139 2011/06/12 03:35:51 rmind Exp $	*/
+/*	$NetBSD: ccd.c,v 1.140 2011/06/21 06:23:38 jruoho Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ccd.c,v 1.139 2011/06/12 03:35:51 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: ccd.c,v 1.140 2011/06/21 06:23:38 jruoho Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -98,6 +98,7 @@
 #include sys/buf.h
 #include sys/kmem.h
 #include sys/pool.h
+#include sys/module.h
 #include sys/namei.h
 #include sys/stat.h
 #include sys/ioctl.h
@@ -1532,27 +1533,29 @@
 }
 #endif
 
-#ifdef _MODULE
-
-#include sys/module.h
-
 MODULE(MODULE_CLASS_DRIVER, ccd, NULL);
 
 static int
 ccd_modcmd(modcmd_t cmd, void *arg)
 {
-	int bmajor = -1, cmajor = -1,  error = 0;
-	
+	int bmajor, cmajor, error = 0;
+
+	bmajor = cmajor = -1;
+
 	switch (cmd) {
 	case MODULE_CMD_INIT:
+#ifdef _MODULE
 		ccdattach(4);
-		
+
 		return devsw_attach(ccd, ccd_bdevsw, bmajor,
 		ccd_cdevsw, cmajor);
+#endif
 		break;
 
 	case MODULE_CMD_FINI:
+#ifdef _MODULE
 		return devsw_detach(ccd_bdevsw, ccd_cdevsw);
+#endif
 		break;
 
 	case MODULE_CMD_STAT:
@@ -1564,5 +1567,3 @@
 
 	return error;
 }
-
-#endif

Index: src/sys/dev/cgd.c
diff -u src/sys/dev/cgd.c:1.73 src/sys/dev/cgd.c:1.74
--- src/sys/dev/cgd.c:1.73	Sun Jun 12 03:35:51 2011
+++ src/sys/dev/cgd.c	Tue Jun 21 06:23:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.73 2011/06/12 03:35:51 rmind Exp $ */
+/* $NetBSD: cgd.c,v 1.74 2011/06/21 06:23:38 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cgd.c,v 1.73 2011/06/12 03:35:51 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: cgd.c,v 1.74 2011/06/21 06:23:38 jruoho Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -40,6 +40,7 @@
 #include sys/buf.h
 #include sys/bufq.h
 #include sys/malloc.h
+#include sys/module.h
 #include sys/pool.h
 #include sys/ioctl.h
 #include sys/device.h
@@ -939,20 +940,22 @@
 }
 #endif
 
-#ifdef _MODULE
-
-#include sys/module.h
-
 MODULE(MODULE_CLASS_DRIVER, cgd, NULL);
+
+#ifdef _MODULE
 CFDRIVER_DECL(cgd, DV_DISK, NULL);
+#endif
 
 static int
 cgd_modcmd(modcmd_t cmd, void *arg)
 {
-	int bmajor = -1, cmajor = -1,  error = 0;
-	
+	int bmajor, cmajor, error = 0;
+
+	bmajor = cmajor = -1;
+
 	switch (cmd) {
 	case MODULE_CMD_INIT:
+#ifdef _MODULE
 		error = config_cfdriver_attach(cgd_cd);
 		if (error)
 			break;
@@ -964,7 +967,7 @@
 			cgd_cd.cd_name);
 			break;
 		}
-		
+
 		error = devsw_attach(cgd, cgd_bdevsw, bmajor,
 		cgd_cdevsw, cmajor);
 		if (error) {
@@ -972,15 +975,17 @@
 			config_cfdriver_detach(cgd_cd);
 			break;
 		}
-		
+#endif
 		break;
 
 	case MODULE_CMD_FINI:
+#ifdef _MODULE
 		error = config_cfattach_detach(cgd_cd.cd_name, cgd_ca);
 		if (error)
 			break;
 		config_cfdriver_detach(cgd_cd);
 		devsw_detach(cgd_bdevsw, cgd_cdevsw);
+#endif
 		break;
 
 	case MODULE_CMD_STAT:
@@ -992,5 +997,3 @@
 
 	return error;
 }
-
-#endif

CVS commit: src/sys/arch/powerpc/booke

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jun 21 06:24:25 UTC 2011

Modified Files:
src/sys/arch/powerpc/booke: e500_intr.c

Log Message:
In e500_spl0, grab ci after disabling interrupts.
Consolidate a KASSERT.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/booke/e500_intr.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/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.11 src/sys/arch/powerpc/booke/e500_intr.c:1.12
--- src/sys/arch/powerpc/booke/e500_intr.c:1.11	Wed Jun 15 15:11:50 2011
+++ src/sys/arch/powerpc/booke/e500_intr.c	Tue Jun 21 06:24:25 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: e500_intr.c,v 1.11 2011/06/15 15:11:50 matt Exp $	*/
+/*	$NetBSD: e500_intr.c,v 1.12 2011/06/21 06:24:25 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -454,11 +454,8 @@
 	u_int ctpr = (ipl = IPL_VM ? 15 : ipl);
 	KASSERT(openpic_read(cpu, OPENPIC_CTPR) == old_ctpr);
 #else
-#ifdef DIAGNOSTIC
-	u_int old_ctpr = IPL2CTPR(ci-ci_cpl);
-#endif
 	u_int ctpr = IPL2CTPR(ipl);
-	KASSERT(openpic_read(cpu, OPENPIC_CTPR) == old_ctpr);
+	KASSERT(openpic_read(cpu, OPENPIC_CTPR) == IPL2CTPR(ci-ci_cpl));
 #endif
 	openpic_write(cpu, OPENPIC_CTPR, ctpr);
 	KASSERT(openpic_read(cpu, OPENPIC_CTPR) == ctpr);
@@ -468,10 +465,10 @@
 static void
 e500_spl0(void)
 {
-	struct cpu_info * const ci = curcpu();
-
 	wrtee(0);
 
+	struct cpu_info * const ci = curcpu();
+
 #ifdef __HAVE_FAST_SOFTINTS
 	if (__predict_false(ci-ci_data.cpu_softints != 0)) {
 		e500_splset(ci, IPL_HIGH);

CVS commit: src/sys/arch/powerpc/booke/dev

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jun 21 06:25:19 UTC 2011

Modified Files:
src/sys/arch/powerpc/booke/dev: pq3etsec.c

Log Message:
Add DEBUG around a variable.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/booke/dev/pq3etsec.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/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.5 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.6
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.5	Fri Jun 17 19:03:03 2011
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c	Tue Jun 21 06:25:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3etsec.c,v 1.5 2011/06/17 19:03:03 matt Exp $	*/
+/*	$NetBSD: pq3etsec.c,v 1.6 2011/06/21 06:25:19 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -2385,6 +2385,8 @@
 		softint_schedule(sc-sc_soft_ih);
 	splx(s);
 	callout_schedule(sc-sc_mii_callout, hz);
+#ifdef DEBUG
 	sc-sc_mii_last_tick = now;
+#endif
 	mutex_exit(sc-sc_lock);
 }

CVS commit: src/sys/arch/powerpc

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jun 21 06:32:36 UTC 2011

Modified Files:
src/sys/arch/powerpc/include: cpu.h
src/sys/arch/powerpc/powerpc: powerpc_machdep.c

Log Message:
Add a common cpu_ast(l, ci) routine.
Add a ci_pmap_asid_cur for BOOKE debugging.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/powerpc/include/cpu.h
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/powerpc/powerpc/powerpc_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/powerpc/include/cpu.h
diff -u src/sys/arch/powerpc/include/cpu.h:1.85 src/sys/arch/powerpc/include/cpu.h:1.86
--- src/sys/arch/powerpc/include/cpu.h:1.85	Tue Jun 21 04:21:17 2011
+++ src/sys/arch/powerpc/include/cpu.h	Tue Jun 21 06:32:36 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.85 2011/06/21 04:21:17 matt Exp $	*/
+/*	$NetBSD: cpu.h,v 1.86 2011/06/21 06:32:36 matt Exp $	*/
 
 /*
  * Copyright (C) 1999 Wolfgang Solfrank.
@@ -113,6 +113,7 @@
 #define	CPUSAVE_SRR1	7		/* where SRR1 gets saved */
 	register_t ci_savearea[CPUSAVE_SIZE];
 #if defined(PPC_BOOKE) || defined(MODULAR) || defined(_MODULE)
+	uint32_t ci_pmap_asid_cur;
 	struct pmap_segtab *ci_pmap_segtabs[2];
 #define	ci_pmap_kern_segtab	ci_pmap_segtabs[0]
 #define	ci_pmap_user_segtab	ci_pmap_segtabs[1]
@@ -370,6 +371,7 @@
 
 vaddr_t	cpu_lwp_pc(struct lwp *);
 
+void	cpu_ast(struct lwp *, struct cpu_info *);
 void *	cpu_uarea_alloc(bool);
 bool	cpu_uarea_free(void *);
 void	cpu_need_resched(struct cpu_info *, int);

Index: src/sys/arch/powerpc/powerpc/powerpc_machdep.c
diff -u src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.56 src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.57
--- src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.56	Mon Jun 20 08:47:13 2011
+++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c	Tue Jun 21 06:32:36 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: powerpc_machdep.c,v 1.56 2011/06/20 08:47:13 matt Exp $	*/
+/*	$NetBSD: powerpc_machdep.c,v 1.57 2011/06/21 06:32:36 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: powerpc_machdep.c,v 1.56 2011/06/20 08:47:13 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: powerpc_machdep.c,v 1.57 2011/06/21 06:32:36 matt Exp $);
 
 #include opt_altivec.h
 #include opt_modular.h
@@ -68,6 +68,10 @@
 #include powerpc/altivec.h
 #endif
 
+#ifdef MULTIPROCESOR
+#include powerpc/pic/ipivar.h
+#endif
+
 int cpu_timebase;
 int cpu_printfataltraps = 1;
 #if !defined(PPC_IBM4XX)
@@ -367,6 +371,22 @@
 }
 
 void
+cpu_ast(struct lwp *l, struct cpu_info *ci)
+{
+	l-l_md.md_astpending = 0;	/* we are about to do it */
+
+	if (l-l_pflag  LP_OWEUPC) {
+		l-l_pflag = ~LP_OWEUPC;
+		ADDUPROF(l);
+	}
+
+	/* Check whether we are being preempted. */
+	if (ci-ci_want_resched) {
+		preempt();
+	}
+}
+
+void
 cpu_need_resched(struct cpu_info *ci, int flags)
 {
 	struct lwp * const l = ci-ci_data.cpu_onproc;

CVS commit: src/sys/arch/powerpc

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jun 21 06:38:51 UTC 2011

Modified Files:
src/sys/arch/powerpc/booke: trap.c
src/sys/arch/powerpc/ibm4xx: trap.c
src/sys/arch/powerpc/powerpc: trap.c

Log Message:
Switch to use new common cpu_ast routine.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/booke/trap.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/powerpc/ibm4xx/trap.c
cvs rdiff -u -r1.143 -r1.144 src/sys/arch/powerpc/powerpc/trap.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/powerpc/booke/trap.c
diff -u src/sys/arch/powerpc/booke/trap.c:1.11 src/sys/arch/powerpc/booke/trap.c:1.12
--- src/sys/arch/powerpc/booke/trap.c:1.11	Mon Jun 20 20:24:28 2011
+++ src/sys/arch/powerpc/booke/trap.c	Tue Jun 21 06:38:50 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.11 2011/06/20 20:24:28 matt Exp $	*/
+/*	$NetBSD: trap.c,v 1.12 2011/06/21 06:38:50 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -39,7 +39,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: trap.c,v 1.11 2011/06/20 20:24:28 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: trap.c,v 1.12 2011/06/21 06:38:50 matt Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -793,15 +793,7 @@
 		break;
 	case T_AST:
 		KASSERT(usertrap);
-		l-l_md.md_astpending = 0;	/* we are about to do it */
-		ci-ci_data.cpu_nsoft++;
-		if (l-l_pflag  LP_OWEUPC) {
-			l-l_pflag = ~LP_OWEUPC;
-			ADDUPROF(l);
-		}
-		/* Check whether we are being preempted. */
-		if (ci-ci_want_resched)
-			preempt();
+		cpu_ast(l, ci);
 		if (tf-tf_fixreg[1]  0x8000) {
 			printf(%s(ast-exit): pid %d.%d (%s): invalid sp %#lx\n,
 			__func__, p-p_pid, l-l_lid, p-p_comm,

Index: src/sys/arch/powerpc/ibm4xx/trap.c
diff -u src/sys/arch/powerpc/ibm4xx/trap.c:1.61 src/sys/arch/powerpc/ibm4xx/trap.c:1.62
--- src/sys/arch/powerpc/ibm4xx/trap.c:1.61	Sat Jun 18 06:41:41 2011
+++ src/sys/arch/powerpc/ibm4xx/trap.c	Tue Jun 21 06:38:50 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.61 2011/06/18 06:41:41 matt Exp $	*/
+/*	$NetBSD: trap.c,v 1.62 2011/06/21 06:38:50 matt Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.61 2011/06/18 06:41:41 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.62 2011/06/21 06:38:50 matt Exp $);
 
 #include opt_altivec.h
 #include opt_ddb.h
@@ -297,18 +297,9 @@
 		break;
 
 	case EXC_AST|EXC_USER:
-		l-l_md.md_astpending = 0;	/* we are about to do it */
-		//curcpu()-ci_data.cpu_nast++;
-		if (l-l_pflag  LP_OWEUPC) {
-			l-l_pflag = ~LP_OWEUPC;
-			ADDUPROF(l);
-		}
-		/* Check whether we are being preempted. */
-		if (curcpu()-ci_want_resched)
-			preempt();
+		cpu_ast(l, curcpu());
 		break;
 
-
 	case EXC_ALI|EXC_USER:
 		if (fix_unaligned(l, tf) != 0) {
 			KSI_INIT_TRAP(ksi);

Index: src/sys/arch/powerpc/powerpc/trap.c
diff -u src/sys/arch/powerpc/powerpc/trap.c:1.143 src/sys/arch/powerpc/powerpc/trap.c:1.144
--- src/sys/arch/powerpc/powerpc/trap.c:1.143	Mon Jun 20 05:59:06 2011
+++ src/sys/arch/powerpc/powerpc/trap.c	Tue Jun 21 06:38:50 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.143 2011/06/20 05:59:06 matt Exp $	*/
+/*	$NetBSD: trap.c,v 1.144 2011/06/21 06:38:50 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.143 2011/06/20 05:59:06 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.144 2011/06/21 06:38:50 matt Exp $);
 
 #include opt_altivec.h
 #include opt_ddb.h
@@ -345,15 +345,7 @@
 		break;
 
 	case EXC_AST|EXC_USER:
-		l-l_md.md_astpending = 0;	/* we are about to do it */
-		//ci-ci_data.cpu_nast++;
-		if (l-l_pflag  LP_OWEUPC) {
-			l-l_pflag = ~LP_OWEUPC;
-			ADDUPROF(l);
-		}
-		/* Check whether we are being preempted. */
-		if (ci-ci_want_resched)
-			preempt();
+		cpu_ast(l, ci);
 		break;
 
 	case EXC_ALI|EXC_USER:

CVS commit: src/sys/common/pmap/tlb

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jun 21 06:43:38 UTC 2011

Modified Files:
src/sys/common/pmap/tlb: pmap_segtab.c

Log Message:
Add #define __PMAP_PRIVATE


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/common/pmap/tlb/pmap_segtab.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/common/pmap/tlb/pmap_segtab.c
diff -u src/sys/common/pmap/tlb/pmap_segtab.c:1.2 src/sys/common/pmap/tlb/pmap_segtab.c:1.3
--- src/sys/common/pmap/tlb/pmap_segtab.c:1.2	Tue Jan 18 01:11:50 2011
+++ src/sys/common/pmap/tlb/pmap_segtab.c	Tue Jun 21 06:43:38 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_segtab.c,v 1.2 2011/01/18 01:11:50 matt Exp $	*/
+/*	$NetBSD: pmap_segtab.c,v 1.3 2011/06/21 06:43:38 matt Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(0, $NetBSD: pmap_segtab.c,v 1.2 2011/01/18 01:11:50 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_segtab.c,v 1.3 2011/06/21 06:43:38 matt Exp $);
 
 /*
  *	Manages physical address maps.
@@ -95,6 +95,8 @@
  *	and to when physical maps must be made correct.
  */
 
+#define __PMAP_PRIVATE
+
 #include sys/param.h
 #include sys/systm.h
 #include sys/proc.h

CVS commit: src/external/gpl3/gcc/dist/gcc/config

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 06:54:27 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/gcc/config: netbsd.h

Log Message:
pull across these revisions from gcc 4.1:

revision 1.9
date: 2011/04/15 13:42:22;  author: joerg;  state: Exp;  lines: +2 -1
Move the headers for compiler and platform specific intrinsincs from
/usr/include to /usr/include/gcc-4.1.

revision 1.8
date: 2011/04/10 21:25:56;  author: joerg;  state: Exp;  lines: +1 -0
Add back a stylish new line.

revision 1.7
date: 2011/04/10 16:50:18;  author: joerg;  state: Exp;  lines: +20 -12
Reduce difference between src/tools/gcc and src/gnu/usr.bin/gcc4
configuration. All but the target to helper programs should be the same.
Mark include directories as sysroot-relative.

adjust the paths to gcc-4.5, and add an XXX note about this ugliness.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/netbsd.h

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.2 src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.3
--- src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.2	Tue Jun 21 02:41:36 2011
+++ src/external/gpl3/gcc/dist/gcc/config/netbsd.h	Tue Jun 21 06:54:27 2011
@@ -37,9 +37,13 @@
 
 /* NETBSD_NATIVE is defined when gcc is integrated into the NetBSD
source tree so it can be configured appropriately without using
-   the GNU configure/build mechanism.  */
+   the GNU configure/build mechanism.
 
-#ifdef NETBSD_NATIVE
+   NETBSD_TOOLS is defined when gcc is built as cross-compiler for
+   the in-tree toolchain.
+ */
+
+#if defined(NETBSD_NATIVE) || defined(NETBSD_TOOLS)
 
 /* Look for the include files in the system-defined places.  */
 
@@ -49,29 +53,38 @@
 #undef GPLUSPLUS_BACKWARD_INCLUDE_DIR
 #define GPLUSPLUS_BACKWARD_INCLUDE_DIR /usr/include/g++/backward
 
+/*
+ * XXX figure out a better way to do this
+ */
 #undef GCC_INCLUDE_DIR
-#define GCC_INCLUDE_DIR /usr/include
+#define GCC_INCLUDE_DIR /usr/include/gcc-4.5
 
 #undef INCLUDE_DEFAULTS
 #define INCLUDE_DEFAULTS\
   {			\
-{ GPLUSPLUS_INCLUDE_DIR, G++, 1, 1 },		\
-{ GPLUSPLUS_BACKWARD_INCLUDE_DIR, G++, 1, 1 },	\
-{ GCC_INCLUDE_DIR, GCC, 0, 0 },			\
+{ GPLUSPLUS_INCLUDE_DIR, G++, 1, 1, 1 },		\
+{ GPLUSPLUS_BACKWARD_INCLUDE_DIR, G++, 1, 1, 1 },	\
+{ GCC_INCLUDE_DIR, GCC, 0, 0, 1 },		\
+{ /usr/include, GCC, 0, 0, 1 },			\
 { 0, 0, 0, 0 }	\
   }
 
-/* Under NetBSD, the normal location of the compiler back ends is the
-   /usr/libexec directory.  */
-
-#undef STANDARD_EXEC_PREFIX
-#define STANDARD_EXEC_PREFIX		/usr/libexec/
-
 /* Under NetBSD, the normal location of the various *crt*.o files is the
/usr/lib directory.  */
 
 #undef STANDARD_STARTFILE_PREFIX
 #define STANDARD_STARTFILE_PREFIX	/usr/lib/
+#undef STANDARD_STARTFILE_PREFIX_1
+#define STANDARD_STARTFILE_PREFIX_1	/usr/lib/
+
+#endif /* NETBSD_NATIVE || NETBSD_TOOLS */
+
+#if defined(NETBSD_NATIVE)
+/* Under NetBSD, the normal location of the compiler back ends is the
+   /usr/libexec directory.  */
+
+#undef STANDARD_EXEC_PREFIX
+#define STANDARD_EXEC_PREFIX		/usr/libexec/
 
 #undef TOOLDIR_BASE_PREFIX
 #define TOOLDIR_BASE_PREFIX		/usr/

CVS commit: src/sys/sys

[Cherry G. Mathew]

Module Name:src
Committed By:   cherry
Date:   Tue Jun 21 07:20:57 UTC 2011

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

Log Message:
#include sys/proc.h before using struct proc.p_timerpend


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/sys/userret.h

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

Modified files:

Index: src/sys/sys/userret.h
diff -u src/sys/sys/userret.h:1.23 src/sys/sys/userret.h:1.24
--- src/sys/sys/userret.h:1.23	Fri Apr  8 10:36:58 2011
+++ src/sys/sys/userret.h	Tue Jun 21 07:20:56 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: userret.h,v 1.23 2011/04/08 10:36:58 yamt Exp $	*/
+/*	$NetBSD: userret.h,v 1.24 2011/06/21 07:20:56 cherry Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2003, 2006, 2008 The NetBSD Foundation, Inc.
@@ -66,6 +66,7 @@
 #define	_SYS_USERRET_H_
 
 #include sys/lockdebug.h
+#include sys/userret.h
 #include sys/intr.h
 
 /*

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 07:28:44 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc

Log Message:
pull across these revisions from gcc 4.1:

revision 1.21
date: 2011/01/23 06:29:52;  author: matt;  state: Exp;  lines: +1 -1
Default mips64 to softfloat.

revision 1.22
date: 2011/02/10 07:18:29;  author: matt;  state: Exp;  lines: +3 -0
Default NetBSD to -msecure-plt now.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config.gcc

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.2 src/external/gpl3/gcc/dist/gcc/config.gcc:1.3
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.2	Tue Jun 21 02:41:36 2011
+++ src/external/gpl3/gcc/dist/gcc/config.gcc	Tue Jun 21 07:28:44 2011
@@ -1749,7 +1749,7 @@
 	esac
 	;;
 mips64*-*-netbsd*)			# NetBSD/mips64, either endian.
-	target_cpu_default=MASK_ABICALLS|MASK_64BIT|MASK_FLOAT64
+	target_cpu_default=MASK_ABICALLS|MASK_64BIT|MASK_FLOAT64|MASK_SOFT_FLOAT
 	tm_file=elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h mips/netbsd64.h
 	tmake_file=${tmake_file} mips/t-netbsd64
 #	tm_defines=${tm_defines} MIPS_ISA_DEFAULT=64
@@ -1986,6 +1986,9 @@
 	tmake_file=${tmake_file} rs6000/t-netbsd
 	;;
 	esac
+	if test x${enable_secureplt} != xno; then
+	  tm_file=rs6000/secureplt.h ${tm_file}
+	fi
 	extra_options=${extra_options} rs6000/sysv4.opt rs6000/linux64.opt
 	;;
 powerpc-*-eabispe*)

CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 07:31:13 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd.h

Log Message:
pull across these revisions from gcc 4.1:

revision 1.8
date: 2011/06/11 00:57:29;  author: matt;  state: Exp;  lines: +2 -0
If we are compiling -msoft-float, define _SOFT_FLOAT

revision 1.7
date: 2011/03/12 07:57:38;  author: matt;  state: Exp;  lines: +3 -1
Define HAVE_AS_TLS until our build tools figure out how to do it.

revision 1.6
date: 2011/02/25 22:36:10;  author: matt;  state: Exp;  lines: +7 -0
Explicitly make sure TARGET_SECURE_PLT is defined correctly rather than
relying on HAVE_AS_REL16 from auto-host.h.

revision 1.5
date: 2011/02/10 07:18:29;  author: matt;  state: Exp;  lines: +3 -0
Default NetBSD to -msecure-plt now.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.2 src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.3
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.2	Tue Jun 21 02:41:37 2011
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h	Tue Jun 21 07:31:13 2011
@@ -43,6 +43,10 @@
   builtin_define (__powerpc__);		\
   builtin_assert (cpu=powerpc);		\
   builtin_assert (machine=powerpc);	\
+  if (TARGET_SECURE_PLT)			\
+builtin_define (_SECURE_PLT);		\
+  if (TARGET_SOFT_FLOAT)			\
+builtin_define (_SOFT_FLOAT);		\
 }		\
   while (0)
 
@@ -109,6 +113,7 @@
 
 #undef  SUBTARGET_EXTRA_SPECS
 #define SUBTARGET_EXTRA_SPECS	\
+  { cc1_secure_plt_default,	CC1_SECURE_PLT_DEFAULT_SPEC },	\
   { netbsd_link_spec,		NETBSD_LINK_SPEC_ELF },		\
   { netbsd_entry_point,	NETBSD_ENTRY_POINT },		\
   { netbsd_endfile_spec,	NETBSD_ENDFILE_SPEC },
@@ -119,6 +124,15 @@
 #undef TARGET_DEFAULT
 #define TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS | MASK_STRICT_ALIGN)
 
+/*
+ * We know we have the right binutils for this (we shouldn't need to do this
+ * but until the cross build does the right thing...)
+ */
+#undef TARGET_SECURE_PLT
+#define TARGET_SECURE_PLT secure_plt
+#undef HAVE_AS_TLS
+#define HAVE_AS_TLS 1
+
 /* Attempt to enable execute permissions on the stack.  */
 #define TRANSFER_FROM_TRAMPOLINE NETBSD_ENABLE_EXECUTE_STACK
 #ifdef L_trampoline

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 09:34:55 UTC 2011

Modified Files:
src/external/bsd/libpcap/dist: scanner.l

Log Message:
this needs %option noinput.  thanks to martin.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/scanner.l

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

Modified files:

Index: src/external/bsd/libpcap/dist/scanner.l
diff -u src/external/bsd/libpcap/dist/scanner.l:1.2 src/external/bsd/libpcap/dist/scanner.l:1.3
--- src/external/bsd/libpcap/dist/scanner.l:1.2	Sun Dec  5 01:45:46 2010
+++ src/external/bsd/libpcap/dist/scanner.l	Tue Jun 21 09:34:54 2011
@@ -185,6 +185,7 @@
 
 
 %option nounput
+%option noinput
 
 %%
 dst		return DST;

CVS commit: src/lib/librmt

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 09:35:23 UTC 2011

Modified Files:
src/lib/librmt: rmtlib.c

Log Message:
add a missing  to a string literal in some #if'd out code that GCC 4.5 found.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/lib/librmt/rmtlib.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/librmt/rmtlib.c
diff -u src/lib/librmt/rmtlib.c:1.24 src/lib/librmt/rmtlib.c:1.25
--- src/lib/librmt/rmtlib.c:1.24	Tue May 31 12:24:33 2011
+++ src/lib/librmt/rmtlib.c	Tue Jun 21 09:35:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rmtlib.c,v 1.24 2011/05/31 12:24:33 christos Exp $	*/
+/*	$NetBSD: rmtlib.c,v 1.25 2011/06/21 09:35:23 mrg Exp $	*/
 
 /*
  *	rmt --- remote tape emulator subroutines
@@ -28,7 +28,7 @@
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: rmtlib.c,v 1.24 2011/05/31 12:24:33 christos Exp $);
+__RCSID($NetBSD: rmtlib.c,v 1.25 2011/06/21 09:35:23 mrg Exp $);
 
 #define RMTIOCTL	1
 /* #define USE_REXEC	1 */	/* rexec code courtesy of Dan Kegel, srs!dan */
@@ -224,7 +224,7 @@
 
 	rexecserv = getservbyname(exec, tcp);
 	if (rexecserv == NULL)
-		errx(1, exec/tcp: service not available.);
+		errx(1, exec/tcp: service not available.);
 	if ((user != NULL)  *user == '\0')
 		user = NULL;
 	return rexec(host, rexecserv-s_port, user, NULL,

CVS commit: src/lib/libc/stdlib

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jun 21 09:36:43 UTC 2011

Modified Files:
src/lib/libc/stdlib: jemalloc.3

Log Message:
Sort sections.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/stdlib/jemalloc.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/stdlib/jemalloc.3
diff -u src/lib/libc/stdlib/jemalloc.3:1.7 src/lib/libc/stdlib/jemalloc.3:1.8
--- src/lib/libc/stdlib/jemalloc.3:1.7	Tue Jun 21 03:02:57 2011
+++ src/lib/libc/stdlib/jemalloc.3	Tue Jun 21 09:36:43 2011
@@ -294,6 +294,28 @@
 There are a number of allocator implementations available on the Internet
 which focus on detecting and pinpointing problems by trading performance for
 extra sanity checks and detailed diagnostics.
+.Sh ENVIRONMENT
+The following environment variables affect the execution of the allocation
+functions:
+.Bl -tag -width .Ev MALLOC_OPTIONS
+.It Ev MALLOC_OPTIONS
+If the environment variable
+.Ev MALLOC_OPTIONS
+is set, the characters it contains will be interpreted as flags to the
+allocation functions.
+.El
+.Sh EXAMPLES
+To dump core whenever a problem occurs:
+.Pp
+.Bd -literal -offset indent
+ln -s 'A' /etc/malloc.conf
+.Ed
+.Pp
+To specify in the source that a program does no return value checking
+on calls to these functions:
+.Bd -literal -offset indent
+_malloc_options = X;
+.Ed
 .Sh DIAGNOSTICS
 If any of the memory allocation/deallocation functions detect an error or
 warning condition, a message will be printed to file descriptor
@@ -319,28 +341,6 @@
 .Pp
 All messages are prefixed by
 .Dq Ao Ar progname Ac Ns Li \: Pq malloc .
-.Sh ENVIRONMENT
-The following environment variables affect the execution of the allocation
-functions:
-.Bl -tag -width .Ev MALLOC_OPTIONS
-.It Ev MALLOC_OPTIONS
-If the environment variable
-.Ev MALLOC_OPTIONS
-is set, the characters it contains will be interpreted as flags to the
-allocation functions.
-.El
-.Sh EXAMPLES
-To dump core whenever a problem occurs:
-.Pp
-.Bd -literal -offset indent
-ln -s 'A' /etc/malloc.conf
-.Ed
-.Pp
-To specify in the source that a program does no return value checking
-on calls to these functions:
-.Bd -literal -offset indent
-_malloc_options = X;
-.Ed
 .Sh SEE ALSO
 .Xr emalloc 3 ,
 .Xr malloc 3 ,

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 09:36:46 UTC 2011

Modified Files:
src/sbin/fsck_lfs: lfs.c
src/usr.sbin/acpitools/aml: aml_parse.c

Log Message:
avoid code that looks like this:
x = x = y;
since GCC 4.5 complains about it having sequence point issues.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_parse.c

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

Modified files:

Index: src/sbin/fsck_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.33 src/sbin/fsck_lfs/lfs.c:1.34
--- src/sbin/fsck_lfs/lfs.c:1.33	Sun Feb 21 16:24:21 2010
+++ src/sbin/fsck_lfs/lfs.c	Tue Jun 21 09:36:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.33 2010/02/21 16:24:21 mlelstv Exp $ */
+/* $NetBSD: lfs.c,v 1.34 2011/06/21 09:36:46 mrg Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -1020,8 +1020,7 @@
 		lastblock,
 		(bpp ? bp : NULL
 return (error);
-			ip-i_ffs1_size = ip-i_ffs1_size =
-			(lastblock + 1) * fs-lfs_bsize;
+			ip-i_ffs1_size = (lastblock + 1) * fs-lfs_bsize;
 			ip-i_flag |= IN_CHANGE | IN_UPDATE;
 			if (bpp)
 (void) VOP_BWRITE(bp);

Index: src/usr.sbin/acpitools/aml/aml_parse.c
diff -u src/usr.sbin/acpitools/aml/aml_parse.c:1.2 src/usr.sbin/acpitools/aml/aml_parse.c:1.3
--- src/usr.sbin/acpitools/aml/aml_parse.c:1.2	Mon May 30 01:15:30 2011
+++ src/usr.sbin/acpitools/aml/aml_parse.c	Tue Jun 21 09:36:46 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: aml_parse.c,v 1.2 2011/05/30 01:15:30 dyoung Exp $	*/
+/*	$NetBSD: aml_parse.c,v 1.3 2011/06/21 09:36:46 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1999 Doug Rabson
@@ -30,7 +30,7 @@
  *	$FreeBSD: src/usr.sbin/acpi/amldb/aml/aml_parse.c,v 1.7 2001/10/23 14:54:15 takawata Exp $
  */
 #include sys/cdefs.h
-__RCSID($NetBSD: aml_parse.c,v 1.2 2011/05/30 01:15:30 dyoung Exp $);
+__RCSID($NetBSD: aml_parse.c,v 1.3 2011/06/21 09:36:46 mrg Exp $);
 
 #include sys/param.h
 
@@ -798,7 +798,7 @@
 	aml_print_namestring(name = aml_parse_namestring(env));
 	fieldtemplate.type = aml_t_field;
 	flags = aml_parse_bytedata(env);
-	fieldtemplate.flags = fieldtemplate.flags = flags;
+	fieldtemplate.flags = flags;
 
 	*copy = *env;
 	env-dp = copy-end = start + pkglength;

CVS commit: src/tools/gcc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 09:37:41 UTC 2011

Modified Files:
src/tools/gcc: Makefile

Log Message:
use --sysroot with GCC 4.5. (maybe could with 4.1 too?  the 4.1 code
here is broken right now, anyway, ever since the sysroot changes were
merged into our tree.)


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/tools/gcc/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/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.37 src/tools/gcc/Makefile:1.38
--- src/tools/gcc/Makefile:1.37	Tue Jun 21 04:11:12 2011
+++ src/tools/gcc/Makefile	Tue Jun 21 09:37:41 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.37 2011/06/21 04:11:12 mrg Exp $
+#	$NetBSD: Makefile,v 1.38 2011/06/21 09:37:41 mrg Exp $
 
 .include bsd.own.mk
 
@@ -98,8 +98,13 @@
 GCCSRCDIR=${.CURDIR}/../../external/gpl3/gcc/dist
 .endif
 
+.if ${HAVE_GCC} = 45
+CXXADDFLAGS=	--sysroot=${DESTDIR}
+CCADDFLAGS=	--sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
+.else
 CXXADDFLAGS=	${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++
 CCADDFLAGS=	${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
+.endif
 
 NEWCONFIGDIR?=	${.CURDIR}/../..
 MKNATIVE?=	${.CURDIR}/mknative-gcc

CVS commit: othersrc/external/bsd/mat/dist

[Thomas Klausner]

Module Name:othersrc
Committed By:   wiz
Date:   Tue Jun 21 09:38:15 UTC 2011

Modified Files:
othersrc/external/bsd/mat/dist: mat.1

Log Message:
Fix typo in option letter.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 othersrc/external/bsd/mat/dist/mat.1

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

Modified files:

Index: othersrc/external/bsd/mat/dist/mat.1
diff -u othersrc/external/bsd/mat/dist/mat.1:1.5 othersrc/external/bsd/mat/dist/mat.1:1.6
--- othersrc/external/bsd/mat/dist/mat.1:1.5	Tue Jun 21 04:21:24 2011
+++ othersrc/external/bsd/mat/dist/mat.1	Tue Jun 21 09:38:15 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: mat.1,v 1.5 2011/06/21 04:21:24 agc Exp $
+.\ $NetBSD: mat.1,v 1.6 2011/06/21 09:38:15 wiz Exp $
 .\
 .\ Copyright (c) 2011 Alistair Crooks a...@netbsd.org
 .\ All rights reserved.
@@ -56,7 +56,7 @@
 perform an initial
 .Xr chdir 2
 into the specified directory before attempting to resolve any filenames.
-.It Fl c
+.It Fl a
 audit the contents of the archive against the installed versions of the file system.
 The output is the same as would be output using the
 .Fl t

CVS commit: src/sys/dev/acpi

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Tue Jun 21 09:49:05 UTC 2011

Modified Files:
src/sys/dev/acpi: acpi_fan.c acpi_pmtr.c

Log Message:
Revert the previous commit as it was wrong/redundant.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/acpi_fan.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/acpi_pmtr.c

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

Modified files:

Index: src/sys/dev/acpi/acpi_fan.c
diff -u src/sys/dev/acpi/acpi_fan.c:1.5 src/sys/dev/acpi/acpi_fan.c:1.6
--- src/sys/dev/acpi/acpi_fan.c:1.5	Mon Jun 20 17:21:50 2011
+++ src/sys/dev/acpi/acpi_fan.c	Tue Jun 21 09:49:05 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_fan.c,v 1.5 2011/06/20 17:21:50 pgoyette Exp $ */
+/*	$NetBSD: acpi_fan.c,v 1.6 2011/06/21 09:49:05 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2011 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_fan.c,v 1.5 2011/06/20 17:21:50 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_fan.c,v 1.6 2011/06/21 09:49:05 jruoho Exp $);
 
 #include sys/param.h
 #include sys/module.h
@@ -172,7 +172,6 @@
 
 	acpifan_sensor_state(self);
 	sc-sc_sensor.units = ENVSYS_INDICATOR;
-	sc-sc_sensor.state = ENVSYS_SINVALID;
 
 	(void)strlcpy(sc-sc_sensor.desc, state, sizeof(sc-sc_sensor.desc));
 

Index: src/sys/dev/acpi/acpi_pmtr.c
diff -u src/sys/dev/acpi/acpi_pmtr.c:1.6 src/sys/dev/acpi/acpi_pmtr.c:1.7
--- src/sys/dev/acpi/acpi_pmtr.c:1.6	Tue Jun 21 03:37:21 2011
+++ src/sys/dev/acpi/acpi_pmtr.c	Tue Jun 21 09:49:05 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_pmtr.c,v 1.6 2011/06/21 03:37:21 jruoho Exp $ */
+/*	$NetBSD: acpi_pmtr.c,v 1.7 2011/06/21 09:49:05 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2011 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_pmtr.c,v 1.6 2011/06/21 03:37:21 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_pmtr.c,v 1.7 2011/06/21 09:49:05 jruoho Exp $);
 
 #include sys/param.h
 #include sys/module.h
@@ -338,8 +338,6 @@
 	sc-sc_sensor_o.units = ENVSYS_SWATTS;
 	sc-sc_sensor_i.value_cur = val * 1000;
 	sc-sc_sensor_o.value_cur = val * 1000;
-	sc-sc_sensor_i.state = ENVSYS_SINVALID;
-	sc-sc_sensor_o.state = ENVSYS_SINVALID;
 
 	acpipmtr_sensor_type(self);
 

CVS commit: src/sys/arch/evbarm/gumstix

[KIYOHARA Takashi]

Module Name:src
Committed By:   kiyohara
Date:   Tue Jun 21 11:38:03 UTC 2011

Modified Files:
src/sys/arch/evbarm/gumstix: gxiic.c

Log Message:
Use CFATTACH_DECL_NEW().


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/gumstix/gxiic.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/evbarm/gumstix/gxiic.c
diff -u src/sys/arch/evbarm/gumstix/gxiic.c:1.6 src/sys/arch/evbarm/gumstix/gxiic.c:1.7
--- src/sys/arch/evbarm/gumstix/gxiic.c:1.6	Sun Jun 19 16:16:42 2011
+++ src/sys/arch/evbarm/gumstix/gxiic.c	Tue Jun 21 11:38:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: gxiic.c,v 1.6 2011/06/19 16:16:42 nonaka Exp $ */
+/*	$NetBSD: gxiic.c,v 1.7 2011/06/21 11:38:03 kiyohara Exp $ */
 /*
  * Copyright (c) 2007 KIYOHARA Takashi
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gxiic.c,v 1.6 2011/06/19 16:16:42 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: gxiic.c,v 1.7 2011/06/21 11:38:03 kiyohara Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -58,7 +58,7 @@
 void *, size_t, int);
 
 
-CFATTACH_DECL(gxiic, sizeof(struct gxiic_softc),
+CFATTACH_DECL_NEW(gxiic, sizeof(struct gxiic_softc),
 gxiicmatch, gxiicattach, NULL, NULL);
 
 
@@ -88,6 +88,7 @@
 
 	sc-sc_pxa_i2c.sc_dev = self;
 	sc-sc_pxa_i2c.sc_iot = pxa-pxa_iot;
+	sc-sc_pxa_i2c.sc_addr = pxa-pxa_addr;
 	sc-sc_pxa_i2c.sc_size = pxa-pxa_size;
 	sc-sc_pxa_i2c.sc_flags = 0;
 	if (pxa2x0_i2c_attach_sub(sc-sc_pxa_i2c)) {

CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Tue Jun 21 11:42:20 UTC 2011

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
fix typo.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.12	Thu Apr 28 23:28:11 2011
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile	Tue Jun 21 11:42:20 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2011/04/28 23:28:11 macallan Exp $
+#	$NetBSD: Makefile,v 1.13 2011/06/21 11:42:20 nonaka Exp $
 
 DRIVER=		xf86-input-keyboard
 DRIVER_NAME=	kbd_drv
@@ -6,7 +6,7 @@
 SRCS=		kbd.c bsd_KbdMap.c bsd_kbd.c at_scancode.c
 MAN=		kbd.4
 
-.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64 || ${MACHINE} == Xcats
+.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64 || ${MACHINE} == cats
 CPPFLAGS+=	-DPCVT_SUPPORT
 .endif
 

CVS commit: src/distrib/alpha/instkernel/ramdisk

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Tue Jun 21 11:52:46 UTC 2011

Modified Files:
src/distrib/alpha/instkernel/ramdisk: list

Log Message:
Revert rev 1.42 which is not necessary after rev 1.41.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/distrib/alpha/instkernel/ramdisk/list

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

Modified files:

Index: src/distrib/alpha/instkernel/ramdisk/list
diff -u src/distrib/alpha/instkernel/ramdisk/list:1.42 src/distrib/alpha/instkernel/ramdisk/list:1.43
--- src/distrib/alpha/instkernel/ramdisk/list:1.42	Mon Jun 20 23:00:53 2011
+++ src/distrib/alpha/instkernel/ramdisk/list	Tue Jun 21 11:52:45 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.42 2011/06/20 23:00:53 he Exp $
+#	$NetBSD: list,v 1.43 2011/06/21 11:52:45 tsutsui Exp $
 
 SRCDIRS	bin sbin usr.bin/less usr.bin usr.sbin
 
@@ -60,7 +60,7 @@
 SPECIAL	gzip		srcdir	distrib/utils/x_gzip
 SPECIAL	ping		srcdir	distrib/utils/x_ping
 
-LIBS	-ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lbz2 -llzma -lprop
+LIBS	-ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
 
 # we need the boot blocks /usr/mdec
 COPY	${DESTDIR}/usr/mdec/boot		usr/mdec/boot

CVS commit: src/sys/dev/i2c

[Juergen Hannken-Illjes]

Module Name:src
Committed By:   hannken
Date:   Tue Jun 21 12:38:28 UTC 2011

Modified Files:
src/sys/dev/i2c: ibmhawk.c

Log Message:
Make sure sensor state is valid before calling sysmon_envsys_sensor_attach().

Ok: Paul Goyette pgoye...@netbsd.org


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/ibmhawk.c

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

Modified files:

Index: src/sys/dev/i2c/ibmhawk.c
diff -u src/sys/dev/i2c/ibmhawk.c:1.2 src/sys/dev/i2c/ibmhawk.c:1.3
--- src/sys/dev/i2c/ibmhawk.c:1.2	Mon Feb 14 14:15:25 2011
+++ src/sys/dev/i2c/ibmhawk.c	Tue Jun 21 12:38:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ibmhawk.c,v 1.2 2011/02/14 14:15:25 hannken Exp $ */
+/* $NetBSD: ibmhawk.c,v 1.3 2011/06/21 12:38:27 hannken Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -313,9 +313,6 @@
 			ibmhawk_normalize(sd-ihs_warnmax, dp-units);
 			dp-flags |= ENVSYS_FMONLIMITS;
 		}
-		if (sysmon_envsys_sensor_attach(sc-sc_sme, dp))
-			aprint_error_dev(sc-sc_dev,
-			failed to attach \%s\\n, dp-desc);
 	}
 
 	if (valid) {
@@ -323,6 +320,12 @@
 		dp-state = ENVSYS_SVALID;
 	} else
 		dp-state = ENVSYS_SINVALID;
+
+	if (create) {
+		if (sysmon_envsys_sensor_attach(sc-sc_sme, dp))
+			aprint_error_dev(sc-sc_dev,
+			failed to attach \%s\\n, dp-desc);
+	}
 }
 
 static void

CVS commit: othersrc/external/bsd/hashtree/dist

[Thomas Klausner]

Module Name:othersrc
Committed By:   wiz
Date:   Tue Jun 21 15:40:22 UTC 2011

Modified Files:
othersrc/external/bsd/hashtree/dist: hashtree.1

Log Message:
Fix a typo. Markup nit. Remove trailing whitespace, and uncustomary dot at end 
of SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/hashtree/dist/hashtree.1

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

Modified files:

Index: othersrc/external/bsd/hashtree/dist/hashtree.1
diff -u othersrc/external/bsd/hashtree/dist/hashtree.1:1.1.1.1 othersrc/external/bsd/hashtree/dist/hashtree.1:1.2
--- othersrc/external/bsd/hashtree/dist/hashtree.1:1.1.1.1	Tue Jun 21 14:51:37 2011
+++ othersrc/external/bsd/hashtree/dist/hashtree.1	Tue Jun 21 15:40:22 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: hashtree.1,v 1.1.1.1 2011/06/21 14:51:37 agc Exp $
+.\ $NetBSD: hashtree.1,v 1.2 2011/06/21 15:40:22 wiz Exp $
 .\
 .\ Copyright (c) 2011 Alistair Crooks a...@netbsd.org
 .\ All rights reserved.
@@ -56,7 +56,7 @@
 .Dv level
 of digests,
 a further set of digests is calculated on the first set of digests,
-thereby forming a pyranmid of digests.
+thereby forming a pyramid of digests.
 This process stops when there is only one digest in a level.
 .Pp
 The resulting complete digest is output with the first level at
@@ -90,14 +90,16 @@
 .Dv md5 ,
 .Dv rmd160 ,
 .Dv sha256 ,
-.Dv sha1 , and
+.Dv sha1 ,
+and
 .Dv md5 .
 In addition,
 HMAC sums can be specified: possible values are:
 .Dv hmacsha1 ,
 .Dv hmacrmd160 ,
 .Dv hmacsha256 ,
-.Dv hmacsha1 , and
+.Dv hmacsha1 ,
+and
 .Dv hmacmd5 .
 .Pp
 The following options are available:
@@ -140,7 +142,7 @@
 .Bd -literal
 % hashtree -n 1 dist/hashtree.c
 HASHTREE/sha1/1/10358/10358 (dist/hashtree.c) = 253f185d39783fd29ca6a7936fee4b50e3775f39
-% sha1 dist/hashtree.c 
+% sha1 dist/hashtree.c
 SHA1 (dist/hashtree.c) = 253f185d39783fd29ca6a7936fee4b50e3775f39
 % hashtree dist/hashtree.c
 HASHTREE/sha1/2/10358/1024 (dist/hashtree.c) = 6a765d5809534fa75fd2f4f2f88168e65cb1182f91ac14db77b0052ae083743c10ed0ccea98ebf44a945eb72ee0303a8b5b89a2a590ec2e684418942bae3e0be34567bd12721167239fdf641c24ec51b59426924a32760adf11370aca375d60a97364613f93e1e44f848a3557c141b7422aa7e63fef99ff4e056124513c228c9a33e0dff08e6baa2903f959f428dd60f9a6390b0d4108d0826713d33ab6e5520fe20e61ac700659eb5e6a1cf5653da05d65c0d792cd3affaadd037372cfbf7085e14caea50dd89e2790cd982824fec985e2a97fcbbc415e91c27dc4f3089ec446784262269677aa1736fba2e5a768114
@@ -157,7 +159,7 @@
 .Xr rmd160 3 ,
 .Xr sha1 3 ,
 .Xr sha256 3 ,
-.Xr sha512 3 .
+.Xr sha512 3
 .Sh HISTORY
 The
 .Nm

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

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Tue Jun 21 17:17:27 UTC 2011

Modified Files:
src/sys/arch/zaurus/dev: zkbd.c zlcd.c zlcdvar.h

Log Message:
use pmf_event_inject() instead of call lcd_blank() directly.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/zaurus/dev/zkbd.c \
src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/dev/zlcdvar.h

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

Modified files:

Index: src/sys/arch/zaurus/dev/zkbd.c
diff -u src/sys/arch/zaurus/dev/zkbd.c:1.12 src/sys/arch/zaurus/dev/zkbd.c:1.13
--- src/sys/arch/zaurus/dev/zkbd.c:1.12	Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zkbd.c	Tue Jun 21 17:17:27 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zkbd.c,v 1.12 2011/06/19 16:20:09 nonaka Exp $	*/
+/*	$NetBSD: zkbd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $	*/
 /* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zkbd.c,v 1.12 2011/06/19 16:20:09 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zkbd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $);
 
 #include opt_wsdisplay_compat.h
 #if 0	/* XXX */
@@ -44,7 +44,6 @@
 
 #include zaurus/zaurus/zaurus_var.h
 #include zaurus/dev/zkbdmap.h
-#include zaurus/dev/zlcdvar.h
 
 static const int gpio_sense_pins_c3000[] = {
 	12,
@@ -299,11 +298,10 @@
 {
 	struct zkbd_softc *sc = (struct zkbd_softc *)v;
 	int i, j, col, pin, type, keysdown = 0;
-	int stuck;
 	int keystate;
 	int s;
 #ifdef WSDISPLAY_COMPAT_RAWKBD
-	int npress = 0, ncbuf = 0, c;
+	int npress = 0, ncbuf = 0;
 	char cbuf[MAXKEYS * 2];
 #endif
 
@@ -374,7 +372,7 @@
 		(sc-sc_keystate[14] ? (1  2) : 0)); /* 'alt' */
 
 	for (i = 0; i  sc-sc_nsense * sc-sc_nstrobe; i++) {
-		stuck = 0;
+		int stuck = 0;
 		/* extend  xt_keymap to do this faster. */
 		/* ignore 'stuck' keys' */
 		for (j = 0; j  __arraycount(stuck_keys); j++) {
@@ -390,9 +388,9 @@
 		keysdown |= keystate; /* if any keys held */
 
 #ifdef WSDISPLAY_COMPAT_RAWKBD
-		if (sc-sc_polling == 0  sc-sc_rawkbd) {
-			if ((keystate) || (sc-sc_okeystate[i] != keystate)) {
-c = sc-sc_xt_keymap[i];
+		if (!sc-sc_polling  sc-sc_rawkbd) {
+			if (keystate || sc-sc_okeystate[i] != keystate) {
+int c = sc-sc_xt_keymap[i];
 if (c  0x80) {
 	cbuf[ncbuf++] = 0xe0;
 }
@@ -412,7 +410,7 @@
 		}
 #endif
 
-		if ((!sc-sc_rawkbd)  (sc-sc_okeystate[i] != keystate)) {
+		if (!sc-sc_rawkbd  (sc-sc_okeystate[i] != keystate)) {
 			type = keystate ? WSCONS_EVENT_KEY_DOWN :
 			WSCONS_EVENT_KEY_UP;
 
@@ -428,7 +426,7 @@
 	}
 
 #ifdef WSDISPLAY_COMPAT_RAWKBD
-	if (sc-sc_polling == 0  sc-sc_rawkbd) {
+	if (!sc-sc_polling  sc-sc_rawkbd) {
 		wskbd_rawinput(sc-sc_wskbddev, cbuf, ncbuf);
 		sc-sc_nrep = npress;
 		if (npress != 0)
@@ -513,9 +511,9 @@
 		if (lid_suspend)
 			apm_suspends++;
 #endif
-		lcd_blank(1);
+		pmf_event_inject(NULL, PMFE_DISPLAY_OFF);
 	} else {
-		lcd_blank(0);
+		pmf_event_inject(NULL, PMFE_DISPLAY_ON);
 	}
 
 	return 1;
Index: src/sys/arch/zaurus/dev/zlcd.c
diff -u src/sys/arch/zaurus/dev/zlcd.c:1.12 src/sys/arch/zaurus/dev/zlcd.c:1.13
--- src/sys/arch/zaurus/dev/zlcd.c:1.12	Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zlcd.c	Tue Jun 21 17:17:27 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zlcd.c,v 1.12 2011/06/19 16:20:09 nonaka Exp $	*/
+/*	$NetBSD: zlcd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod Exp $	*/
 /* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */
 
@@ -43,7 +43,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.12 2011/06/19 16:20:09 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -169,6 +169,7 @@
 static void	lcd_set_brightness_internal(int);
 static int	lcd_get_backlight(void);
 static void	lcd_set_backlight(int);
+static void	lcd_blank(int);
 
 static int
 lcd_match(device_t parent, cfdata_t cf, void *aux)
@@ -266,14 +267,12 @@
 {
 
 	lcd_blank(0);
-	lcd_set_backlight(1);
 }
 
 static void
 lcd_display_off(device_t dv)
 {
 
-	lcd_set_backlight(0);
 	lcd_blank(1);
 }
 
@@ -501,7 +500,7 @@
 	else if (newval  maxval)
 		newval = maxval;
 
-	if (lcd_get_backlight()  !lcdisblank)
+	if (lcdislit  !lcdisblank)
 		lcd_set_brightness_internal(newval);
 
 	if (newval  0)
@@ -565,7 +564,7 @@
 	}
 }
 
-void
+static void
 lcd_blank(int blank)
 {
 

Index: src/sys/arch/zaurus/dev/zlcdvar.h
diff -u src/sys/arch/zaurus/dev/zlcdvar.h:1.1 src/sys/arch/zaurus/dev/zlcdvar.h:1.2
--- src/sys/arch/zaurus/dev/zlcdvar.h:1.1	Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zlcdvar.h	Tue Jun 21 17:17:27 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zlcdvar.h,v 1.1 2011/06/19 16:20:09 nonaka Exp $	*/
+/*	$NetBSD: zlcdvar.h,v 1.2 2011/06/21 17:17:27 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD 

CVS commit: src/sys/sys

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jun 21 17:28:11 UTC 2011

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

Log Message:
The referred-to comment was moved to vfs_vnode.c; update the pointer.


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

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

Modified files:

Index: src/sys/sys/vnode.h
diff -u src/sys/sys/vnode.h:1.231 src/sys/sys/vnode.h:1.232
--- src/sys/sys/vnode.h:1.231	Sun Jun 12 03:36:00 2011
+++ src/sys/sys/vnode.h	Tue Jun 21 17:28:11 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnode.h,v 1.231 2011/06/12 03:36:00 rmind Exp $	*/
+/*	$NetBSD: vnode.h,v 1.232 2011/06/21 17:28:11 riz Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -228,7 +228,7 @@
 #define	VSIZENOTSET	((voff_t)-1)
 
 /*
- * v_usecount; see the comment in vfs_subr.c
+ * v_usecount; see the comment near the top of vfs_vnode.c
  */
 #define	VC_XLOCK	0x8000
 #define	VC_MASK		0x7fff

CVS commit: src/sys/arch/powerpc/pic

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Tue Jun 21 18:02:43 UTC 2011

Modified Files:
src/sys/arch/powerpc/pic: intr.c

Log Message:
Make it compile when PIC_DEBUG is defined.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/pic/intr.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/powerpc/pic/intr.c
diff -u src/sys/arch/powerpc/pic/intr.c:1.16 src/sys/arch/powerpc/pic/intr.c:1.17
--- src/sys/arch/powerpc/pic/intr.c:1.16	Mon Jun 20 06:23:52 2011
+++ src/sys/arch/powerpc/pic/intr.c	Tue Jun 21 18:02:43 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.16 2011/06/20 06:23:52 matt Exp $ */
+/*	$NetBSD: intr.c,v 1.17 2011/06/21 18:02:43 rjs Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.16 2011/06/20 06:23:52 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.17 2011/06/21 18:02:43 rjs Exp $);
 
 #include opt_interrupt.h
 #include opt_multiprocessor.h
@@ -319,7 +319,7 @@
 	is-is_pic = pic;
 	virq_map[hwirq] = virq;
 #ifdef PIC_DEBUG
-	printf(mapping hwirq %d to virq %d\n, irq, virq);
+	printf(mapping hwirq %d to virq %d\n, hwirq, virq);
 #endif
 	return virq;
 }

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

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Tue Jun 21 18:13:20 UTC 2011

Modified Files:
src/sys/arch/zaurus/dev: zkbd.c zlcd.c zlcdvar.h

Log Message:
backout previous.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/zaurus/dev/zkbd.c \
src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/dev/zlcdvar.h

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

Modified files:

Index: src/sys/arch/zaurus/dev/zkbd.c
diff -u src/sys/arch/zaurus/dev/zkbd.c:1.13 src/sys/arch/zaurus/dev/zkbd.c:1.14
--- src/sys/arch/zaurus/dev/zkbd.c:1.13	Tue Jun 21 17:17:27 2011
+++ src/sys/arch/zaurus/dev/zkbd.c	Tue Jun 21 18:13:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zkbd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $	*/
+/*	$NetBSD: zkbd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $	*/
 /* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zkbd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zkbd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $);
 
 #include opt_wsdisplay_compat.h
 #if 0	/* XXX */
@@ -44,6 +44,7 @@
 
 #include zaurus/zaurus/zaurus_var.h
 #include zaurus/dev/zkbdmap.h
+#include zaurus/dev/zlcdvar.h
 
 static const int gpio_sense_pins_c3000[] = {
 	12,
@@ -298,10 +299,11 @@
 {
 	struct zkbd_softc *sc = (struct zkbd_softc *)v;
 	int i, j, col, pin, type, keysdown = 0;
+	int stuck;
 	int keystate;
 	int s;
 #ifdef WSDISPLAY_COMPAT_RAWKBD
-	int npress = 0, ncbuf = 0;
+	int npress = 0, ncbuf = 0, c;
 	char cbuf[MAXKEYS * 2];
 #endif
 
@@ -372,7 +374,7 @@
 		(sc-sc_keystate[14] ? (1  2) : 0)); /* 'alt' */
 
 	for (i = 0; i  sc-sc_nsense * sc-sc_nstrobe; i++) {
-		int stuck = 0;
+		stuck = 0;
 		/* extend  xt_keymap to do this faster. */
 		/* ignore 'stuck' keys' */
 		for (j = 0; j  __arraycount(stuck_keys); j++) {
@@ -388,9 +390,9 @@
 		keysdown |= keystate; /* if any keys held */
 
 #ifdef WSDISPLAY_COMPAT_RAWKBD
-		if (!sc-sc_polling  sc-sc_rawkbd) {
-			if (keystate || sc-sc_okeystate[i] != keystate) {
-int c = sc-sc_xt_keymap[i];
+		if (sc-sc_polling == 0  sc-sc_rawkbd) {
+			if ((keystate) || (sc-sc_okeystate[i] != keystate)) {
+c = sc-sc_xt_keymap[i];
 if (c  0x80) {
 	cbuf[ncbuf++] = 0xe0;
 }
@@ -410,7 +412,7 @@
 		}
 #endif
 
-		if (!sc-sc_rawkbd  (sc-sc_okeystate[i] != keystate)) {
+		if ((!sc-sc_rawkbd)  (sc-sc_okeystate[i] != keystate)) {
 			type = keystate ? WSCONS_EVENT_KEY_DOWN :
 			WSCONS_EVENT_KEY_UP;
 
@@ -426,7 +428,7 @@
 	}
 
 #ifdef WSDISPLAY_COMPAT_RAWKBD
-	if (!sc-sc_polling  sc-sc_rawkbd) {
+	if (sc-sc_polling == 0  sc-sc_rawkbd) {
 		wskbd_rawinput(sc-sc_wskbddev, cbuf, ncbuf);
 		sc-sc_nrep = npress;
 		if (npress != 0)
@@ -511,9 +513,9 @@
 		if (lid_suspend)
 			apm_suspends++;
 #endif
-		pmf_event_inject(NULL, PMFE_DISPLAY_OFF);
+		lcd_blank(1);
 	} else {
-		pmf_event_inject(NULL, PMFE_DISPLAY_ON);
+		lcd_blank(0);
 	}
 
 	return 1;
Index: src/sys/arch/zaurus/dev/zlcd.c
diff -u src/sys/arch/zaurus/dev/zlcd.c:1.13 src/sys/arch/zaurus/dev/zlcd.c:1.14
--- src/sys/arch/zaurus/dev/zlcd.c:1.13	Tue Jun 21 17:17:27 2011
+++ src/sys/arch/zaurus/dev/zlcd.c	Tue Jun 21 18:13:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zlcd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $	*/
+/*	$NetBSD: zlcd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod Exp $	*/
 /* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */
 
@@ -43,7 +43,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -169,7 +169,6 @@
 static void	lcd_set_brightness_internal(int);
 static int	lcd_get_backlight(void);
 static void	lcd_set_backlight(int);
-static void	lcd_blank(int);
 
 static int
 lcd_match(device_t parent, cfdata_t cf, void *aux)
@@ -267,12 +266,14 @@
 {
 
 	lcd_blank(0);
+	lcd_set_backlight(1);
 }
 
 static void
 lcd_display_off(device_t dv)
 {
 
+	lcd_set_backlight(0);
 	lcd_blank(1);
 }
 
@@ -500,7 +501,7 @@
 	else if (newval  maxval)
 		newval = maxval;
 
-	if (lcdislit  !lcdisblank)
+	if (lcd_get_backlight()  !lcdisblank)
 		lcd_set_brightness_internal(newval);
 
 	if (newval  0)
@@ -564,7 +565,7 @@
 	}
 }
 
-static void
+void
 lcd_blank(int blank)
 {
 

Index: src/sys/arch/zaurus/dev/zlcdvar.h
diff -u src/sys/arch/zaurus/dev/zlcdvar.h:1.2 src/sys/arch/zaurus/dev/zlcdvar.h:1.3
--- src/sys/arch/zaurus/dev/zlcdvar.h:1.2	Tue Jun 21 17:17:27 2011
+++ src/sys/arch/zaurus/dev/zlcdvar.h	Tue Jun 21 18:13:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zlcdvar.h,v 1.2 2011/06/21 17:17:27 nonaka Exp $	*/
+/*	$NetBSD: zlcdvar.h,v 1.3 2011/06/21 18:13:19 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,6 +32,13 @@
 #ifndef	

CVS commit: src/usr.bin/netstat

[Mihai Chelaru]

Module Name:src
Committed By:   kefren
Date:   Tue Jun 21 19:46:36 UTC 2011

Modified Files:
src/usr.bin/netstat: netstat.1

Log Message:
add a sentence regarding multiple tags


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/usr.bin/netstat/netstat.1

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/netstat/netstat.1
diff -u src/usr.bin/netstat/netstat.1:1.59 src/usr.bin/netstat/netstat.1:1.60
--- src/usr.bin/netstat/netstat.1:1.59	Mon Dec  6 09:28:38 2010
+++ src/usr.bin/netstat/netstat.1	Tue Jun 21 19:46:36 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: netstat.1,v 1.59 2010/12/06 09:28:38 pooka Exp $
+.\	$NetBSD: netstat.1,v 1.60 2011/06/21 19:46:36 kefren Exp $
 .\
 .\ Copyright (c) 1983, 1990, 1992, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -268,7 +268,8 @@
 Show per-protocol statistics.
 If this option is repeated, counters with a value of zero are suppressed.
 .It Fl T
-Show MPLS Tags for the routing tables.
+Show MPLS Tags for the routing tables. If multiple tags exists, they will
+be comma separated, first tag being the BoS one.
 .It Fl v
 Show extra (verbose) detail for the routing tables
 .Pq Fl r ,

CVS commit: src/usr.bin/netstat

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jun 21 20:51:27 UTC 2011

Modified Files:
src/usr.bin/netstat: netstat.1

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/netstat/netstat.1

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/netstat/netstat.1
diff -u src/usr.bin/netstat/netstat.1:1.60 src/usr.bin/netstat/netstat.1:1.61
--- src/usr.bin/netstat/netstat.1:1.60	Tue Jun 21 19:46:36 2011
+++ src/usr.bin/netstat/netstat.1	Tue Jun 21 20:51:27 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: netstat.1,v 1.60 2011/06/21 19:46:36 kefren Exp $
+.\	$NetBSD: netstat.1,v 1.61 2011/06/21 20:51:27 wiz Exp $
 .\
 .\ Copyright (c) 1983, 1990, 1992, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -268,7 +268,8 @@
 Show per-protocol statistics.
 If this option is repeated, counters with a value of zero are suppressed.
 .It Fl T
-Show MPLS Tags for the routing tables. If multiple tags exists, they will
+Show MPLS Tags for the routing tables.
+If multiple tags exists, they will
 be comma separated, first tag being the BoS one.
 .It Fl v
 Show extra (verbose) detail for the routing tables

CVS commit: src/distrib

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Tue Jun 21 21:49:23 UTC 2011

Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/i386/cdroms: Makefile.cdrom

Log Message:
Include liblzma to unbreak gzip on the install CD.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.25 -r1.26 src/distrib/i386/cdroms/Makefile.cdrom

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

Modified files:

Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.5 src/distrib/amd64/cdroms/Makefile.cdrom:1.6
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.5	Sat Jun 18 14:47:36 2011
+++ src/distrib/amd64/cdroms/Makefile.cdrom	Tue Jun 21 21:49:22 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.5 2011/06/18 14:47:36 joerg Exp $
+# $NetBSD: Makefile.cdrom,v 1.6 2011/06/21 21:49:22 joerg Exp $
 
 .include bsd.own.mk
 
@@ -43,6 +43,7 @@
 CDRUNTIME+=	./usr/lib/libgcc_s.so*
 CDRUNTIME+=	./usr/lib/libintl.so*
 CDRUNTIME+=	./usr/lib/libkvm.so*
+CDRUNTIME+=	./usr/lib/liblzma.so*
 CDRUNTIME+=	./usr/lib/libterminfo.so*
 CDRUNTIME+=	./usr/lib/libutil.so*
 CDRUNTIME+=	./usr/lib/libz.so*

Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.25 src/distrib/i386/cdroms/Makefile.cdrom:1.26
--- src/distrib/i386/cdroms/Makefile.cdrom:1.25	Sat Jun 18 14:47:36 2011
+++ src/distrib/i386/cdroms/Makefile.cdrom	Tue Jun 21 21:49:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.25 2011/06/18 14:47:36 joerg Exp $
+# $NetBSD: Makefile.cdrom,v 1.26 2011/06/21 21:49:23 joerg Exp $
 
 .include bsd.own.mk
 
@@ -43,6 +43,7 @@
 CDRUNTIME+=	./usr/lib/libgcc_s.so*
 CDRUNTIME+=	./usr/lib/libintl.so*
 CDRUNTIME+=	./usr/lib/libkvm.so*
+CDRUNTIME+=	./usr/lib/liblzma.so*
 CDRUNTIME+=	./usr/lib/libterminfo.so*
 CDRUNTIME+=	./usr/lib/libutil.so*
 CDRUNTIME+=	./usr/lib/libz.so*

CVS commit: src/lib/libm/arch/i387

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Tue Jun 21 21:52:49 UTC 2011

Modified Files:
src/lib/libm/arch/i387: s_copysignf.S

Log Message:
Actually used SSE branch. Noticed by enami@


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libm/arch/i387/s_copysignf.S

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

Modified files:

Index: src/lib/libm/arch/i387/s_copysignf.S
diff -u src/lib/libm/arch/i387/s_copysignf.S:1.6 src/lib/libm/arch/i387/s_copysignf.S:1.7
--- src/lib/libm/arch/i387/s_copysignf.S:1.6	Sat Jun 18 20:49:26 2011
+++ src/lib/libm/arch/i387/s_copysignf.S	Tue Jun 21 21:52:49 2011
@@ -9,7 +9,7 @@
  * XXXfvdl split this file.
  */
 
-RCSID($NetBSD: s_copysignf.S,v 1.6 2011/06/18 20:49:26 joerg Exp $)
+RCSID($NetBSD: s_copysignf.S,v 1.7 2011/06/21 21:52:49 joerg Exp $)
 
 #ifdef __x86_64__
 .Lneg:
@@ -28,14 +28,10 @@
 	movl	%eax,4(%esp)
 	flds	4(%esp)
 #else
-	movss	%xmm0,-4(%rsp)
-	movss	%xmm1,-8(%rsp)
-	movl	-8(%rsp),%edx
-	andl	$0x8000,%edx
-	movl	-4(%rsp),%eax
-	andl	$0x7fff,%eax
-	orl	%edx,%eax
-	movl	%eax,-4(%rsp)
-	movss	-4(%rsp),%xmm0
+	movss	.Lpos(%rip),%xmm2
+	movss	.Lneg(%rip),%xmm3
+	pand	%xmm2,%xmm1
+	pand	%xmm3,%xmm0
+	por	%xmm1,%xmm0
 #endif
 	ret

CVS commit: othersrc/external/bsd/iscsi/sbin/iscsid

[Jeff Rizzo]

Module Name:othersrc
Committed By:   riz
Date:   Tue Jun 21 22:48:57 UTC 2011

Modified Files:
othersrc/external/bsd/iscsi/sbin/iscsid: iscsid_targets.c

Log Message:
Take the sizeof the *correct* structure.  Now iscsid returns sensible
data to iscsictl that the display code can display (more) sensibly.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c

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

Modified files:

Index: othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c
diff -u othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c:1.1.1.1 othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c:1.2
--- othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c:1.1.1.1	Mon May  2 07:01:08 2011
+++ othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c	Tue Jun 21 22:48:56 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: iscsid_targets.c,v 1.1.1.1 2011/05/02 07:01:08 agc Exp $	*/
+/*	$NetBSD: iscsid_targets.c,v 1.2 2011/06/21 22:48:56 riz Exp $	*/
 
 /*-
  * Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -364,7 +364,7 @@
 			sizeof(target-entry.sid.name));
 	}
 
-	rsp = make_rsp(sizeof(*rsp) + (par-num_portals * sizeof(uint32_t)),
+	rsp = make_rsp(sizeof(*res) + (par-num_portals * sizeof(uint32_t)),
 			prsp, prsp_temp);
 	if (rsp == NULL)
 		return;
@@ -539,7 +539,7 @@
 	} else if (par-list_kind != SEND_TARGETS_LIST) {
 		num = target-num_portals;
 	}
-	rsp = make_rsp(sizeof(*rsp) + (num - 1) * sizeof(uint32_t),
+	rsp = make_rsp(sizeof(*res) + (num - 1) * sizeof(uint32_t),
 			prsp, prsp_temp);
 	if (rsp == NULL)
 		return;
@@ -615,7 +615,7 @@
 	}
 	portal-options = par-options;
 
-	rsp = make_rsp(sizeof(*rsp), prsp, prsp_temp);
+	rsp = make_rsp(sizeof(*res), prsp, prsp_temp);
 	if (rsp == NULL)
 		return;
 
@@ -661,7 +661,7 @@
 		return;
 	}
 
-	rsp = make_rsp(sizeof(*rsp), prsp, prsp_temp);
+	rsp = make_rsp(sizeof(*res), prsp, prsp_temp);
 	if (rsp == NULL)
 		return;
 

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 02:49:45 UTC 2011

Modified Files:
src/bin/ksh: Makefile
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssl/bin: Makefile
src/external/bsd/am-utils/bin/amd: Makefile
src/external/bsd/am-utils/bin/hlfsd: Makefile
src/external/bsd/iscsi/initiator: Makefile
src/external/bsd/mdocml/lib/libmandoc: Makefile
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/bsd/ntp/lib/libiscntp: Makefile
src/external/bsd/tcpdump/bin: Makefile
src/games/hack: Makefile
src/lib/libc/rpc: Makefile.inc
src/libexec/ftpd: Makefile
src/regress/sys/kern/getcwd: Makefile
src/sbin/dump_lfs: Makefile
src/sbin/fsdb: Makefile
src/sbin/ifconfig: Makefile
src/sbin/mount_smbfs: Makefile
src/sbin/ping6: Makefile
src/sys/arch/i386/stand/lib: Makefile
src/usr.bin/cap_mkdb: Makefile
src/usr.bin/ftp: Makefile
src/usr.bin/make: Makefile
src/usr.bin/midiplay: Makefile
src/usr.bin/sdpquery: Makefile
src/usr.sbin/altq/libaltq: Makefile
src/usr.sbin/dhcp/omshell: Makefile
src/usr.sbin/fwctl: Makefile
src/usr.sbin/installboot: Makefile
src/usr.sbin/iopctl: Makefile
src/usr.sbin/mlxctl: Makefile
src/usr.sbin/mopd/common: Makefile

Log Message:
apply some -Wno-error and/or -fno-strict-aliasing.

all of this should be looked at closer, but some of them are not
very trivial.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/bin/ksh/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/bin/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/am-utils/bin/amd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/am-utils/bin/hlfsd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/iscsi/initiator/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/mdocml/lib/libmandoc/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ntp/lib/libiscntp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.42 -r1.43 src/games/hack/Makefile
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/rpc/Makefile.inc
cvs rdiff -u -r1.61 -r1.62 src/libexec/ftpd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/regress/sys/kern/getcwd/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sbin/dump_lfs/Makefile
cvs rdiff -u -r1.29 -r1.30 src/sbin/fsdb/Makefile
cvs rdiff -u -r1.50 -r1.51 src/sbin/ifconfig/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sbin/mount_smbfs/Makefile
cvs rdiff -u -r1.12 -r1.13 src/sbin/ping6/Makefile
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/stand/lib/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/cap_mkdb/Makefile
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/ftp/Makefile
cvs rdiff -u -r1.53 -r1.54 src/usr.bin/make/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/midiplay/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/sdpquery/Makefile
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/altq/libaltq/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/dhcp/omshell/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/fwctl/Makefile
cvs rdiff -u -r1.44 -r1.45 src/usr.sbin/installboot/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/iopctl/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/mlxctl/Makefile
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/mopd/common/Makefile

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

Modified files:

Index: src/bin/ksh/Makefile
diff -u src/bin/ksh/Makefile:1.27 src/bin/ksh/Makefile:1.28
--- src/bin/ksh/Makefile:1.27	Thu May 26 12:56:24 2011
+++ src/bin/ksh/Makefile	Wed Jun 22 02:49:41 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2011/05/26 12:56:24 joerg Exp $
+#	$NetBSD: Makefile,v 1.28 2011/06/22 02:49:41 mrg Exp $
 
 WARNS=3
 
@@ -50,3 +50,8 @@
 CWARNFLAGS.clang+=	-Wno-format-security
 
 .include bsd.prog.mk
+
+# XXX
+.if ${HAVE_GCC} == 45
+COPTS.eval.c+=	-Wno-error
+.endif

Index: src/crypto/external/bsd/openssh/bin/ssh/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.5 src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.6
--- src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.5	Mon Jun 20 07:43:56 2011
+++ src/crypto/external/bsd/openssh/bin/ssh/Makefile	Wed Jun 22 02:49:42 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2011/06/20 07:43:56 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2011/06/22 02:49:42 mrg Exp $
 
 .include bsd.own.mk
 
@@ -36,3 +36,8 @@
 .endif
 
 .include bsd.prog.mk
+
+# XXX
+.if ${HAVE_GCC} == 45
+COPTS.clientloop.c+= -Wno-error
+.endif

Index: src/crypto/external/bsd/openssl/bin/Makefile
diff -u src/crypto/external/bsd/openssl/bin/Makefile:1.3 src/crypto/external/bsd/openssl/bin/Makefile:1.4
--- src/crypto/external/bsd/openssl/bin/Makefile:1.3	Mon Jun  6 13:43:48 2011
+++ 

CVS commit: src/bin/ksh

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 03:56:17 UTC 2011

Modified Files:
src/bin/ksh: vi.c

Log Message:
add a missing part from rev 1.10 and s/newline/newlinex/.  found by GCC 4.5.3.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/bin/ksh/vi.c

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

Modified files:

Index: src/bin/ksh/vi.c
diff -u src/bin/ksh/vi.c:1.11 src/bin/ksh/vi.c:1.12
--- src/bin/ksh/vi.c:1.11	Sat Apr 25 05:11:37 2009
+++ src/bin/ksh/vi.c	Wed Jun 22 03:56:17 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vi.c,v 1.11 2009/04/25 05:11:37 lukem Exp $	*/
+/*	$NetBSD: vi.c,v 1.12 2011/06/22 03:56:17 mrg Exp $	*/
 
 /*
  *	vi command editing
@@ -9,7 +9,7 @@
 #include sys/cdefs.h
 
 #ifndef lint
-__RCSID($NetBSD: vi.c,v 1.11 2009/04/25 05:11:37 lukem Exp $);
+__RCSID($NetBSD: vi.c,v 1.12 2011/06/22 03:56:17 mrg Exp $);
 #endif
 
 #include config.h
@@ -1763,7 +1763,7 @@
 	int newlinex;
 {
 	(void) memset(wbuf[win], ' ', wbuf_len);
-	if (newline) {
+	if (newlinex) {
 		x_putc('\r');
 		x_putc('\n');
 	}

CVS commit: src/dist/nvi/ex

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 03:57:47 UTC 2011

Modified Files:
src/dist/nvi/ex: ex_cscope.c

Log Message:
initialise from_cs[1] instead of from_cs[0] twice.  from GCC 4.5.3.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/dist/nvi/ex/ex_cscope.c

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

Modified files:

Index: src/dist/nvi/ex/ex_cscope.c
diff -u src/dist/nvi/ex/ex_cscope.c:1.7 src/dist/nvi/ex/ex_cscope.c:1.8
--- src/dist/nvi/ex/ex_cscope.c:1.7	Mon Mar 21 14:53:03 2011
+++ src/dist/nvi/ex/ex_cscope.c	Wed Jun 22 03:57:46 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ex_cscope.c,v 1.7 2011/03/21 14:53:03 tnozaki Exp $ */
+/*	$NetBSD: ex_cscope.c,v 1.8 2011/06/22 03:57:46 mrg Exp $ */
 
 /*-
  * Copyright (c) 1994, 1996
@@ -379,7 +379,7 @@
 	 * Cscope reads from to_cs[0] and writes to from_cs[1]; vi reads from
 	 * from_cs[0] and writes to to_cs[1].
 	 */
-	to_cs[0] = to_cs[1] = from_cs[0] = from_cs[0] = -1;
+	to_cs[0] = to_cs[1] = from_cs[0] = from_cs[1] = -1;
 	if (pipe(to_cs)  0 || pipe(from_cs)  0) {
 		msgq(sp, M_SYSERR, pipe);
 		goto err;

CVS commit: src/external/bsd/am-utils/dist/hlfsd

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 03:58:24 UTC 2011

Modified Files:
src/external/bsd/am-utils/dist/hlfsd: homedir.c

Log Message:
remove an always true test found by GCC 4.5.3.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/am-utils/dist/hlfsd/homedir.c

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

Modified files:

Index: src/external/bsd/am-utils/dist/hlfsd/homedir.c
diff -u src/external/bsd/am-utils/dist/hlfsd/homedir.c:1.1.1.2 src/external/bsd/am-utils/dist/hlfsd/homedir.c:1.2
--- src/external/bsd/am-utils/dist/hlfsd/homedir.c:1.1.1.2	Fri Mar 20 20:26:55 2009
+++ src/external/bsd/am-utils/dist/hlfsd/homedir.c	Wed Jun 22 03:58:24 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: homedir.c,v 1.1.1.2 2009/03/20 20:26:55 christos Exp $	*/
+/*	$NetBSD: homedir.c,v 1.2 2011/06/22 03:58:24 mrg Exp $	*/
 
 /*
  * Copyright (c) 1997-2009 Erez Zadok
@@ -498,7 +498,7 @@
   buf[0] = '\0';
   fgets(buf, 256, passwd_fp);
   passwd_line++;
-  if (!buf || buf[0] == '\0')
+  if (buf[0] == '\0')
 goto readent;
 
   /* read user name */

CVS commit: src/external/bsd/am-utils/dist

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 03:58:52 UTC 2011

Modified Files:
src/external/bsd/am-utils/dist/amd: conf_tok.l sun_map_tok.l
src/external/bsd/am-utils/dist/fsinfo: fsi_lex.l

Log Message:
use %option noinput since we need it.  found by GCC 4.5.3.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/am-utils/dist/amd/conf_tok.l \
src/external/bsd/am-utils/dist/amd/sun_map_tok.l
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/am-utils/dist/fsinfo/fsi_lex.l

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

Modified files:

Index: src/external/bsd/am-utils/dist/amd/conf_tok.l
diff -u src/external/bsd/am-utils/dist/amd/conf_tok.l:1.3 src/external/bsd/am-utils/dist/amd/conf_tok.l:1.4
--- src/external/bsd/am-utils/dist/amd/conf_tok.l:1.3	Fri Mar 20 20:30:52 2009
+++ src/external/bsd/am-utils/dist/amd/conf_tok.l	Wed Jun 22 03:58:51 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf_tok.l,v 1.3 2009/03/20 20:30:52 christos Exp $	*/
+/*	$NetBSD: conf_tok.l,v 1.4 2011/06/22 03:58:51 mrg Exp $	*/
 
 %{
 /*
@@ -110,6 +110,7 @@
 /* This option causes Solaris lex to fail.  Use flex.  See BUGS file */
 /* no need to use yyunput() */
 %option nounput
+%option noinput
 
 /* allocate more output slots so lex scanners don't run out of mem */
 %o 1024
Index: src/external/bsd/am-utils/dist/amd/sun_map_tok.l
diff -u src/external/bsd/am-utils/dist/amd/sun_map_tok.l:1.3 src/external/bsd/am-utils/dist/amd/sun_map_tok.l:1.4
--- src/external/bsd/am-utils/dist/amd/sun_map_tok.l:1.3	Fri Mar 20 20:30:52 2009
+++ src/external/bsd/am-utils/dist/amd/sun_map_tok.l	Wed Jun 22 03:58:52 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: sun_map_tok.l,v 1.3 2009/03/20 20:30:52 christos Exp $	*/
+/*	$NetBSD: sun_map_tok.l,v 1.4 2011/06/22 03:58:52 mrg Exp $	*/
 
 %{
 /*
@@ -145,6 +145,7 @@
 /* This option causes Solaris lex to fail.  Use flex.  See BUGS file */
 /* no need to use yyunput() */
 %option nounput
+%option noinput
 
 /* allocate more output slots so lex scanners don't run out of mem */
 %o 1024

Index: src/external/bsd/am-utils/dist/fsinfo/fsi_lex.l
diff -u src/external/bsd/am-utils/dist/fsinfo/fsi_lex.l:1.3 src/external/bsd/am-utils/dist/fsinfo/fsi_lex.l:1.4
--- src/external/bsd/am-utils/dist/fsinfo/fsi_lex.l:1.3	Fri Mar 20 20:30:52 2009
+++ src/external/bsd/am-utils/dist/fsinfo/fsi_lex.l	Wed Jun 22 03:58:52 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: fsi_lex.l,v 1.3 2009/03/20 20:30:52 christos Exp $	*/
+/*	$NetBSD: fsi_lex.l,v 1.4 2011/06/22 03:58:52 mrg Exp $	*/
 
 %{
 /*
@@ -166,6 +166,7 @@
 /* This option causes Solaris lex to fail.  Use flex.  See BUGS file */
 /* no need to use yyunput() */
 %option nounput
+%option noinput
 
 /* allocate more output slots so lex scanners don't run out of mem */
 %o 1024

CVS commit: src/external/bsd/ntp/dist/ntpd

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 03:59:50 UTC 2011

Modified Files:
src/external/bsd/ntp/dist/ntpd: refclock_parse.c

Log Message:
fix a potential off-by-two array overflow found by GCC 4.5.3.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/ntpd/refclock_parse.c

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

Modified files:

Index: src/external/bsd/ntp/dist/ntpd/refclock_parse.c
diff -u src/external/bsd/ntp/dist/ntpd/refclock_parse.c:1.3 src/external/bsd/ntp/dist/ntpd/refclock_parse.c:1.4
--- src/external/bsd/ntp/dist/ntpd/refclock_parse.c:1.3	Sat Dec  4 23:08:35 2010
+++ src/external/bsd/ntp/dist/ntpd/refclock_parse.c	Wed Jun 22 03:59:49 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: refclock_parse.c,v 1.3 2010/12/04 23:08:35 christos Exp $	*/
+/*	$NetBSD: refclock_parse.c,v 1.4 2011/06/22 03:59:49 mrg Exp $	*/
 
 /*
  * /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.81 2009/05/01 10:15:29 kardel RELEASE_20090105_A
@@ -2455,7 +2455,7 @@
 		{
 			if (buffer[0])
 strncat(buffer, ; , size);
-			strncat(buffer, flagstrings[i].name, size);
+			strncat(buffer, flagstrings[i].name, size - 2);
 		}
 		i++;
 	}

CVS commit: src/sys/arch/vax/include

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 04:00:43 UTC 2011

Modified Files:
src/sys/arch/vax/include: stdarg.h

Log Message:
deal with __builtin_va_start()'s introduction.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/include/stdarg.h

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

Modified files:

Index: src/sys/arch/vax/include/stdarg.h
diff -u src/sys/arch/vax/include/stdarg.h:1.17 src/sys/arch/vax/include/stdarg.h:1.18
--- src/sys/arch/vax/include/stdarg.h:1.17	Sun Dec 11 12:19:34 2005
+++ src/sys/arch/vax/include/stdarg.h	Wed Jun 22 04:00:43 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdarg.h,v 1.17 2005/12/11 12:19:34 christos Exp $	*/
+/*	$NetBSD: stdarg.h,v 1.18 2011/06/22 04:00:43 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -44,7 +44,11 @@
 #endif
 
 #if __GNUC_PREREQ__(2, 96)
+#if __GNUC_PREREQ__(4, 5)
+#define	va_start(ap, last)	__builtin_va_start((ap), (last))
+#else
 #define	va_start(ap, last)	__builtin_stdarg_start((ap), (last))
+#endif
 #define	va_arg			__builtin_va_arg
 #define	va_end			__builtin_va_end
 #define	__va_copy(dest, src)	__builtin_va_copy((dest), (src))

CVS commit: src/sys/rump/net/lib/libvirtif

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 04:01:09 UTC 2011

Modified Files:
src/sys/rump/net/lib/libvirtif: if_virt.c

Log Message:
fix an operator precedence error picked up by GCC 4.5.3.  real bug.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/rump/net/lib/libvirtif/if_virt.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/rump/net/lib/libvirtif/if_virt.c
diff -u src/sys/rump/net/lib/libvirtif/if_virt.c:1.22 src/sys/rump/net/lib/libvirtif/if_virt.c:1.23
--- src/sys/rump/net/lib/libvirtif/if_virt.c:1.22	Wed Dec  1 15:13:24 2010
+++ src/sys/rump/net/lib/libvirtif/if_virt.c	Wed Jun 22 04:01:08 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_virt.c,v 1.22 2010/12/01 15:13:24 pooka Exp $	*/
+/*	$NetBSD: if_virt.c,v 1.23 2011/06/22 04:01:08 mrg Exp $	*/
 
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_virt.c,v 1.22 2010/12/01 15:13:24 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_virt.c,v 1.23 2011/06/22 04:01:08 mrg Exp $);
 
 #include sys/param.h
 #include sys/condvar.h
@@ -319,7 +319,7 @@
 	mutex_enter(sc-sc_mtx);
 	KERNEL_LOCK(1, NULL);
 	while (!sc-sc_dying) {
-		if (!ifp-if_flags  IFF_RUNNING) {
+		if (!(ifp-if_flags  IFF_RUNNING)) {
 			cv_wait(sc-sc_cv, sc-sc_mtx);
 			continue;
 		}

CVS commit: src/sys/ufs/ffs

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 04:01:33 UTC 2011

Modified Files:
src/sys/ufs/ffs: ffs_appleufs.c

Log Message:
fix an off by one array overflow found by GCC 4.5.3.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/ufs/ffs/ffs_appleufs.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/ufs/ffs/ffs_appleufs.c
diff -u src/sys/ufs/ffs/ffs_appleufs.c:1.10 src/sys/ufs/ffs/ffs_appleufs.c:1.11
--- src/sys/ufs/ffs/ffs_appleufs.c:1.10	Sat Apr 24 19:58:13 2010
+++ src/sys/ufs/ffs/ffs_appleufs.c	Wed Jun 22 04:01:33 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_appleufs.c,v 1.10 2010/04/24 19:58:13 dbj Exp $	*/
+/*	$NetBSD: ffs_appleufs.c,v 1.11 2011/06/22 04:01:33 mrg Exp $	*/
 
 /*
  * Copyright (c) 2002 Darrin B. Jewell
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_appleufs.c,v 1.10 2010/04/24 19:58:13 dbj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_appleufs.c,v 1.11 2011/06/22 04:01:33 mrg Exp $);
 
 #include sys/param.h
 #include sys/time.h
@@ -108,7 +108,7 @@
 		n-ul_namelen = APPLEUFS_MAX_LABEL_NAME;
 	}
 	/* if len is max, will set ul_unused1 */
-	n-ul_name[n-ul_namelen] = '\0';
+	n-ul_name[n-ul_namelen - 1] = '\0';
 
 #ifdef DEBUG
 	printf(%s: found APPLE UFS label v%d: \%s\\n,

CVS commit: src/usr.sbin/mrinfo

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 04:02:47 UTC 2011

Modified Files:
src/usr.sbin/mrinfo: mrinfo.c

Log Message:
fix the length argument to a memcpy() to refer to the size of the
destination, not the size of the pointer.  real bug on 64 bit platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/mrinfo/mrinfo.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.sbin/mrinfo/mrinfo.c
diff -u src/usr.sbin/mrinfo/mrinfo.c:1.27 src/usr.sbin/mrinfo/mrinfo.c:1.28
--- src/usr.sbin/mrinfo/mrinfo.c:1.27	Fri Apr 17 14:07:45 2009
+++ src/usr.sbin/mrinfo/mrinfo.c	Wed Jun 22 04:02:46 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mrinfo.c,v 1.27 2009/04/17 14:07:45 lukem Exp $	*/
+/*	$NetBSD: mrinfo.c,v 1.28 2011/06/22 04:02:46 mrg Exp $	*/
 
 /*
  * This tool requests configuration info from a multicast router
@@ -80,7 +80,7 @@
 static char rcsid[] =
 @(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp (LBL);
 #else
-__RCSID($NetBSD: mrinfo.c,v 1.27 2009/04/17 14:07:45 lukem Exp $);
+__RCSID($NetBSD: mrinfo.c,v 1.28 2011/06/22 04:02:46 mrg Exp $);
 #endif
 #endif
 
@@ -373,7 +373,7 @@
 		hp-h_addr_list[0] = malloc(hp-h_length);
 		if (hp-h_addr_list[0] == NULL)
 			logit(LOG_ERR, errno, malloc);
-		memcpy(hp-h_addr_list[0], target_addr, sizeof(hp-h_addr_list[0]));
+		memcpy(hp-h_addr_list[0], target_addr, hp-h_length);
 		hp-h_addr_list[1] = NULL;
 	} else
 		hp = gethostbyname(host);

CVS commit: src/usr.sbin/puffs

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 04:03:24 UTC 2011

Modified Files:
src/usr.sbin/puffs/mount_9p: fs.c
src/usr.sbin/puffs/mount_psshfs: fs.c

Log Message:
remove some always true if () checks GCC 4.5.3 picks up.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/puffs/mount_9p/fs.c
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/puffs/mount_psshfs/fs.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.sbin/puffs/mount_9p/fs.c
diff -u src/usr.sbin/puffs/mount_9p/fs.c:1.8 src/usr.sbin/puffs/mount_9p/fs.c:1.9
--- src/usr.sbin/puffs/mount_9p/fs.c:1.8	Sun Aug 24 18:26:05 2008
+++ src/usr.sbin/puffs/mount_9p/fs.c	Wed Jun 22 04:03:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: fs.c,v 1.8 2008/08/24 18:26:05 pooka Exp $	*/
+/*	$NetBSD: fs.c,v 1.9 2011/06/22 04:03:23 mrg Exp $	*/
 
 /*
  * Copyright (c) 2007  Antti Kantee.  All Rights Reserved.
@@ -27,7 +27,7 @@
 
 #include sys/cdefs.h
 #ifndef lint
-__RCSID($NetBSD: fs.c,v 1.8 2008/08/24 18:26:05 pooka Exp $);
+__RCSID($NetBSD: fs.c,v 1.9 2011/06/22 04:03:23 mrg Exp $);
 #endif /* !lint */
 
 #include assert.h
@@ -46,7 +46,7 @@
 	puffs_framebuf_seekset(a2, 0);	\
 	*(a4) = 0;			\
 	rv = fname(a1, a2, a3, a4);	\
-	if (rv || a4 == 0) errx(1, p9p_handshake io failed %d, %d, rv, *a4) 
+	if (rv) errx(1, p9p_handshake io failed %d, %d, rv, *a4) 
 
 struct puffs_node *
 p9p_handshake(struct puffs_usermount *pu,

Index: src/usr.sbin/puffs/mount_psshfs/fs.c
diff -u src/usr.sbin/puffs/mount_psshfs/fs.c:1.23 src/usr.sbin/puffs/mount_psshfs/fs.c:1.24
--- src/usr.sbin/puffs/mount_psshfs/fs.c:1.23	Fri Oct 29 16:13:51 2010
+++ src/usr.sbin/puffs/mount_psshfs/fs.c	Wed Jun 22 04:03:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: fs.c,v 1.23 2010/10/29 16:13:51 pooka Exp $	*/
+/*	$NetBSD: fs.c,v 1.24 2011/06/22 04:03:23 mrg Exp $	*/
 
 /*
  * Copyright (c) 2006-2009  Antti Kantee.  All Rights Reserved.
@@ -27,7 +27,7 @@
 
 #include sys/cdefs.h
 #ifndef lint
-__RCSID($NetBSD: fs.c,v 1.23 2010/10/29 16:13:51 pooka Exp $);
+__RCSID($NetBSD: fs.c,v 1.24 2011/06/22 04:03:23 mrg Exp $);
 #endif /* !lint */
 
 #include err.h
@@ -46,7 +46,7 @@
 	puffs_framebuf_seekset(a2, 0);	\
 	*(a4) = 0;			\
 	rv = fname(a1, a2, a3, a4);	\
-	if (rv || a4 == 0) {		\
+	if (rv) {			\
 		return rv ? rv : EPROTO;\
 	}\
 } while (/*CONSTCOND*/0)

CVS commit: src/sbin/route

[Mihai Chelaru]

Module Name:src
Committed By:   kefren
Date:   Wed Jun 22 04:57:28 UTC 2011

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

Log Message:
don't compile tag functions if SMALL is defined. Should fix the build


To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sbin/route/route.c

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

Modified files:

Index: src/sbin/route/route.c
diff -u src/sbin/route/route.c:1.129 src/sbin/route/route.c:1.130
--- src/sbin/route/route.c:1.129	Tue Jun 21 14:33:14 2011
+++ src/sbin/route/route.c	Wed Jun 22 04:57:28 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.129 2011/06/21 14:33:14 kefren Exp $	*/
+/*	$NetBSD: route.c,v 1.130 2011/06/22 04:57:28 kefren Exp $	*/
 
 /*
  * Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = @(#)route.c	8.6 (Berkeley) 4/28/95;
 #else
-__RCSID($NetBSD: route.c,v 1.129 2011/06/21 14:33:14 kefren Exp $);
+__RCSID($NetBSD: route.c,v 1.130 2011/06/22 04:57:28 kefren Exp $);
 #endif
 #endif /* not lint */
 
@@ -1384,6 +1384,7 @@
 	/*NOTREACHED*/
 }
 
+#ifndef SMALL
 static sup
 readtag(sup su, const char *s)
 {
@@ -1433,6 +1434,7 @@
 	ms[where].shim.label = atoi(s);
 	ms[where].s_addr = htonl(ms[where].s_addr);
 }
+#endif	/* SMALL */
 
 int
 prefixlen(const char *s, struct sou *soup)

CVS commit: src/sys/arch/evbppc

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Wed Jun 22 05:08:56 UTC 2011

Modified Files:
src/sys/arch/evbppc/conf: std.pmppc
src/sys/arch/evbppc/include: pmppc_intr.h
src/sys/arch/evbppc/pmppc/dev: mainbus.h

Log Message:
Make pmppc use stock powerpc/pci_machdep.h
Move some private declartions to pmppc/dev/mainbus.h


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/conf/std.pmppc
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/include/pmppc_intr.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/pmppc/dev/mainbus.h

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

Modified files:

Index: src/sys/arch/evbppc/conf/std.pmppc
diff -u src/sys/arch/evbppc/conf/std.pmppc:1.3 src/sys/arch/evbppc/conf/std.pmppc:1.4
--- src/sys/arch/evbppc/conf/std.pmppc:1.3	Tue Jan  8 13:47:49 2008
+++ src/sys/arch/evbppc/conf/std.pmppc	Wed Jun 22 05:08:56 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: std.pmppc,v 1.3 2008/01/08 13:47:49 joerg Exp $
+#	$NetBSD: std.pmppc,v 1.4 2011/06/22 05:08:56 matt Exp $
 #
 # standard, required NetBSD/pmppc 'options'
 
@@ -20,6 +20,6 @@
 makeoptions 	NEED_BINARY=1
 
 options		PPC_INTR_IMPL=machine/pmppc_intr.h
-options		PPC_PCI_MACHDEP_IMPL=machine/pmppc_pci_machdep.h
+options		PPC_PCI_MACHDEP_IMPL=powerpc/pci_machdep.h
 
 include		arch/evbppc/conf/files.pmppc

Index: src/sys/arch/evbppc/include/pmppc_intr.h
diff -u src/sys/arch/evbppc/include/pmppc_intr.h:1.4 src/sys/arch/evbppc/include/pmppc_intr.h:1.5
--- src/sys/arch/evbppc/include/pmppc_intr.h:1.4	Fri Jun 17 23:36:17 2011
+++ src/sys/arch/evbppc/include/pmppc_intr.h	Wed Jun 22 05:08:56 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmppc_intr.h,v 1.4 2011/06/17 23:36:17 matt Exp $	*/
+/*	$NetBSD: pmppc_intr.h,v 1.5 2011/06/22 05:08:56 matt Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 
 #include powerpc/intr.h
 
-#ifndef _LOCORE
+#if !defined(_LOCORE)  !defined(_MODULE)
 
 struct pic_ops *setup_cpc700(void);
 
@@ -46,6 +46,6 @@
 
 #define	LEGAL_HWIRQ_P(x) ((u_int)(x)  ICU_LEN  (ICU_MASK  (0x8000  (x
 
-#endif /* !_LOCORE */
+#endif /* !_LOCORE  !_MODULE */
 
 #endif /* !_PMPPC_INTR_H_ */

Index: src/sys/arch/evbppc/pmppc/dev/mainbus.h
diff -u src/sys/arch/evbppc/pmppc/dev/mainbus.h:1.3 src/sys/arch/evbppc/pmppc/dev/mainbus.h:1.4
--- src/sys/arch/evbppc/pmppc/dev/mainbus.h:1.3	Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbppc/pmppc/dev/mainbus.h	Wed Jun 22 05:08:56 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.h,v 1.3 2008/04/28 20:23:17 martin Exp $	*/
+/*	$NetBSD: mainbus.h,v 1.4 2011/06/22 05:08:56 matt Exp $	*/
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -29,6 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef _PMPPC_DEV_MAINBUS_H_
+#define _PMPPC_DEV_MAINBUS_H_
+
+#include dev/pci/pcivar.h
+#include machine/pci_machdep.h
+
 struct mainbus_attach_args {
 	const char *mb_name;
 	u_long mb_addr;
@@ -46,3 +52,10 @@
 
 extern struct powerpc_bus_space pmppc_mem_tag;
 extern struct powerpc_bus_space pmppc_pci_io_tag;
+extern struct powerpc_bus_dma_tag pci_bus_dma_tag;
+
+int pmppc_pci_intr_map(const struct pci_attach_args *, pci_intr_handle_t *);
+void pmppc_pci_conf_interrupt(pci_chipset_tag_t, int, int, int, int, int *);
+void pmppc_pci_get_chipset_tag(pci_chipset_tag_t);
+
+#endif /* _PMPPC_DEV_MAINBUS_H_ */

CVS commit: src/sys/arch/evbppc/include

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Wed Jun 22 05:09:25 UTC 2011

Removed Files:
src/sys/arch/evbppc/include: pmppc_pci_machdep.h

Log Message:
This is no longer needed.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r0 src/sys/arch/evbppc/include/pmppc_pci_machdep.h

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

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 05:13:20 UTC 2011

Modified Files:
src: Makefile

Log Message:
fix the parts that build libgcc/crtstuff, etc., for GCC 4.5.


To generate a diff of this commit:
cvs rdiff -u -r1.284 -r1.285 src/Makefile

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

Modified files:

Index: src/Makefile
diff -u src/Makefile:1.284 src/Makefile:1.285
--- src/Makefile:1.284	Mon Jun 20 06:52:36 2011
+++ src/Makefile	Wed Jun 22 05:13:20 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.284 2011/06/20 06:52:36 mrg Exp $
+#	$NetBSD: Makefile,v 1.285 2011/06/22 05:13:20 mrg Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -201,8 +201,12 @@
 .if defined(HAVE_GCC)
 .if ${HAVE_GCC} == 4
 LIBGCC_EXT=4
+BUILD_CC_LIB_BASEDIR= gnu/lib
+BUILD_CC_LIB_BASETARGET= gnu-lib
 .else
-LIBGCC_EXT=45
+LIBGCC_EXT=
+BUILD_CC_LIB_BASEDIR= external/gpl3/gcc/lib
+BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib
 .endif
 .endif
 
@@ -408,10 +412,12 @@
 .endfor
 
 .if defined(HAVE_GCC)
+.if ${HAVE_GCC} != 45	# XXX for now
 .if ${USE_COMPILERCRTSTUFF} == yes
-BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT}
+BUILD_CC_LIB= ${BUILD_CC_LIB_BASEDIR}/crtstuff${LIBGCC_EXT}
 .endif
-BUILD_CC_LIB+= gnu/lib/libgcc${LIBGCC_EXT}
+BUILD_CC_LIB+= ${BUILD_CC_LIB_BASEDIR}/libgcc${LIBGCC_EXT}
+.endif
 .elif defined(HAVE_PCC)
 BUILD_CC_LIB+= external/bsd/pcc/crtstuff
 BUILD_CC_LIB+= external/bsd/pcc/libpcc
@@ -442,22 +448,26 @@
 
 do-libgcc: .PHONY .MAKE
 .if defined(HAVE_GCC)
+.if ${HAVE_GCC} != 45	# XXX for now
 .if ${MKGCC} != no
 .if ${USE_COMPILERCRTSTUFF} == yes
-	${MAKEDIRTARGET} . do-gnu-lib-crtstuff${LIBGCC_EXT}
+	${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}
 .endif
-	${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT}
+	${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT}
 .endif
+.endif
 .endif
 
 do-compat-libgcc: .PHONY .MAKE
 .if defined(HAVE_GCC)
+.if ${HAVE_GCC} != 45	# XXX for now
 .if ${MKGCC} != no
 .if ${USE_COMPILERCRTSTUFF} == yes
-	${MAKEDIRTARGET} . do-compat-gnu-lib-crtstuff${LIBGCC_EXT}
+	${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}
 .endif
-	${MAKEDIRTARGET} . do-compat-gnu-lib-libgcc${LIBGCC_EXT}
+	${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT}
 .endif
+.endif
 .endif
 
 do-libpcc: .PHONY .MAKE

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 05:15:15 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/gcc: gcc.c

Log Message:
port this change from our gcc 4.1 tree.  not entirely sure it's correct
yet, but not yet able to test ...

revision 1.5
date: 2011/04/10 16:50:18;  author: joerg;  state: Exp;  lines: +2 -2
Reduce difference between src/tools/gcc and src/gnu/usr.bin/gcc4
configuration. All but the target to helper programs should be the same.
Mark include directories as sysroot-relative.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/gcc.c

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/gcc.c
diff -u src/external/gpl3/gcc/dist/gcc/gcc.c:1.2 src/external/gpl3/gcc/dist/gcc/gcc.c:1.3
--- src/external/gpl3/gcc/dist/gcc/gcc.c:1.2	Tue Jun 21 02:41:36 2011
+++ src/external/gpl3/gcc/dist/gcc/gcc.c	Wed Jun 22 05:15:15 2011
@@ -7108,15 +7108,18 @@
 			  PREFIX_PRIORITY_LAST, 0, 1);
   else if (*cross_compile == '0')
 	{
+/* XXXMRG not sure this one is right? */
+#if !defined(NETBSD_NATIVE)  !defined(NETBSD_TOOLS)
 	  add_prefix (startfile_prefixes,
 		  concat (gcc_exec_prefix
 			  ? gcc_exec_prefix : standard_exec_prefix,
 			  machine_suffix,
 			  standard_startfile_prefix, NULL),
 		  NULL, PREFIX_PRIORITY_LAST, 0, 1);
+#endif /* NETBSD_NATIVE */
 	}
 
-#ifndef NETBSD_NATIVE
+#if !defined(NETBSD_NATIVE)  !defined(NETBSD_TOOLS)
   /* Sysrooted prefixes are relocated because target_system_root is
 	 also relocated by gcc_exec_prefix.  */
   if (*standard_startfile_prefix_1)

CVS commit: src/lib

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 05:16:37 UTC 2011

Modified Files:
src/lib: Makefile

Log Message:
fix the paths for GCC 4.5.  don't build the non-tools gmp/mpfr/mpc libs
yet since we don't have them fully working.  XXX.


To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/lib/Makefile

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

Modified files:

Index: src/lib/Makefile
diff -u src/lib/Makefile:1.168 src/lib/Makefile:1.169
--- src/lib/Makefile:1.168	Tue Jun 21 04:04:13 2011
+++ src/lib/Makefile	Wed Jun 22 05:16:37 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.168 2011/06/21 04:04:13 mrg Exp $
+#	$NetBSD: Makefile,v 1.169 2011/06/22 05:16:37 mrg Exp $
 #	from: @(#)Makefile	5.25.1.1 (Berkeley) 5/7/91
 
 .include bsd.own.mk
@@ -6,10 +6,18 @@
 SUBDIR=		csu
 
 .if (${MKGCC} != no)
-.if (${USE_COMPILERCRTSTUFF} == yes)
+. if ${HAVE_GCC} == 4
+.  if (${USE_COMPILERCRTSTUFF} == yes)
 SUBDIR+=	../gnu/lib/crtstuff4
-.endif
+.  endif
 SUBDIR+=	../gnu/lib/libgcc4
+. else
+.  if (${USE_COMPILERCRTSTUFF} == yes)
+# XXX not yet
+#SUBDIR+=	../external/gpl3/gcc/lib/crtstuff
+.  endif
+#SUBDIR+=	../external/gpl3/gcc/lib/libgcc
+. endif
 .endif
 
 SUBDIR+=	libc
@@ -70,9 +78,10 @@
 .endif
 
 . if ${HAVE_GCC} = 45
-SUBDIR+=	../external/lgpl3/gmp/lib/libgmp
-SUBDIR+=	../external/lgpl3/mpfr/lib/libmpfr
-SUBDIR+=	../external/lgpl2/mpc/lib/libmpc
+# XXX not yet
+#SUBDIR+=	../external/lgpl3/gmp/lib/libgmp
+#SUBDIR+=	../external/lgpl3/mpfr/lib/libmpfr
+#SUBDIR+=	../external/lgpl2/mpc/lib/libmpc
 .endif
 
 #

CVS commit: src/sbin/scsictl

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 05:18:03 UTC 2011

Modified Files:
src/sbin/scsictl: scsi_sense.c

Log Message:
when checking for SKSV data, use the same test as before.  fixes an
always true conditional GCC 4.5 found, and is also a real bug fix.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/scsictl/scsi_sense.c

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

Modified files:

Index: src/sbin/scsictl/scsi_sense.c
diff -u src/sbin/scsictl/scsi_sense.c:1.8 src/sbin/scsictl/scsi_sense.c:1.9
--- src/sbin/scsictl/scsi_sense.c:1.8	Mon Apr 28 20:23:09 2008
+++ src/sbin/scsictl/scsi_sense.c	Wed Jun 22 05:18:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsi_sense.c,v 1.8 2008/04/28 20:23:09 martin Exp $	*/
+/*	$NetBSD: scsi_sense.c,v 1.9 2011/06/22 05:18:03 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 #include sys/cdefs.h
 
 #ifndef lint
-__RCSID($NetBSD: scsi_sense.c,v 1.8 2008/04/28 20:23:09 martin Exp $);
+__RCSID($NetBSD: scsi_sense.c,v 1.9 2011/06/22 05:18:03 mrg Exp $);
 #endif
 
 
@@ -380,7 +380,7 @@
 	 * nonzero data. If we have some, go back and print the lot,
 	 * otherwise we're done.
 	 */
-	if (sbs)
+	if (cp)
 		i = 18;
 	else
 		i = 15;

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 05:23:54 UTC 2011

Modified Files:
src/lib/libc/arch/sparc64: Makefile.inc
src/usr.bin/m4: Makefile
src/usr.sbin/altq/altqd: Makefile

Log Message:
apply some -Wno-error/-Wno-enum-compare/-Wno-array-bounds.

this should be looked at more closely.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/arch/sparc64/Makefile.inc
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/m4/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/altq/altqd/Makefile

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

Modified files:

Index: src/lib/libc/arch/sparc64/Makefile.inc
diff -u src/lib/libc/arch/sparc64/Makefile.inc:1.15 src/lib/libc/arch/sparc64/Makefile.inc:1.16
--- src/lib/libc/arch/sparc64/Makefile.inc:1.15	Tue Mar 22 12:24:53 2011
+++ src/lib/libc/arch/sparc64/Makefile.inc	Wed Jun 22 05:23:53 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.15 2011/03/22 12:24:53 martin Exp $
+#	$NetBSD: Makefile.inc,v 1.16 2011/06/22 05:23:53 mrg Exp $
 
 SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
 
@@ -18,4 +18,9 @@
 SRCS+= ${SRCS.softfloat}
 CPPFLAGS+=  -I${ARCHDIR}/softfloat -I${.CURDIR}/softfloat \
 		-I${.CURDIR}/softfloat/bits64
+
+.if ${HAVE_GCC} == 45
+COPTS.softfloat-wrapper.c+=	-Wno-enum-compare
+.endif
+
 .endif

Index: src/usr.bin/m4/Makefile
diff -u src/usr.bin/m4/Makefile:1.15 src/usr.bin/m4/Makefile:1.16
--- src/usr.bin/m4/Makefile:1.15	Mon Oct 26 21:11:28 2009
+++ src/usr.bin/m4/Makefile	Wed Jun 22 05:23:53 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2009/10/26 21:11:28 christos Exp $
+#	$NetBSD: Makefile,v 1.16 2011/06/22 05:23:53 mrg Exp $
 #
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
@@ -25,3 +25,8 @@
 CLEANFILES+=parser.c parser.h tokenizer.o
 
 .include bsd.prog.mk
+
+# XXX
+.if ${HAVE_GCC} == 45
+COPTS.main.c+=	-Wno-error
+.endif

Index: src/usr.sbin/altq/altqd/Makefile
diff -u src/usr.sbin/altq/altqd/Makefile:1.4 src/usr.sbin/altq/altqd/Makefile:1.5
--- src/usr.sbin/altq/altqd/Makefile:1.4	Tue Mar  5 04:11:51 2002
+++ src/usr.sbin/altq/altqd/Makefile	Wed Jun 22 05:23:54 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2002/03/05 04:11:51 itojun Exp $
+#	$NetBSD: Makefile,v 1.5 2011/06/22 05:23:54 mrg Exp $
 
 .include bsd.own.mk
 
@@ -17,3 +17,8 @@
 LDADD+=	-lutil -lm
 
 .include bsd.prog.mk
+
+# XXX
+.if ${HAVE_GCC} == 45
+COPTS.altqd.c+=	-Wno-array-bounds
+.endif

CVS commit: src/sys/arch/sparc64/sparc64

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jun 22 05:50:47 UTC 2011

Modified Files:
src/sys/arch/sparc64/sparc64: db_interface.c

Log Message:
there's no fr_arg[6] or fr_arg[7] -- they're called fr_fp and fr_pc.
use the right names and avoid some array bounds violations picked up
by GCC 4.5.  it's a real bug, but the code would have been generated
correctly for the sparc* ABIs.


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/sparc64/sparc64/db_interface.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/sparc64/sparc64/db_interface.c
diff -u src/sys/arch/sparc64/sparc64/db_interface.c:1.128 src/sys/arch/sparc64/sparc64/db_interface.c:1.129
--- src/sys/arch/sparc64/sparc64/db_interface.c:1.128	Wed Apr 13 03:34:37 2011
+++ src/sys/arch/sparc64/sparc64/db_interface.c	Wed Jun 22 05:50:47 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_interface.c,v 1.128 2011/04/13 03:34:37 mrg Exp $ */
+/*	$NetBSD: db_interface.c,v 1.129 2011/06/22 05:50:47 mrg Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.128 2011/04/13 03:34:37 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.129 2011/06/22 05:50:47 mrg Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_ddb.h
@@ -243,8 +243,8 @@
 	{ i3,		dbregfr(arg[3]),	db_sparc_regop, 0 },
 	{ i4,		dbregfr(arg[4]),	db_sparc_regop, 0 },
 	{ i5,		dbregfr(arg[5]),	db_sparc_regop, 0 },
-	{ i6,		dbregfr(arg[6]),	db_sparc_regop, 0 },
-	{ i7,		dbregfr(arg[7]),	db_sparc_regop, 0 },
+	{ i6,		dbregfr(fp),		db_sparc_regop, 0 },
+	{ i7,		dbregfr(pc),		db_sparc_regop, 0 },
 	{ f0,		dbregfp(regs[0]),	db_sparc_regop, 0 },
 	{ f2,		dbregfp(regs[2]),	db_sparc_regop, 0 },
 	{ f4,		dbregfp(regs[4]),	db_sparc_regop, 0 },

CVS commit: src/external/gpl3/gcc/lib

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 06:02:29 UTC 2011

Added Files:
src/external/gpl3/gcc/lib/crtstuff: Makefile crtbegin.c crtbeginS.c
crtbeginT.c crtend.c crtendS.c
src/external/gpl3/gcc/lib/libgcc: Makefile Makefile.inc Makefile.srcs
Makefile.wrapper
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
src/external/gpl3/gcc/lib/libgcc/libgcc_eh: Makefile
src/external/gpl3/gcc/lib/libgcc/libgcc_s: Makefile
src/external/gpl3/gcc/lib/libgcc/libgcov: Makefile
src/external/gpl3/gcc/lib/libiberty: Makefile defs.mk
src/external/gpl3/gcc/lib/libobjc: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/backward: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/debug: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/ext: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1: Makefile
src/external/gpl3/gcc/lib/libsupc++: Makefile Makefile.common
Removed Files:
src/external/gpl3/gcc/lib/crtstuff4: Makefile crtbegin.c crtbeginS.c
crtbeginT.c crtend.c crtendS.c
src/external/gpl3/gcc/lib/libgcc4: Makefile Makefile.inc Makefile.srcs
Makefile.wrapper
src/external/gpl3/gcc/lib/libgcc4/libgcc: Makefile
src/external/gpl3/gcc/lib/libgcc4/libgcc_eh: Makefile
src/external/gpl3/gcc/lib/libgcc4/libgcc_s: Makefile
src/external/gpl3/gcc/lib/libgcc4/libgcov: Makefile
src/external/gpl3/gcc/lib/libobjc4: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3_4: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3_4/include: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3_4/include/backward: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3_4/include/bits: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3_4/include/debug: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3_4/include/ext: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3_4/include/tr1: Makefile
src/external/gpl3/gcc/lib/libsupc++4: Makefile Makefile.common

Log Message:
*sigh* move these files into the directories i meant for them to exist in.
start actually porting to gcc 4.5 in the process.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/crtstuff/Makefile \
src/external/gpl3/gcc/lib/crtstuff/crtbegin.c \
src/external/gpl3/gcc/lib/crtstuff/crtbeginS.c \
src/external/gpl3/gcc/lib/crtstuff/crtbeginT.c \
src/external/gpl3/gcc/lib/crtstuff/crtend.c \
src/external/gpl3/gcc/lib/crtstuff/crtendS.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gcc/lib/crtstuff4/Makefile \
src/external/gpl3/gcc/lib/crtstuff4/crtbegin.c \
src/external/gpl3/gcc/lib/crtstuff4/crtbeginS.c \
src/external/gpl3/gcc/lib/crtstuff4/crtbeginT.c \
src/external/gpl3/gcc/lib/crtstuff4/crtend.c \
src/external/gpl3/gcc/lib/crtstuff4/crtendS.c
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgcc/Makefile \
src/external/gpl3/gcc/lib/libgcc/Makefile.inc \
src/external/gpl3/gcc/lib/libgcc/Makefile.srcs \
src/external/gpl3/gcc/lib/libgcc/Makefile.wrapper
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgcc/libgcov/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gcc/lib/libgcc4/Makefile \
src/external/gpl3/gcc/lib/libgcc4/Makefile.inc \
src/external/gpl3/gcc/lib/libgcc4/Makefile.srcs \
src/external/gpl3/gcc/lib/libgcc4/Makefile.wrapper
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gcc/lib/libgcc4/libgcc/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl3/gcc/lib/libgcc4/libgcc_eh/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl3/gcc/lib/libgcc4/libgcc_s/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gcc/lib/libgcc4/libgcov/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libiberty/Makefile \
src/external/gpl3/gcc/lib/libiberty/defs.mk
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libobjc/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gcc/lib/libobjc4/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile
cvs rdiff -u -r0 -r1.1 \

CVS commit: src/external/gpl3/gcc/usr.bin

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 06:03:15 UTC 2011

Added Files:
src/external/gpl3/gcc/usr.bin: Makefile Makefile.backend
Makefile.frontend Makefile.inc Makefile.libcpp
src/external/gpl3/gcc/usr.bin/backend: Makefile
src/external/gpl3/gcc/usr.bin/cc1: Makefile
src/external/gpl3/gcc/usr.bin/cc1obj: Makefile
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
src/external/gpl3/gcc/usr.bin/cpp: Makefile
src/external/gpl3/gcc/usr.bin/frontend: Makefile
src/external/gpl3/gcc/usr.bin/g++: Makefile
src/external/gpl3/gcc/usr.bin/gcc: Makefile
src/external/gpl3/gcc/usr.bin/gcov: Makefile
src/external/gpl3/gcc/usr.bin/host-libiberty: Makefile
src/external/gpl3/gcc/usr.bin/include: Makefile
src/external/gpl3/gcc/usr.bin/libcpp: Makefile
src/external/gpl3/gcc/usr.bin/protoize: Makefile
src/external/gpl3/gcc/usr.bin/unprotoize: Makefile

Log Message:
move the gcc 4.5 usr.bin build makefiles to the right place.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/Makefile \
src/external/gpl3/gcc/usr.bin/Makefile.backend \
src/external/gpl3/gcc/usr.bin/Makefile.frontend \
src/external/gpl3/gcc/usr.bin/Makefile.inc \
src/external/gpl3/gcc/usr.bin/Makefile.libcpp
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/cc1/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/cpp/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/frontend/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/g++/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/gcc/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/gcov/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/include/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/libcpp/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/protoize/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/unprotoize/Makefile

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

CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3/src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 06:18:56 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/libstdc++-v3/src: locale-inst.cc

Log Message:
pull across from gcc 4.1:

revision 1.2
date: 2011/05/25 15:51:55;  author: joerg;  state: Exp;  lines: +2 -2
Don't define explicit instantiation as inline.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/libstdc++-v3/src/locale-inst.cc

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

CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 06:22:06 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/libstdc++-v3/include/ext: ropeimpl.h

Log Message:
pull across from gcc 4.1:

revision 1.2
date: 2011/02/05 00:37:40;  author: joerg;  state: Exp;  lines: +2 -2
Explicitly use template to allow building with the more strict
template lookup in clang. From FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h

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

CVS commit: src/sys/dev

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Tue Jun 21 06:23:38 UTC 2011

Modified Files:
src/sys/dev: ccd.c cgd.c

Log Message:
Adjust the #ifdefs such that ccd(4) and cgd(4) show in
modstat(8) even if built into the kernel.


To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/sys/dev/ccd.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/cgd.c

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

CVS commit: src/sys/arch/powerpc/booke

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jun 21 06:24:25 UTC 2011

Modified Files:
src/sys/arch/powerpc/booke: e500_intr.c

Log Message:
In e500_spl0, grab ci after disabling interrupts.
Consolidate a KASSERT.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/booke/e500_intr.c

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

CVS commit: src/sys/arch/powerpc/booke/dev

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jun 21 06:25:19 UTC 2011

Modified Files:
src/sys/arch/powerpc/booke/dev: pq3etsec.c

Log Message:
Add DEBUG around a variable.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/booke/dev/pq3etsec.c

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

CVS commit: src/sys/arch/powerpc

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jun 21 06:32:36 UTC 2011

Modified Files:
src/sys/arch/powerpc/include: cpu.h
src/sys/arch/powerpc/powerpc: powerpc_machdep.c

Log Message:
Add a common cpu_ast(l, ci) routine.
Add a ci_pmap_asid_cur for BOOKE debugging.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/powerpc/include/cpu.h
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/powerpc/powerpc/powerpc_machdep.c

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

CVS commit: src/sys/arch/powerpc

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jun 21 06:38:51 UTC 2011

Modified Files:
src/sys/arch/powerpc/booke: trap.c
src/sys/arch/powerpc/ibm4xx: trap.c
src/sys/arch/powerpc/powerpc: trap.c

Log Message:
Switch to use new common cpu_ast routine.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/booke/trap.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/powerpc/ibm4xx/trap.c
cvs rdiff -u -r1.143 -r1.144 src/sys/arch/powerpc/powerpc/trap.c

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

CVS commit: src/sys/common/pmap/tlb

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jun 21 06:43:38 UTC 2011

Modified Files:
src/sys/common/pmap/tlb: pmap_segtab.c

Log Message:
Add #define __PMAP_PRIVATE


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/common/pmap/tlb/pmap_segtab.c

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

CVS commit: src/external/gpl3/gcc/dist/gcc/config

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 06:54:27 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/gcc/config: netbsd.h

Log Message:
pull across these revisions from gcc 4.1:

revision 1.9
date: 2011/04/15 13:42:22;  author: joerg;  state: Exp;  lines: +2 -1
Move the headers for compiler and platform specific intrinsincs from
/usr/include to /usr/include/gcc-4.1.

revision 1.8
date: 2011/04/10 21:25:56;  author: joerg;  state: Exp;  lines: +1 -0
Add back a stylish new line.

revision 1.7
date: 2011/04/10 16:50:18;  author: joerg;  state: Exp;  lines: +20 -12
Reduce difference between src/tools/gcc and src/gnu/usr.bin/gcc4
configuration. All but the target to helper programs should be the same.
Mark include directories as sysroot-relative.

adjust the paths to gcc-4.5, and add an XXX note about this ugliness.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/netbsd.h

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

CVS commit: src/sys/sys

[Cherry G. Mathew]

Module Name:src
Committed By:   cherry
Date:   Tue Jun 21 07:20:57 UTC 2011

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

Log Message:
#include sys/proc.h before using struct proc.p_timerpend


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/sys/userret.h

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

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 07:28:44 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc

Log Message:
pull across these revisions from gcc 4.1:

revision 1.21
date: 2011/01/23 06:29:52;  author: matt;  state: Exp;  lines: +1 -1
Default mips64 to softfloat.

revision 1.22
date: 2011/02/10 07:18:29;  author: matt;  state: Exp;  lines: +3 -0
Default NetBSD to -msecure-plt now.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config.gcc

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

CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 07:31:13 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd.h

Log Message:
pull across these revisions from gcc 4.1:

revision 1.8
date: 2011/06/11 00:57:29;  author: matt;  state: Exp;  lines: +2 -0
If we are compiling -msoft-float, define _SOFT_FLOAT

revision 1.7
date: 2011/03/12 07:57:38;  author: matt;  state: Exp;  lines: +3 -1
Define HAVE_AS_TLS until our build tools figure out how to do it.

revision 1.6
date: 2011/02/25 22:36:10;  author: matt;  state: Exp;  lines: +7 -0
Explicitly make sure TARGET_SECURE_PLT is defined correctly rather than
relying on HAVE_AS_REL16 from auto-host.h.

revision 1.5
date: 2011/02/10 07:18:29;  author: matt;  state: Exp;  lines: +3 -0
Default NetBSD to -msecure-plt now.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h

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

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 07:39:19 UTC 2011

Modified Files:
src/external/gpl3/gcc/dist/gcc: configure configure.ac

Log Message:
pull across these revisions from gcc 4.1:

configure:
revision 1.12
date: 2011/03/10 15:14:49;  author: skrll;  state: Exp;  lines: +1 -1
Look for TLS on hppa on netbsd.

configure.ac:
revision 1.11
date: 2011/03/10 15:14:49;  author: skrll;  state: Exp;  lines: +1 -1
Look for TLS on hppa on netbsd.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/configure \
src/external/gpl3/gcc/dist/gcc/configure.ac

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

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 09:34:55 UTC 2011

Modified Files:
src/external/bsd/libpcap/dist: scanner.l

Log Message:
this needs %option noinput.  thanks to martin.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/scanner.l

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

CVS commit: src/lib/librmt

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 09:35:23 UTC 2011

Modified Files:
src/lib/librmt: rmtlib.c

Log Message:
add a missing  to a string literal in some #if'd out code that GCC 4.5 found.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/lib/librmt/rmtlib.c

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

CVS commit: src/lib/libc/stdlib

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jun 21 09:36:43 UTC 2011

Modified Files:
src/lib/libc/stdlib: jemalloc.3

Log Message:
Sort sections.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/stdlib/jemalloc.3

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

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 09:36:46 UTC 2011

Modified Files:
src/sbin/fsck_lfs: lfs.c
src/usr.sbin/acpitools/aml: aml_parse.c

Log Message:
avoid code that looks like this:
x = x = y;
since GCC 4.5 complains about it having sequence point issues.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_parse.c

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

CVS commit: src/tools/gcc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 21 09:37:41 UTC 2011

Modified Files:
src/tools/gcc: Makefile

Log Message:
use --sysroot with GCC 4.5. (maybe could with 4.1 too?  the 4.1 code
here is broken right now, anyway, ever since the sysroot changes were
merged into our tree.)


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/tools/gcc/Makefile

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

CVS commit: othersrc/external/bsd/mat/dist

[Thomas Klausner]

Module Name:othersrc
Committed By:   wiz
Date:   Tue Jun 21 09:38:15 UTC 2011

Modified Files:
othersrc/external/bsd/mat/dist: mat.1

Log Message:
Fix typo in option letter.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 othersrc/external/bsd/mat/dist/mat.1

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

CVS commit: othersrc/external/bsd/mat/dist

[Thomas Klausner]

Module Name:othersrc
Committed By:   wiz
Date:   Tue Jun 21 09:45:10 UTC 2011

Modified Files:
othersrc/external/bsd/mat/dist: mat.1

Log Message:
Sort option descriptions. Add matpax(1) to SEE ALSO. Increase Bl width so 
everything fits.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 othersrc/external/bsd/mat/dist/mat.1

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

CVS commit: othersrc/external/bsd/mat/dist

[Thomas Klausner]

Module Name:othersrc
Committed By:   wiz
Date:   Tue Jun 21 09:45:49 UTC 2011

Modified Files:
othersrc/external/bsd/mat/dist: matpax.1

Log Message:
Sort option descriptions. Add -v to SYNOPSIS. Remove empty EXAMPLES section.
Increase Bl width so everything fits.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/mat/dist/matpax.1

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

CVS commit: src/sys/dev/acpi

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Tue Jun 21 09:49:05 UTC 2011

Modified Files:
src/sys/dev/acpi: acpi_fan.c acpi_pmtr.c

Log Message:
Revert the previous commit as it was wrong/redundant.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/acpi_fan.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/acpi_pmtr.c

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

CVS commit: src/sys/arch/evbarm/gumstix

[KIYOHARA Takashi]

Module Name:src
Committed By:   kiyohara
Date:   Tue Jun 21 11:38:03 UTC 2011

Modified Files:
src/sys/arch/evbarm/gumstix: gxiic.c

Log Message:
Use CFATTACH_DECL_NEW().


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/gumstix/gxiic.c

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

CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Tue Jun 21 11:42:20 UTC 2011

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
fix typo.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile

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

CVS commit: src/distrib/alpha/instkernel/ramdisk

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Tue Jun 21 11:52:46 UTC 2011

Modified Files:
src/distrib/alpha/instkernel/ramdisk: list

Log Message:
Revert rev 1.42 which is not necessary after rev 1.41.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/distrib/alpha/instkernel/ramdisk/list

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

CVS commit: src/sys/dev/i2c

[Juergen Hannken-Illjes]

Module Name:src
Committed By:   hannken
Date:   Tue Jun 21 12:38:28 UTC 2011

Modified Files:
src/sys/dev/i2c: ibmhawk.c

Log Message:
Make sure sensor state is valid before calling sysmon_envsys_sensor_attach().

Ok: Paul Goyette pgoye...@netbsd.org


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/ibmhawk.c

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

CVS commit: src/sys/dev

[Juergen Hannken-Illjes]

Module Name:src
Committed By:   hannken
Date:   Tue Jun 21 12:41:24 UTC 2011

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

Log Message:
When reading or writing the backing store us POSIX_FADV_NOREUSE access hint
to prevent read ahead.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/fss.c

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

CVS commit: src/usr.bin/gzip

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Tue Jun 21 13:25:45 UTC 2011

Modified Files:
src/usr.bin/gzip: Makefile gzip.c

Log Message:
Add a few explicit casts for sign mismatches.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/gzip/Makefile
cvs rdiff -u -r1.102 -r1.103 src/usr.bin/gzip/gzip.c

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

CVS commit: src/sys/dev

[Juergen Hannken-Illjes]

Module Name:src
Committed By:   hannken
Date:   Tue Jun 21 13:59:42 UTC 2011

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

Log Message:
Use kthread_join() to wait for the termination of the helper thread.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/fss.c

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

CVS commit: src/sys/net

[Mihai Chelaru]

Module Name:src
Committed By:   kefren
Date:   Tue Jun 21 14:30:20 UTC 2011

Modified Files:
src/sys/net: if_mpls.c

Log Message:
learn mpls interface how to prepend multiple shims by using a vector of
smpls_addrs in sockaddr_mpls. The number of smpls_addrs is found from
smpls_len. First label encountered is BoS.
XXX: need to do the same for LSE and this feature needs to be documented.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/net/if_mpls.c

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

CVS commit: src/sbin/route

[Mihai Chelaru]

Module Name:src
Committed By:   kefren
Date:   Tue Jun 21 14:33:14 UTC 2011

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

Log Message:
Alloc dynamically sockunions in sou.
Teach route(8) about multiple tags. E.G.: -tag 100,20,33
XXX: needs documentation


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sbin/route/route.c

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

CVS commit: othersrc/external/bsd/hashtree

[Alistair G. Crooks]

Module Name:othersrc
Committed By:   agc
Date:   Tue Jun 21 14:51:38 UTC 2011

Update of /cvsroot/othersrc/external/bsd/hashtree
In directory ivanova.netbsd.org:/tmp/cvs-serv26431

Log Message:
Initial import of hashtree functions into othersrc.

The hashtree, or Merkle tree algorithms, split a file up into blocks,
and calculate a message digest on those blocks.  Subsequent digests
are concatenated onto the previous digests.  If there is more than one
digest calculated, a higher level of digest is then calculated across
the lower-order digests, to provide a tree-like structure of message
digests.

If there is only one digest calculated, then the hashtree in this
degenerate case is the same as the digets of the file.

% hashtree -n 1 dist/hashtree.c
HASHTREE/sha1/1/10358/10358 (dist/hashtree.c) = 
253f185d39783fd29ca6a7936fee4b50e3775f39
% sha1 dist/hashtree.c
SHA1 (dist/hashtree.c) = 253f185d39783fd29ca6a7936fee4b50e3775f39
%

hashtree(1) can be used to specify the hashing algorithm used
(including hmac algorithms), and the size of the blocks. 

% hashtree -b 4096 dist/hashtree.c
HASHTREE/sha1/2/10358/4096 (dist/hashtree.c) = 
1a958db53705b1ef4ef4e7418f7aa6e25226c4468783684b4ff3d152a66a38e7ad3e5c8d88ad0851b5f916e7d015015c6e0ddf0cef4cf7af2d48a0ad6db45855c61ea5454b579221bcbeeb5e282e626d
%

Alternatively, the number of desired blocks can be specified, and
hashtree will work out the block size from that parameter and the size
of the file.  By default, a blocksize of 1024 is used.  There is the
possibility of producing very large digests using hashtree(1):

% hashtree dist/hashtree.c
HASHTREE/sha1/2/10358/1024 (dist/hashtree.c) = 
6a765d5809534fa75fd2f4f2f88168e65cb1182f91ac14db77b0052ae083743c10ed0ccea98ebf44a945eb72ee0303a8b5b89a2a590ec2e684418942bae3e0be34567bd12721167239fdf641c24ec51b59426924a32760adf11370aca375d60a97364613f93e1e44f848a3557c141b7422aa7e63fef99ff4e056124513c228c9a33e0dff08e6baa2903f959f428dd60f9a6390b0d4108d0826713d33ab6e5520fe20e61ac700659eb5e6a1cf5653da05d65c0d792cd3affaadd037372cfbf7085e14caea50dd89e2790cd982824fec985e2a97fcbbc415e91c27dc4f3089ec446784262269677aa1736fba2e5a768114

Merkle trees can be used to implement Lamport's signature scheme - see

http://www.rsa.com/rsalabs/node.asp?id=2003

and there are also uses in ZFS:

http://blogs.oracle.com/bonwick/entry/zfs_end_to_end_data

(although indirect pointers can be a tad difficult here?)

Hash trees are written up more generally in:

http://en.wikipedia.org/wiki/Hash_tree

There are also uses of the tiger algorithm being used to produce more
specific tiger trees.

Status:

Vendor Tag: CROOKS
Release Tags:   hashtree-base

N othersrc/external/bsd/hashtree/Makefile
N othersrc/external/bsd/hashtree/dist/hashtree.c
N othersrc/external/bsd/hashtree/dist/Makefile
N othersrc/external/bsd/hashtree/dist/TODO
N othersrc/external/bsd/hashtree/dist/libhashtree.3
N othersrc/external/bsd/hashtree/dist/hashtree.h
N othersrc/external/bsd/hashtree/dist/main.c
N othersrc/external/bsd/hashtree/dist/hashtree.1
N othersrc/external/bsd/hashtree/hashtree/Makefile
N othersrc/external/bsd/hashtree/libhashtree/Makefile
N othersrc/external/bsd/hashtree/libhashtree/shlib_version

No conflicts created by this import

CVS commit: src/sys/dev/ic

[KIYOHARA Takashi]

Module Name:src
Committed By:   kiyohara
Date:   Tue Jun 21 15:13:34 UTC 2011

Modified Files:
src/sys/dev/ic: sl811hs.c sl811hsvar.h

Log Message:
More stride for PSIONTEKLOGIX NETBOOK PRO.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/sl811hs.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/sl811hsvar.h

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

CVS commit: src/sys/arch/hpcarm

[KIYOHARA Takashi]

Module Name:src
Committed By:   kiyohara
Date:   Tue Jun 21 15:23:58 UTC 2011

Modified Files:
src/sys/arch/hpcarm/conf: WZERO3 files.pxa2x0
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c
Added Files:
src/sys/arch/hpcarm/conf: files.wzero3
src/sys/arch/hpcarm/hpcarm: wzero3_machdep.c

Log Message:
Split pxa2x0_hpc/wzero3.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcarm/conf/WZERO3
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpcarm/conf/files.pxa2x0
cvs rdiff -u -r0 -r1.1 src/sys/arch/hpcarm/conf/files.wzero3
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/hpcarm/hpcarm/wzero3_machdep.c

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

CVS commit: othersrc/external/bsd/hashtree/dist

[Thomas Klausner]

Module Name:othersrc
Committed By:   wiz
Date:   Tue Jun 21 15:39:43 UTC 2011

Modified Files:
othersrc/external/bsd/hashtree/dist: libhashtree.3

Log Message:
Remove trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
othersrc/external/bsd/hashtree/dist/libhashtree.3

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

CVS commit: othersrc/external/bsd/hashtree/dist

[Thomas Klausner]

Module Name:othersrc
Committed By:   wiz
Date:   Tue Jun 21 15:40:22 UTC 2011

Modified Files:
othersrc/external/bsd/hashtree/dist: hashtree.1

Log Message:
Fix a typo. Markup nit. Remove trailing whitespace, and uncustomary dot at end 
of SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/hashtree/dist/hashtree.1

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

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

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Tue Jun 21 17:17:27 UTC 2011

Modified Files:
src/sys/arch/zaurus/dev: zkbd.c zlcd.c zlcdvar.h

Log Message:
use pmf_event_inject() instead of call lcd_blank() directly.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/zaurus/dev/zkbd.c \
src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/dev/zlcdvar.h

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

CVS commit: src/sys/sys

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Jun 21 17:28:11 UTC 2011

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

Log Message:
The referred-to comment was moved to vfs_vnode.c; update the pointer.


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

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

CVS commit: src/sys/arch/powerpc/pic

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Tue Jun 21 18:02:43 UTC 2011

Modified Files:
src/sys/arch/powerpc/pic: intr.c

Log Message:
Make it compile when PIC_DEBUG is defined.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/pic/intr.c

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

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

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Tue Jun 21 18:13:20 UTC 2011

Modified Files:
src/sys/arch/zaurus/dev: zkbd.c zlcd.c zlcdvar.h

Log Message:
backout previous.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/zaurus/dev/zkbd.c \
src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/dev/zlcdvar.h

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

CVS commit: src/usr.bin/netstat

[Mihai Chelaru]

Module Name:src
Committed By:   kefren
Date:   Tue Jun 21 19:42:46 UTC 2011

Modified Files:
src/usr.bin/netstat: netstat.h route.c show.c

Log Message:
print multiple tags if exists, comma separated


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/netstat/netstat.h
cvs rdiff -u -r1.77 -r1.78 src/usr.bin/netstat/route.c
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/netstat/show.c

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

CVS commit: src/usr.bin/netstat

[Mihai Chelaru]

Module Name:src
Committed By:   kefren
Date:   Tue Jun 21 19:46:36 UTC 2011

Modified Files:
src/usr.bin/netstat: netstat.1

Log Message:
add a sentence regarding multiple tags


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/usr.bin/netstat/netstat.1

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

CVS commit: src/usr.bin/netstat

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Jun 21 20:51:27 UTC 2011

Modified Files:
src/usr.bin/netstat: netstat.1

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/netstat/netstat.1

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