date:20140705

CVS commit: src/share/mk

2014-07-05 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sun Jul  6 06:34:33 UTC 2014

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

Log Message:
Don't install EXTRAHTMLFILES if MKHTML is "no".


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/share/mk/bsd.doc.mk

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

Modified files:

Index: src/share/mk/bsd.doc.mk
diff -u src/share/mk/bsd.doc.mk:1.65 src/share/mk/bsd.doc.mk:1.66
--- src/share/mk/bsd.doc.mk:1.65	Sat Jul  5 19:22:04 2014
+++ src/share/mk/bsd.doc.mk	Sun Jul  6 06:34:33 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.doc.mk,v 1.65 2014/07/05 19:22:04 dholland Exp $
+#	$NetBSD: bsd.doc.mk,v 1.66 2014/07/06 06:34:33 dholland Exp $
 #	@(#)bsd.doc.mk	8.1 (Berkeley) 8/14/93
 
 .include 
@@ -159,7 +159,9 @@ DOCINST+=${SA}.txt ${SA}.${PRINTABLE}
 DOCINST+=${SA}.html
 .endif
 .endfor
+.if ${MKHTML} != "no"
 DOCINST+=${EXTRAHTMLFILES}
+.endif
 
 .if ${MKDOC} != "no"
 docinstall:

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

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sun Jul  6 06:28:50 UTC 2014

Modified Files:
src/sys/arch/x68k/stand/boot: Makefile boot.c
src/sys/arch/x68k/stand/netboot: Makefile
Removed Files:
src/sys/arch/x68k/stand/netboot: boot.c

Log Message:
Merge and share boot.c between normal boot and netboot by dumb #ifdefs.

Tested on XM6i.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x68k/stand/boot/Makefile
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x68k/stand/boot/boot.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/stand/netboot/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/arch/x68k/stand/netboot/boot.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/x68k/stand/boot/Makefile
diff -u src/sys/arch/x68k/stand/boot/Makefile:1.22 src/sys/arch/x68k/stand/boot/Makefile:1.23
--- src/sys/arch/x68k/stand/boot/Makefile:1.22	Tue Mar 20 12:37:01 2012
+++ src/sys/arch/x68k/stand/boot/Makefile	Sun Jul  6 06:28:49 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 2012/03/20 12:37:01 minoura Exp $
+#	$NetBSD: Makefile,v 1.23 2014/07/06 06:28:49 tsutsui Exp $
 
 NOMAN=		# defined
 
@@ -41,6 +41,7 @@ CPPFLAGS+=	-D_STANDALONE -DHEAP_VARIABLE
 CPPFLAGS+=	-DTEXTADDR="0x${TEXT}" 
 CPPFLAGS+=	-DBOOT=\"${BOOT}\" -DBOOT_VERS=\"${VERSION}\"
 CPPFLAGS+=	-DLIBSA_ENABLE_LS_OP
+#CPPFLAGS+=	-DDEBUG
 CFLAGS=		-Wno-main -Os -m68020-60
 LINKFLAGS=	-N -static -T ${.CURDIR}/boot.ldscript
 LIBIOCS!=	cd $M/stand/libiocs && ${PRINTOBJDIR}

Index: src/sys/arch/x68k/stand/boot/boot.c
diff -u src/sys/arch/x68k/stand/boot/boot.c:1.19 src/sys/arch/x68k/stand/boot/boot.c:1.20
--- src/sys/arch/x68k/stand/boot/boot.c:1.19	Sun Jul  6 05:31:02 2014
+++ src/sys/arch/x68k/stand/boot/boot.c	Sun Jul  6 06:28:49 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.19 2014/07/06 05:31:02 tsutsui Exp $	*/
+/*	$NetBSD: boot.c,v 1.20 2014/07/06 06:28:49 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 2001 Minoura Makoto
@@ -32,6 +32,9 @@
 #include 
 #include 
 #include 
+#ifdef NETBOOT
+#include 
+#endif
 #include 
 
 #include "libx68k.h"
@@ -46,21 +49,38 @@
 #define SRAM_MEMSIZE	(*((long*) 0x00ed0008))
 
 char default_kernel[20] =
+#ifndef NETBOOT
 "sd0a:netbsd";
+#else
+"nfs:netbsd";
+#endif
 int mpu;
+#ifndef NETBOOT
 int hostadaptor;
+#endif
 int console_device = -1;
 
+#ifdef DEBUG
+#ifdef NETBOOT
+int debug = 1;
+#endif
+#endif
+
 static void help(void);
+#ifndef NETBOOT
 static int get_scsi_host_adapter(void);
+#endif
 static void doboot(const char *, int);
 static void boot(char *);
+#ifndef NETBOOT
 static void cmd_ls(char *);
+#endif
 int bootmenu(void);
 void bootmain(int);
 extern int detectmpu(void);
 extern int badbaddr(void *);
 
+#ifndef NETBOOT
 /* from boot_ufs/bootmain.c */
 static int
 get_scsi_host_adapter(void)
@@ -83,19 +103,25 @@ get_scsi_host_adapter(void)
 
 	return ha;
 }
-
+#endif
 
 static void
 help(void)
 {
 	printf("Usage:\n");
 	printf("boot [dev:][file] -[flags]\n");
+#ifndef NETBOOT
 	printf(" dev:   sd, ID=0-7, PART=a-p\n");
 	printf("cda, ID=0-7\n");
 	printf("fda, UNIT=0-3, format is detected.\n");
+#else
+	printf(" dev:   nfs, first probed NE2000 is used.\n");
+#endif
 	printf(" file:  netbsd, netbsd.gz, etc.\n");
 	printf(" flags: abdqsv\n");
+#ifndef NETBOOT
 	printf("ls [dev:][directory]\n");
+#endif
 	printf("halt\nreboot\n");
 }
 
@@ -127,10 +153,16 @@ doboot(const char *file, int flags)
 	}
 
 #ifdef DEBUG
+#ifndef NETBOOT
 	printf("dev = %x, unit = %d, part = %c, name = %s\n",
 	   dev, unit, part + 'a', name);
+#else
+	printf("dev = %x, unit = %d, name = %s\n",
+	   dev, unit, name);
+#endif
 #endif
 
+#ifndef NETBOOT
 	if (dev == 0) {		/* SCSI */
 		dev = X68K_MAKESCSIBOOTDEV(X68K_MAJOR_SD,
 	   hostadaptor >> 4,
@@ -139,14 +171,23 @@ doboot(const char *file, int flags)
 	} else {
 		dev = X68K_MAKEBOOTDEV(X68K_MAJOR_FD, unit & 3, 0);
 	}
+#else
+	dev = X68K_MAKEBOOTDEV(X68K_MAJOR_NE, unit, 0);
+#endif
 #ifdef DEBUG
 	printf("boot device = %x\n", dev);
+#ifndef NETBOOT
 	printf("if = %d, unit = %d, id = %d, lun = %d, part = %c\n",
 	   B_X68K_SCSI_IF(dev),
 	   B_X68K_SCSI_IF_UN(dev),
 	   B_X68K_SCSI_ID(dev),
 	   B_X68K_SCSI_LUN(dev),
 	   B_X68K_SCSI_PART(dev) + 'a');
+#else
+	printf("if = %d, unit = %d\n",
+	   B_X68K_SCSI_IF(dev),
+	   B_X68K_SCSI_IF_UN(dev));
+#endif
 #endif
 
 	p = ((short*) marks[MARK_ENTRY]) - 1;
@@ -208,6 +249,7 @@ boot(char *arg)
 	}
 }
 
+#ifndef NETBOOT
 static void
 cmd_ls(char *arg)
 {
@@ -228,6 +270,7 @@ cmd_ls(char *arg)
 	ls(filename);
 	devopen_open_dir = 0;
 }
+#endif
 
 int
 bootmenu(void)
@@ -275,8 +318,10 @@ bootmenu(void)
 		else if (strcmp("halt", p) == 0 ||
 			 strcmp("reboot", p) == 0)
 			exit(0);
+#ifndef NETBOOT
 		else if (strcmp("ls", p) == 0)
 			cmd_ls(options);
+#endif
 		else
 			printf("Unknown command %s\n", p);
 	}
@@ -295,7 +340,12 @@ void
 bootmain(int bo

CVS commit: src/share/doc/smm/config

2014-07-05 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sun Jul  6 05:32:30 UTC 2014

Modified Files:
src/share/doc/smm/config: 0.t 1.t 2.t 3.t 4.t 5.t 6.t a.t b.t d.t

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/doc/smm/config/0.t \
src/share/doc/smm/config/1.t src/share/doc/smm/config/2.t \
src/share/doc/smm/config/3.t src/share/doc/smm/config/4.t \
src/share/doc/smm/config/6.t
cvs rdiff -u -r1.1 -r1.2 src/share/doc/smm/config/5.t \
src/share/doc/smm/config/a.t src/share/doc/smm/config/b.t \
src/share/doc/smm/config/d.t

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

Modified files:

Index: src/share/doc/smm/config/0.t
diff -u src/share/doc/smm/config/0.t:1.2 src/share/doc/smm/config/0.t:1.3
--- src/share/doc/smm/config/0.t:1.2	Sun Jul  6 05:16:18 2014
+++ src/share/doc/smm/config/0.t	Sun Jul  6 05:32:30 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: 0.t,v 1.2 2014/07/06 05:16:18 dholland Exp $
+.\" $NetBSD: 0.t,v 1.3 2014/07/06 05:32:30 dholland Exp $
 .\" Copyright (c) 1983, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -76,7 +76,8 @@ configuration files and how to configure
 systems with non-standard hardware configurations.
 Sections describing the preferred way to
 add new code to the system and how the system's autoconfiguration
-process operates are included.  An appendix
+process operates are included.
+An appendix
 contains a summary of the rules used by the system
 in calculating the size of system data structures,
 and also indicates some of the standard system size
Index: src/share/doc/smm/config/1.t
diff -u src/share/doc/smm/config/1.t:1.2 src/share/doc/smm/config/1.t:1.3
--- src/share/doc/smm/config/1.t:1.2	Sun Jul  6 05:16:18 2014
+++ src/share/doc/smm/config/1.t	Sun Jul  6 05:32:30 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: 1.t,v 1.2 2014/07/06 05:16:18 dholland Exp $
+.\" $NetBSD: 1.t,v 1.3 2014/07/06 05:32:30 dholland Exp $
 .\" Copyright (c) 1983, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -51,12 +51,14 @@ in a single, easy to understand, file.
 This document describes the content and 
 format of system configuration
 files and the rules which must be followed when creating 
-these files.  Example configuration files are constructed
+these files.
+Example configuration files are constructed
 and discussed.
 .PP
 Later sections suggest guidelines to be used in modifying
 system source and explain some of the inner workings of the
-autoconfiguration process.  Appendix D summarizes the rules
+autoconfiguration process.
+Appendix D summarizes the rules
 used in calculating the most important system data structures
 and indicates some inherent system data structure size
 limitations (and how to go about modifying them).
Index: src/share/doc/smm/config/2.t
diff -u src/share/doc/smm/config/2.t:1.2 src/share/doc/smm/config/2.t:1.3
--- src/share/doc/smm/config/2.t:1.2	Sun Jul  6 05:16:18 2014
+++ src/share/doc/smm/config/2.t	Sun Jul  6 05:32:30 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: 2.t,v 1.2 2014/07/06 05:16:18 dholland Exp $
+.\" $NetBSD: 2.t,v 1.3 2014/07/06 05:32:30 dholland Exp $
 .\" Copyright (c) 1983, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -56,7 +56,8 @@ available hardware
 .PP
 .I Config
 allows multiple system images to be generated from a single
-configuration description.  Each system image is configured
+configuration description.
+Each system image is configured
 for identical hardware, but may have different locations for the root
 file system and, possibly, other system devices.
 .NH 2
@@ -69,7 +70,8 @@ indicates if the system is going to oper
 \(dg DEC, VAX, UNIBUS, MASSBUS and MicroVAX are trademarks of Digital
 Equipment Corporation.
 .FE
-or some other machine on which NetBSD operates.  The machine type
+or some other machine on which NetBSD operates.
+The machine type
 is used to locate certain data files which are machine specific, and
 also to select rules used in constructing the resultant
 configuration files.
@@ -85,7 +87,8 @@ be running on a VAX 8600, VAX-11/780, VA
 the cpu designation for compatible machines introduced earlier.)
 Specifying
 more than one cpu type implies that the system should be configured to run
-on any of the cpu's specified.  For some types of machines this is not
+on any of the cpu's specified.
+For some types of machines this is not
 possible and 
 .I config
 will print a diagnostic indicating such.
@@ -95,11 +98,15 @@ System identification
 The
 .I "system identification"
 is a moniker attached to the system, and often the machine on which the
-system is to run.  For example, at Berkeley we have machines named Ernie
-(Co-VAX), Kim (No-VAX), and so on.  The system identifier selected is used to
+system is to run.
+For example, at Berkeley we have machines named Ernie
+(Co-VAX), Kim

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

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sun Jul  6 05:31:03 UTC 2014

Modified Files:
src/sys/arch/x68k/stand/boot: boot.c
src/sys/arch/x68k/stand/netboot: boot.c

Log Message:
Reduce diffs to prepare to merge these files.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/x68k/stand/boot/boot.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/stand/netboot/boot.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/x68k/stand/boot/boot.c
diff -u src/sys/arch/x68k/stand/boot/boot.c:1.18 src/sys/arch/x68k/stand/boot/boot.c:1.19
--- src/sys/arch/x68k/stand/boot/boot.c:1.18	Tue Mar 20 12:37:01 2012
+++ src/sys/arch/x68k/stand/boot/boot.c	Sun Jul  6 05:31:02 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.18 2012/03/20 12:37:01 minoura Exp $	*/
+/*	$NetBSD: boot.c,v 1.19 2014/07/06 05:31:02 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 2001 Minoura Makoto
@@ -45,8 +45,10 @@
 #define EXSCSI_BDID	((void*) 0x00ea0001)
 #define SRAM_MEMSIZE	(*((long*) 0x00ed0008))
 
-char default_kernel[20] = "sd0a:netbsd";
-int mpu, hostadaptor;
+char default_kernel[20] =
+"sd0a:netbsd";
+int mpu;
+int hostadaptor;
 int console_device = -1;
 
 static void help(void);
@@ -262,14 +264,16 @@ bootmenu(void)
 		printf("> ");
 		gets(input);
 
-		for (p = &input[0]; p - &input[0] < 80 && *p == ' '; p++);
+		for (p = &input[0]; p - &input[0] < 80 && *p == ' '; p++)
+			;
 		options = gettrailer(p);
 		if (strcmp("boot", p) == 0)
 			boot(options);
 		else if (strcmp("help", p) == 0 ||
 			 strcmp("?", p) == 0)
 			help();
-		else if ((strcmp("halt", p) == 0) ||(strcmp("reboot", p) == 0))
+		else if (strcmp("halt", p) == 0 ||
+			 strcmp("reboot", p) == 0)
 			exit(0);
 		else if (strcmp("ls", p) == 0)
 			cmd_ls(options);
@@ -290,6 +294,7 @@ extern const char bootprog_name[];
 void
 bootmain(int bootdev)
 {
+
 	hostadaptor = get_scsi_host_adapter();
 	mpu = detectmpu();
 

Index: src/sys/arch/x68k/stand/netboot/boot.c
diff -u src/sys/arch/x68k/stand/netboot/boot.c:1.2 src/sys/arch/x68k/stand/netboot/boot.c:1.3
--- src/sys/arch/x68k/stand/netboot/boot.c:1.2	Thu Nov  1 14:46:26 2012
+++ src/sys/arch/x68k/stand/netboot/boot.c	Sun Jul  6 05:31:03 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.2 2012/11/01 14:46:26 isaki Exp $	*/
+/*	$NetBSD: boot.c,v 1.3 2014/07/06 05:31:03 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 2001 Minoura Makoto
@@ -46,7 +46,8 @@
 #define EXSCSI_BDID	((void*) 0x00ea0001)
 #define SRAM_MEMSIZE	(*((long*) 0x00ed0008))
 
-char default_kernel[20] = "nfs:netbsd";
+char default_kernel[20] =
+"nfs:netbsd";
 int mpu;
 int console_device = -1;
 
@@ -100,17 +101,23 @@ doboot(const char *file, int flags)
 		printf("XXX: unknown corruption in /boot.\n");
 	}
 
+#ifdef DEBUG
 	printf("dev = %x, unit = %d, name = %s\n",
 	   dev, unit, name);
+#endif
 
 	dev = X68K_MAKEBOOTDEV(X68K_MAJOR_NE, unit, 0);
+#ifdef DEBUG
 	printf("boot device = %x\n", dev);
 	printf("if = %d, unit = %d\n",
 	   B_X68K_SCSI_IF(dev),
 	   B_X68K_SCSI_IF_UN(dev));
+#endif
 
 	p = ((short*) marks[MARK_ENTRY]) - 1;
+#ifdef DEBUG
 	printf("Kernel Version: 0x%x\n", *p);
+#endif
 	if (*p != 0x4e73 && *p != 0) {
 		/*
 		 * XXX temporary solution; compatibility loader
@@ -206,9 +213,11 @@ bootmenu(void)
 		options = gettrailer(p);
 		if (strcmp("boot", p) == 0)
 			boot(options);
-		else if (strcmp("help", p) == 0 || strcmp("?", p) == 0)
+		else if (strcmp("help", p) == 0 ||
+			 strcmp("?", p) == 0)
 			help();
-		else if (strcmp("halt", p) == 0 || strcmp("reboot", p) == 0)
+		else if (strcmp("halt", p) == 0 ||
+			 strcmp("reboot", p) == 0)
 			exit(0);
 		else
 			printf("Unknown command %s\n", p);
@@ -227,9 +236,10 @@ extern const char bootprog_name[];
 void
 bootmain(int bootdev)
 {
-	mpu = detectmpu();
+
 	rtc_offset = RTC_OFFSET;
 	try_bootp = 1;
+	mpu = detectmpu();
 
 	if (mpu < 3) {		/* not tested on 68020 */
 		printf("This MPU cannot run NetBSD.\n");

CVS commit: src/share/doc/smm/config

2014-07-05 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sun Jul  6 05:16:18 UTC 2014

Modified Files:
src/share/doc/smm/config: 0.t 1.t 2.t 3.t 4.t 6.t

Log Message:
Minor updates - I've attempted to catch the most glaringly outdated
statements but haven't made any effort yet to rewrite the main content.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/doc/smm/config/0.t \
src/share/doc/smm/config/1.t src/share/doc/smm/config/2.t \
src/share/doc/smm/config/3.t src/share/doc/smm/config/4.t \
src/share/doc/smm/config/6.t

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

Modified files:

Index: src/share/doc/smm/config/0.t
diff -u src/share/doc/smm/config/0.t:1.1 src/share/doc/smm/config/0.t:1.2
--- src/share/doc/smm/config/0.t:1.1	Tue Dec 18 03:35:51 2007
+++ src/share/doc/smm/config/0.t	Sun Jul  6 05:16:18 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: 0.t,v 1.1 2007/12/18 03:35:51 garbled Exp $
+.\" $NetBSD: 0.t,v 1.2 2014/07/06 05:16:18 dholland Exp $
 .\" Copyright (c) 1983, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -50,14 +50,16 @@
 \fB\\$1\fP\\$2
 ..
 .TL
-Building 4.4BSD Kernels with Config
+Building NetBSD Kernels with Config
 .AU
 Samuel J. Leffler and Michael J. Karels
+.\" (uncomment this once there are substantive changes)
+.\" Updated for NetBSD by David A. Holland
 .AI
-Computer Systems Research Group
-Department of Electrical Engineering and Computer Science
-University of California, Berkeley
-Berkeley, California  94720
+.\" Computer Systems Research Group
+.\" Department of Electrical Engineering and Computer Science
+.\" University of California, Berkeley
+.\" Berkeley, California  94720
 .de IR
 \fI\\$1\fP\\$2
 ..
@@ -67,8 +69,8 @@ Berkeley, California  94720
 .AB
 .PP
 This document describes the use of
-\fIconfig\fP\|(8) to configure and create bootable
-4.4BSD system images.
+\fIconfig\fP\|(1) to configure and create bootable
+NetBSD system images.
 It discusses the structure of system
 configuration files and how to configure
 systems with non-standard hardware configurations.
@@ -78,12 +80,14 @@ process operates are included.  An appen
 contains a summary of the rules used by the system
 in calculating the size of system data structures,
 and also indicates some of the standard system size
-limitations (and how to change them).
+limitations and how to change them.
 Other configuration options are also listed.
 .sp
 .LP
 Revised July 5, 1993
+.LP
+Revised for NetBSD beginning July 5, 2014
 .AE
 .LP
-.OH 'Building 4.4BSD Kernels with Config''SMM:2-%'
-.EH 'SMM:2-%''Building 4.4BSD Kernels with Config'
+.OH 'Building NetBSD Kernels with Config''Command Reference Documents'
+.EH 'Command Reference Documents''Building NetBSD Kernels with Config'
Index: src/share/doc/smm/config/1.t
diff -u src/share/doc/smm/config/1.t:1.1 src/share/doc/smm/config/1.t:1.2
--- src/share/doc/smm/config/1.t:1.1	Tue Dec 18 03:35:51 2007
+++ src/share/doc/smm/config/1.t	Sun Jul  6 05:16:18 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: 1.t,v 1.1 2007/12/18 03:35:51 garbled Exp $
+.\" $NetBSD: 1.t,v 1.2 2014/07/06 05:16:18 dholland Exp $
 .\" Copyright (c) 1983, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -39,10 +39,10 @@
 INTRODUCTION
 .PP
 .I Config
-is a tool used in building 4.4BSD system images (the UNIX kernel).
-It takes a file describing a system's tunable parameters and
-hardware support, and generates a collection
-of files which are then used to build a copy of UNIX appropriate
+is a tool used in building BSD kernel images.
+It takes a file describing the tunable parameter settings, features,
+and drivers to include, and generates a collection
+of files which are then used to build a copy of the kernel appropriate
 to that configuration.
 .I Config
 simplifies system maintenance by isolating system dependencies
Index: src/share/doc/smm/config/2.t
diff -u src/share/doc/smm/config/2.t:1.1 src/share/doc/smm/config/2.t:1.2
--- src/share/doc/smm/config/2.t:1.1	Tue Dec 18 03:35:52 2007
+++ src/share/doc/smm/config/2.t	Sun Jul  6 05:16:18 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: 2.t,v 1.1 2007/12/18 03:35:52 garbled Exp $
+.\" $NetBSD: 2.t,v 1.2 2014/07/06 05:16:18 dholland Exp $
 .\" Copyright (c) 1983, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -69,7 +69,7 @@ indicates if the system is going to oper
 \(dg DEC, VAX, UNIBUS, MASSBUS and MicroVAX are trademarks of Digital
 Equipment Corporation.
 .FE
-or some other machine on which 4.4BSD operates.  The machine type
+or some other machine on which NetBSD operates.  The machine type
 is used to locate certain data files which are machine specific, and
 also to select rules used in constructing the resultant
 configuration files.
@@ -179,8 +179,8 @@ System options
 Other than the mandatory pieces of information described above, it
 is also possible to include

CVS commit: src/sys/netmpls

2014-07-05 Thread Tyler R. Retzlaff

Module Name:src
Committed By:   rtr
Date:   Sun Jul  6 04:47:26 UTC 2014

Modified Files:
src/sys/netmpls: mpls_proto.c

Log Message:
* split PRU_SENSE functionality out of mpls_usrreq() and place into
  separate mpls_stat(struct socket *, struct stat *) function

missed this in previous commit, fixes build of ALL kernel.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/netmpls/mpls_proto.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/netmpls/mpls_proto.c
diff -u src/sys/netmpls/mpls_proto.c:1.11 src/sys/netmpls/mpls_proto.c:1.12
--- src/sys/netmpls/mpls_proto.c:1.11	Tue Jul  1 05:49:19 2014
+++ src/sys/netmpls/mpls_proto.c	Sun Jul  6 04:47:26 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpls_proto.c,v 1.11 2014/07/01 05:49:19 rtr Exp $ */
+/*	$NetBSD: mpls_proto.c,v 1.12 2014/07/06 04:47:26 rtr Exp $ */
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mpls_proto.c,v 1.11 2014/07/01 05:49:19 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpls_proto.c,v 1.12 2014/07/06 04:47:26 rtr Exp $");
 
 #include "opt_inet.h"
 #include "opt_mbuftrace.h"
@@ -101,6 +101,12 @@ mpls_ioctl(struct socket *so, u_long cmd
 }
 
 static int
+mpls_stat(struct socket *so, struct stat *ub)
+{
+	return EOPNOTSUPP;
+}
+
+static int
 mpls_usrreq(struct socket *so, int req, struct mbuf *m,
 struct mbuf *nam, struct mbuf *control, struct lwp *l)
 {
@@ -192,12 +198,14 @@ PR_WRAP_USRREQS(mpls)
 #define	mpls_attach	mpls_attach_wrapper
 #define	mpls_detach	mpls_detach_wrapper
 #define	mpls_ioctl	mpls_ioctl_wrapper
+#define	mpls_stat	mpls_stat_wrapper
 #define	mpls_usrreq	mpls_usrreq_wrapper
 
 static const struct pr_usrreqs mpls_usrreqs = {
 	.pr_attach	= mpls_attach,
 	.pr_detach	= mpls_detach,
 	.pr_ioctl	= mpls_ioctl,
+	.pr_stat	= mpls_stat,
 	.pr_generic	= mpls_usrreq,
 };

CVS commit: src/sys

2014-07-05 Thread Tyler R. Retzlaff

Module Name:src
Committed By:   rtr
Date:   Sun Jul  6 03:33:33 UTC 2014

Modified Files:
src/sys/kern: sys_socket.c uipc_usrreq.c
src/sys/net: raw_usrreq.c rtsock.c
src/sys/netatalk: ddp_usrreq.c
src/sys/netbt: hci_socket.c l2cap_socket.c rfcomm_socket.c sco_socket.c
src/sys/netinet: raw_ip.c tcp_usrreq.c udp_usrreq.c
src/sys/netinet6: raw_ip6.c udp6_usrreq.c
src/sys/netipsec: keysock.c
src/sys/netnatm: natm.c
src/sys/sys: protosw.h

Log Message:
* split PRU_SENSE functionality out of xxx_usrreq() switches and place into
  separate xxx_stat(struct socket *, struct stat *) functions.
* replace calls using pr_generic with req == PRU_SENSE with pr_stat().

further change will follow that cleans up the pattern used to extract the
pcb and test for its presence.

reviewed by rmind


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/kern/sys_socket.c
cvs rdiff -u -r1.155 -r1.156 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.40 -r1.41 src/sys/net/raw_usrreq.c
cvs rdiff -u -r1.149 -r1.150 src/sys/net/rtsock.c
cvs rdiff -u -r1.47 -r1.48 src/sys/netatalk/ddp_usrreq.c
cvs rdiff -u -r1.26 -r1.27 src/sys/netbt/hci_socket.c
cvs rdiff -u -r1.17 -r1.18 src/sys/netbt/l2cap_socket.c
cvs rdiff -u -r1.18 -r1.19 src/sys/netbt/rfcomm_socket.c
cvs rdiff -u -r1.19 -r1.20 src/sys/netbt/sco_socket.c
cvs rdiff -u -r1.127 -r1.128 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.180 -r1.181 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.202 -r1.203 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.121 -r1.122 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.101 -r1.102 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.29 -r1.30 src/sys/netipsec/keysock.c
cvs rdiff -u -r1.29 -r1.30 src/sys/netnatm/natm.c
cvs rdiff -u -r1.49 -r1.50 src/sys/sys/protosw.h

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

Modified files:

Index: src/sys/kern/sys_socket.c
diff -u src/sys/kern/sys_socket.c:1.71 src/sys/kern/sys_socket.c:1.72
--- src/sys/kern/sys_socket.c:1.71	Tue Jul  1 05:49:18 2014
+++ src/sys/kern/sys_socket.c	Sun Jul  6 03:33:33 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_socket.c,v 1.71 2014/07/01 05:49:18 rtr Exp $	*/
+/*	$NetBSD: sys_socket.c,v 1.72 2014/07/06 03:33:33 rtr Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.71 2014/07/01 05:49:18 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.72 2014/07/06 03:33:33 rtr Exp $");
 
 #include 
 #include 
@@ -239,8 +239,7 @@ soo_stat(file_t *fp, struct stat *ub)
 	ub->st_mode = S_IFSOCK;
 
 	solock(so);
-	error = (*so->so_proto->pr_usrreqs->pr_generic)(so, PRU_SENSE,
-	(struct mbuf *)ub, NULL, NULL, curlwp);
+	error = (*so->so_proto->pr_usrreqs->pr_stat)(so, ub);
 	sounlock(so);
 
 	return error;

Index: src/sys/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.155 src/sys/kern/uipc_usrreq.c:1.156
--- src/sys/kern/uipc_usrreq.c:1.155	Tue Jul  1 05:49:18 2014
+++ src/sys/kern/uipc_usrreq.c	Sun Jul  6 03:33:33 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_usrreq.c,v 1.155 2014/07/01 05:49:18 rtr Exp $	*/
+/*	$NetBSD: uipc_usrreq.c,v 1.156 2014/07/06 03:33:33 rtr Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.155 2014/07/01 05:49:18 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.156 2014/07/06 03:33:33 rtr Exp $");
 
 #include 
 #include 
@@ -377,6 +377,7 @@ unp_usrreq(struct socket *so, int req, s
 	KASSERT(req != PRU_ATTACH);
 	KASSERT(req != PRU_DETACH);
 	KASSERT(req != PRU_CONTROL);
+	KASSERT(req != PRU_SENSE);
 
 	KASSERT(solocked(so));
 	unp = sotounpcb(so);
@@ -627,30 +628,6 @@ unp_usrreq(struct socket *so, int req, s
 		unp_detach(so);
 		break;
 
-	case PRU_SENSE:
-		((struct stat *) m)->st_blksize = so->so_snd.sb_hiwat;
-		switch (so->so_type) {
-		case SOCK_SEQPACKET: /* FALLTHROUGH */
-		case SOCK_STREAM:
-			if (unp->unp_conn == 0) 
-break;
-
-			so2 = unp->unp_conn->unp_socket;
-			KASSERT(solocked2(so, so2));
-			((struct stat *) m)->st_blksize += so2->so_rcv.sb_cc;
-			break;
-		default:
-			break;
-		}
-		((struct stat *) m)->st_dev = NODEV;
-		if (unp->unp_ino == 0)
-			unp->unp_ino = unp_ino++;
-		((struct stat *) m)->st_atimespec =
-		((struct stat *) m)->st_mtimespec =
-		((struct stat *) m)->st_ctimespec = unp->unp_ctime;
-		((struct stat *) m)->st_ino = unp->unp_ino;
-		return (0);
-
 	case PRU_RCVOOB:
 		error = EOPNOTSUPP;
 		break;
@@ -871,6 +848,38 @@ unp_ioctl(struct socket *so, u_long cmd,
 	return EOPNOTSUPP;
 }
 
+static int
+unp_stat(struct socket *so, struct stat *ub)
+{
+	struct unpcb *unp;
+	struct socket *so2;
+
+	unp = sotounpcb(so);
+	if (unp == NULL)
+		return EINVAL;
+
+	ub->st_blksize = so->so_snd.sb_hiwat;
+	switch (so->so_type) {
+	case SOCK_SEQP

CVS commit: src/common/lib/libc/atomic

2014-07-05 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sun Jul  6 01:19:45 UTC 2014

Modified Files:
src/common/lib/libc/atomic: atomic_load.c atomic_store.c

Log Message:
Add unused memory model argument to make GCC happy.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/atomic/atomic_load.c \
src/common/lib/libc/atomic/atomic_store.c

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

Modified files:

Index: src/common/lib/libc/atomic/atomic_load.c
diff -u src/common/lib/libc/atomic/atomic_load.c:1.1 src/common/lib/libc/atomic/atomic_load.c:1.2
--- src/common/lib/libc/atomic/atomic_load.c:1.1	Sat Jul  5 20:44:46 2014
+++ src/common/lib/libc/atomic/atomic_load.c	Sun Jul  6 01:19:45 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: atomic_load.c,v 1.1 2014/07/05 20:44:46 joerg Exp $	*/
+/*	$NetBSD: atomic_load.c,v 1.2 2014/07/06 01:19:45 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: atomic_load.c,v 1.1 2014/07/05 20:44:46 joerg Exp $");
+__RCSID("$NetBSD: atomic_load.c,v 1.2 2014/07/06 01:19:45 joerg Exp $");
 
 #include "atomic_op_namespace.h"
 
@@ -35,9 +35,9 @@ __RCSID("$NetBSD: atomic_load.c,v 1.1 20
 #include 
 
 #define atomic_load_n(n,b) \
-uint ## b ## _t __atomic_load_ ## n(volatile uint ## b ## _t *); \
+uint ## b ## _t __atomic_load_ ## n(volatile uint ## b ## _t *, int); \
 uint ## b ## _t \
-__atomic_load_ ## n(volatile uint ## b ## _t *ptr) \
+__atomic_load_ ## n(volatile uint ## b ## _t *ptr, int memmodel) \
 { \
 	uint## b ##_t val; \
 	membar_enter(); \
Index: src/common/lib/libc/atomic/atomic_store.c
diff -u src/common/lib/libc/atomic/atomic_store.c:1.1 src/common/lib/libc/atomic/atomic_store.c:1.2
--- src/common/lib/libc/atomic/atomic_store.c:1.1	Sat Jul  5 20:44:46 2014
+++ src/common/lib/libc/atomic/atomic_store.c	Sun Jul  6 01:19:45 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: atomic_store.c,v 1.1 2014/07/05 20:44:46 joerg Exp $	*/
+/*	$NetBSD: atomic_store.c,v 1.2 2014/07/06 01:19:45 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: atomic_store.c,v 1.1 2014/07/05 20:44:46 joerg Exp $");
+__RCSID("$NetBSD: atomic_store.c,v 1.2 2014/07/06 01:19:45 joerg Exp $");
 
 #include "atomic_op_namespace.h"
 
@@ -35,9 +35,10 @@ __RCSID("$NetBSD: atomic_store.c,v 1.1 2
 #include 
 
 #define atomic_store_n(n,b) \
-void __atomic_store_ ## n(volatile uint ## b ## _t *, uint ## b ## _t); \
+void __atomic_store_ ## n(volatile uint ## b ## _t *, uint ## b ## _t, int); \
 void \
-__atomic_store_ ## n(volatile uint ## b ## _t *ptr, uint ## b ## _t val) \
+__atomic_store_ ## n(volatile uint ## b ## _t *ptr, uint ## b ## _t val, \
+ int memmodel) \
 { \
 	membar_enter(); \
 	*ptr = val; \

CVS commit: src

2014-07-05 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sun Jul  6 00:21:24 UTC 2014

Modified Files:
src/doc: TODO.clang
src/external/gpl3/gcc/usr.bin/backend: Makefile

Log Message:
When building GCC with Clang, disable optimizations for tree.c until I
can figure out what is responsible for the miscompilation.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/doc/TODO.clang
cvs rdiff -u -r1.21 -r1.22 src/external/gpl3/gcc/usr.bin/backend/Makefile

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

Modified files:

Index: src/doc/TODO.clang
diff -u src/doc/TODO.clang:1.11 src/doc/TODO.clang:1.12
--- src/doc/TODO.clang:1.11	Sat Jul  5 20:45:49 2014
+++ src/doc/TODO.clang	Sun Jul  6 00:21:24 2014
@@ -1,4 +1,4 @@
-$NetBSD: TODO.clang,v 1.11 2014/07/05 20:45:49 joerg Exp $
+$NetBSD: TODO.clang,v 1.12 2014/07/06 00:21:24 joerg Exp $
 
 Hacks for the clang integration
 ---
@@ -8,3 +8,6 @@ for the incomplete explicit positioning 
 
 Workaround for .fpu handling in src/sys/lib/libunwind for ARM by forcing
 GNU as.
+
+src/external/gpl3/gcc/usr.bin/backend forces tree.c to be compiled with -O0.
+g++ otherwise on trivial input.

Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.21 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.22
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.21	Sat Mar 15 20:46:38 2014
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile	Sun Jul  6 00:21:24 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.21 2014/03/15 20:46:38 mrg Exp $
+#	$NetBSD: Makefile,v 1.22 2014/07/06 00:21:24 joerg Exp $
 
 LIBISPRIVATE=	yes
 
@@ -402,5 +402,7 @@ COPTS.lambda-code.c=		-O0
 COPTS.tree-loop-linear.c=	-O0
 .endif
 
+COPTS.tree.c=	${${ACTIVE_CC} == "clang" :? -O0 :}
+
 .PATH: ${DIST}/gcc ${DIST}/libiberty ${GCCARCH} ${G_out_file:H} ${DIST}/include
 .PATH: ${DIST}/gcc/config

CVS commit: src/bin/sh

2014-07-05 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Jul  5 23:13:41 UTC 2014

Modified Files:
src/bin/sh: Makefile

Log Message:
remove .if make(install)


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/bin/sh/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/sh/Makefile
diff -u src/bin/sh/Makefile:1.99 src/bin/sh/Makefile:1.100
--- src/bin/sh/Makefile:1.99	Sun Dec  2 12:55:27 2012
+++ src/bin/sh/Makefile	Sat Jul  5 23:13:41 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.99 2012/12/02 12:55:27 apb Exp $
+#	$NetBSD: Makefile,v 1.100 2014/07/05 23:13:41 dholland Exp $
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
 
 .include 
@@ -77,9 +77,7 @@ nodes.c nodes.h: mknodes.sh nodetypes no
 NBCOMPATLIB=   -L${TOOLDIR}/lib -lnbcompat
 .endif
 
-.if make(install)
 SUBDIR+=USD.doc
-.endif
 
 COPTS.printf.c = -Wno-format-nonliteral
 COPTS.jobs.c = -Wno-format-nonliteral

CVS commit: src/bin/csh

2014-07-05 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Jul  5 23:12:33 UTC 2014

Modified Files:
src/bin/csh: Makefile

Log Message:
remove .if make(install)
these are seriously bad juju


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/bin/csh/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/csh/Makefile
diff -u src/bin/csh/Makefile:1.40 src/bin/csh/Makefile:1.41
--- src/bin/csh/Makefile:1.40	Fri Jun 13 01:17:45 2014
+++ src/bin/csh/Makefile	Sat Jul  5 23:12:33 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.40 2014/06/13 01:17:45 mrg Exp $
+#	$NetBSD: Makefile,v 1.41 2014/07/05 23:12:33 dholland Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 #
 # C Shell with process control; VM/UNIX VAX Makefile
@@ -52,9 +52,7 @@ const.h: const.c
 	${TOOL_SED} -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
 	sort >> ${.TARGET}
 
-.if make(install)
 SUBDIR+=USD.doc
-.endif
 
 COPTS.err.c = -Wno-format-nonliteral
 COPTS.printf.c = -Wno-format-nonliteral

CVS commit: src/lib/libcurses

2014-07-05 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Jul  5 22:31:33 UTC 2014

Modified Files:
src/lib/libcurses: Makefile

Log Message:
Remove stray .if make(insatll).

I would really like to know why this didn't fail the clean build I ran
last night.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/lib/libcurses/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/libcurses/Makefile
diff -u src/lib/libcurses/Makefile:1.70 src/lib/libcurses/Makefile:1.71
--- src/lib/libcurses/Makefile:1.70	Fri Jun 13 01:17:45 2014
+++ src/lib/libcurses/Makefile	Sat Jul  5 22:31:32 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.70 2014/06/13 01:17:45 mrg Exp $
+#	$NetBSD: Makefile,v 1.71 2014/07/05 22:31:32 dholland Exp $
 #	@(#)Makefile	8.2 (Berkeley) 1/2/94
 
 .include 
@@ -176,9 +176,7 @@ MLINKS+= curses_addch.3 addch.3 curses_a
 	 curses_touch.3 wtouchln.3 curses_underscore.3 wunderend.3 \
 	 curses_underscore.3 wunderscore.3 curses_line.3 wvline.3
 
-.if make(install)
 SUBDIR+= PSD.doc
-.endif
 
 fileio.h: shlib_version genfileioh.awk
 	${TOOL_AWK} -f ${.CURDIR}/genfileioh.awk < ${.CURDIR}/shlib_version > ${.CURDIR}/fileio.h

CVS commit: src/distrib/sets/lists

2014-07-05 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Jul  5 22:08:14 UTC 2014

Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/misc: mi

Log Message:
Put /usr/share/doc/reference/ref1/make in the right list. The dirs are
always created.


To generate a diff of this commit:
cvs rdiff -u -r1.1069 -r1.1070 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.189 -r1.190 src/distrib/sets/lists/misc/mi

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1069 src/distrib/sets/lists/base/mi:1.1070
--- src/distrib/sets/lists/base/mi:1.1069	Sat Jul  5 20:17:50 2014
+++ src/distrib/sets/lists/base/mi	Sat Jul  5 22:08:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1069 2014/07/05 20:17:50 joerg Exp $
+# $NetBSD: mi,v 1.1070 2014/07/05 22:08:14 dholland Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1700,6 +1700,7 @@
 ./usr/share/doc/reference/ref1/ex		base-usd-share
 ./usr/share/doc/reference/ref1/gprof		base-usd-share
 ./usr/share/doc/reference/ref1/mail		base-usd-share
+./usr/share/doc/reference/ref1/make		base-psd-share
 ./usr/share/doc/reference/ref1/roff		base-usd-share
 ./usr/share/doc/reference/ref1/roff/msmacros	base-usd-share
 ./usr/share/doc/reference/ref1/roff/msdiffs	base-usd-share

Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.189 src/distrib/sets/lists/misc/mi:1.190
--- src/distrib/sets/lists/misc/mi:1.189	Sat Jul  5 19:25:58 2014
+++ src/distrib/sets/lists/misc/mi	Sat Jul  5 22:08:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.189 2014/07/05 19:25:58 dholland Exp $
+# $NetBSD: mi,v 1.190 2014/07/05 22:08:14 dholland Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -661,7 +661,6 @@
 ./usr/share/doc/reference/ref1/mail/mail.html			misc-usd-doc		doc
 ./usr/share/doc/reference/ref1/mail/mail.ps.gz			misc-usd-doc		doc
 ./usr/share/doc/reference/ref1/mail/mail.txt			misc-usd-doc		doc
-./usr/share/doc/reference/ref1/makemisc-psd-doc		doc
 ./usr/share/doc/reference/ref1/make/make.html			misc-psd-doc		doc
 ./usr/share/doc/reference/ref1/make/make.ps.gz			misc-psd-doc		doc
 ./usr/share/doc/reference/ref1/make/make.txt			misc-psd-doc		doc

CVS commit: src/sys/net

2014-07-05 Thread Alexander Nasonov

Module Name:src
Committed By:   alnsn
Date:   Sat Jul  5 22:06:11 UTC 2014

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

Log Message:
Implement error checking in m_xbyte() and check for errors after m_xbyte() call.
Reuse (len - k) expression in m_xword() and m_xhalf() to give an optimization
hint to a compiler.

When m_xbyte() didn't exist, bpf_filter() handled out-of-bounds BPF_B loads
correctly because "return 0" inside MINDEX() was aborting filter programs.
After the change that added m_xbyte() zero values were passed to A or X
registers instead of aborting a filter program.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/net/bpf_filter.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/net/bpf_filter.c
diff -u src/sys/net/bpf_filter.c:1.65 src/sys/net/bpf_filter.c:1.66
--- src/sys/net/bpf_filter.c:1.65	Wed Jun 25 09:51:34 2014
+++ src/sys/net/bpf_filter.c	Sat Jul  5 22:06:11 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: bpf_filter.c,v 1.65 2014/06/25 09:51:34 alnsn Exp $	*/
+/*	$NetBSD: bpf_filter.c,v 1.66 2014/07/05 22:06:11 alnsn Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bpf_filter.c,v 1.65 2014/06/25 09:51:34 alnsn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf_filter.c,v 1.66 2014/07/05 22:06:11 alnsn Exp $");
 
 #if 0
 #if !(defined(lint) || defined(KERNEL))
@@ -124,12 +124,12 @@ m_xword(const struct mbuf *m, uint32_t k
 	*err = 1;
 	MINDEX(len, m, k);
 	cp = mtod(m, u_char *) + k;
-	if (len >= k + 4) {
+	if (len - k >= 4) {
 		*err = 0;
 		return EXTRACT_LONG(cp);
 	}
 	m0 = m->m_next;
-	if (m0 == 0 || m0->m_len + len - k < 4)
+	if (m0 == 0 || (len - k) + m0->m_len < 4)
 		return 0;
 	*err = 0;
 	np = mtod(m0, u_char *);
@@ -154,7 +154,7 @@ m_xhalf(const struct mbuf *m, uint32_t k
 	*err = 1;
 	MINDEX(len, m, k);
 	cp = mtod(m, u_char *) + k;
-	if (len >= k + 2) {
+	if (len - k >= 2) {
 		*err = 0;
 		return EXTRACT_SHORT(cp);
 	}
@@ -170,8 +170,9 @@ m_xbyte(const struct mbuf *m, uint32_t k
 {
 	int len;
 
-	*err = 0;
+	*err = 1;
 	MINDEX(len, m, k);
+	*err = 0;
 	return mtod(m, u_char *)[k];
 }
 #else /* _KERNEL */
@@ -306,6 +307,8 @@ bpf_filter(const struct bpf_insn *pc, co
 if (args->buflen != 0)
 	return 0;
 A = xbyte(args->pkt, k, &merr);
+if (merr != 0)
+	return 0;
 continue;
 #else
 return 0;
@@ -374,6 +377,8 @@ bpf_filter(const struct bpf_insn *pc, co
 if (args->buflen != 0)
 	return 0;
 A = xbyte(args->pkt, k, &merr);
+if (merr != 0)
+	return 0;
 continue;
 #else
 return 0;
@@ -391,6 +396,8 @@ bpf_filter(const struct bpf_insn *pc, co
 if (args->buflen != 0)
 	return 0;
 X = (xbyte(args->pkt, k, &merr) & 0xf) << 2;
+if (merr != 0)
+	return 0;
 continue;
 #else
 return 0;

CVS commit: src

2014-07-05 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Jul  5 20:45:49 UTC 2014

Modified Files:
src/doc: TODO.clang
src/external/bsd/libc++/lib: Makefile
src/external/bsd/llvm/lib/libLLVMSupport: Makefile

Log Message:
Remove atomic hack for ARM, libc now provides the missing symbols.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/doc/TODO.clang
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libc++/lib/Makefile
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/llvm/lib/libLLVMSupport/Makefile

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

Modified files:

Index: src/doc/TODO.clang
diff -u src/doc/TODO.clang:1.10 src/doc/TODO.clang:1.11
--- src/doc/TODO.clang:1.10	Sat Jun 28 20:18:15 2014
+++ src/doc/TODO.clang	Sat Jul  5 20:45:49 2014
@@ -1,4 +1,4 @@
-$NetBSD: TODO.clang,v 1.10 2014/06/28 20:18:15 joerg Exp $
+$NetBSD: TODO.clang,v 1.11 2014/07/05 20:45:49 joerg Exp $
 
 Hacks for the clang integration
 ---
@@ -6,9 +6,5 @@ Hacks for the clang integration
 "-no-integrated-as" is used in src/sys/arch/i386/stand to compensate
 for the incomplete explicit positioning support in LLVM MC.
 
-Missing atomic support in ARM libgcc, -march=armv6 "workaround":
-src/external/bsd/libc++/lib
-src/external/bsd/lllvm/lib/libLLVMSupport
-
 Workaround for .fpu handling in src/sys/lib/libunwind for ARM by forcing
 GNU as.

Index: src/external/bsd/libc++/lib/Makefile
diff -u src/external/bsd/libc++/lib/Makefile:1.5 src/external/bsd/libc++/lib/Makefile:1.6
--- src/external/bsd/libc++/lib/Makefile:1.5	Wed Jan 15 21:14:55 2014
+++ src/external/bsd/libc++/lib/Makefile	Sat Jul  5 20:45:49 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2014/01/15 21:14:55 joerg Exp $
+#	$NetBSD: Makefile,v 1.6 2014/07/05 20:45:49 joerg Exp $
 
 LIB=		c++
 WARNS=		4
@@ -46,18 +46,4 @@ CWARNFLAGS.clang+=	-Wno-error=implicit-e
 
 LDADD+=	-Wl,-z,defs
 
-.if !empty(MACHINE_ARCH:M*arm*)
-# Missing __sync_fetch_and_add_4
-# Missing __sync_lock_test_and_set_4
-# Missing __sync_val_compare_and_swap_4
-# Missing __atomic_fetch_add_4
-COPTS.ios.cpp+= -march=armv6
-COPTS.locale.cpp+= -march=armv6
-COPTS.memory.cpp+= -march=armv6
-COPTS.new.cpp+= -march=armv6
-COPTS.rt_exception.cc+= -march=armv6
-COPTS.rt_guard.cc+= -march=armv6
-COPTS.stdexcept.cpp+= -march=armv6
-.endif
-
 .include 

Index: src/external/bsd/llvm/lib/libLLVMSupport/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMSupport/Makefile:1.27 src/external/bsd/llvm/lib/libLLVMSupport/Makefile:1.28
--- src/external/bsd/llvm/lib/libLLVMSupport/Makefile:1.27	Fri May 30 18:28:14 2014
+++ src/external/bsd/llvm/lib/libLLVMSupport/Makefile	Sat Jul  5 20:45:49 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2014/05/30 18:28:14 joerg Exp $
+#	$NetBSD: Makefile,v 1.28 2014/07/05 20:45:49 joerg Exp $
 
 LIB=	LLVMSupport
 
@@ -117,15 +117,6 @@ SRCS+=	Host.inc \
 CPPFLAGS.${src}+=	-std=gnu99
 .endfor
 
-.if !defined(HOSTLIB) && !empty(MACHINE_ARCH:M*arm*)
-# Missing __sync_fetch_and_add_4
-# Missing __sync_fetch_and_sub_4
-# Missing __sync_lock_test_and_set_4
-# Missing __sync_val_compare_and_swap_4
-# Missing __atomic_fetch_add_4
-COPTS.Atomic.cpp+= -march=armv6
-.endif
-
 .if defined(HOSTLIB)
 .include 
 .else

CVS commit: src/common/lib/libc

2014-07-05 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Jul  5 20:44:46 UTC 2014

Modified Files:
src/common/lib/libc/arch/arm/atomic: Makefile.inc
Added Files:
src/common/lib/libc/atomic: atomic_load.c atomic_store.c

Log Message:
Provide a basic implementation of __atomic_load_* and __atomic_store_*,
used by GCC and LLVM as backing for C11/C++11 atomics, if the hardware
is not known to have corresponding features. Include it on ARM as LLVM
and libc++ hit it when compiled for ARMv4.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/common/lib/libc/arch/arm/atomic/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/common/lib/libc/atomic/atomic_load.c \
src/common/lib/libc/atomic/atomic_store.c

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

Modified files:

Index: src/common/lib/libc/arch/arm/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.22 src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.23
--- src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.22	Tue Mar  4 16:15:28 2014
+++ src/common/lib/libc/arch/arm/atomic/Makefile.inc	Sat Jul  5 20:44:46 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.22 2014/03/04 16:15:28 matt Exp $
+#	$NetBSD: Makefile.inc,v 1.23 2014/07/05 20:44:46 joerg Exp $
 
 .ifnmake obj
 .include "${NETBSDSRCDIR}/common/lib/libc/arch/arm/features.mk"
@@ -23,7 +23,8 @@ SRCS.atomic+=	atomic_xor_32_cas.c atomic
 		atomic_and_16_cas.c atomic_and_8_cas.c \
 		atomic_add_16_cas.c atomic_add_8_cas.c \
 		atomic_swap_16_cas.c atomic_swap_8_cas.c \
-		atomic_cas_32_cas.c atomic_cas_16_cas.c atomic_cas_8_cas.c
+		atomic_cas_32_cas.c atomic_cas_16_cas.c atomic_cas_8_cas.c \
+		atomic_load.c atomic_store.c
 .endif
 
 .else

Added files:

Index: src/common/lib/libc/atomic/atomic_load.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_load.c:1.1
--- /dev/null	Sat Jul  5 20:44:46 2014
+++ src/common/lib/libc/atomic/atomic_load.c	Sat Jul  5 20:44:46 2014
@@ -0,0 +1,54 @@
+/*	$NetBSD: atomic_load.c,v 1.1 2014/07/05 20:44:46 joerg Exp $	*/
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include 
+__RCSID("$NetBSD: atomic_load.c,v 1.1 2014/07/05 20:44:46 joerg Exp $");
+
+#include "atomic_op_namespace.h"
+
+#include 
+#include 
+
+#define atomic_load_n(n,b) \
+uint ## b ## _t __atomic_load_ ## n(volatile uint ## b ## _t *); \
+uint ## b ## _t \
+__atomic_load_ ## n(volatile uint ## b ## _t *ptr) \
+{ \
+	uint## b ##_t val; \
+	membar_enter(); \
+	val = *ptr; \
+	membar_exit(); \
+	return val; \
+}
+
+atomic_load_n(1, 8)
+atomic_load_n(2, 16)
+atomic_load_n(4, 32)
+#ifdef	__HAVE_ATOMIC_CAS_64_UP
+atomic_load_n(8, 64)
+#endif
Index: src/common/lib/libc/atomic/atomic_store.c
diff -u /dev/null src/common/lib/libc/atomic/atomic_store.c:1.1
--- /dev/null	Sat Jul  5 20:44:46 2014
+++ src/common/lib/libc/atomic/atomic_store.c	Sat Jul  5 20:44:46 2014
@@ -0,0 +1,52 @@
+/*	$NetBSD: atomic_store.c,v 1.1 2014/07/05 20:44:46 joerg Exp $	*/
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+

CVS commit: src/distrib/sets/lists

2014-07-05 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Jul  5 20:17:51 UTC 2014

Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: ad.powerpc md.amd64 md.i386

Log Message:
Drop entries for LLVM/Clang older than 3.4.


To generate a diff of this commit:
cvs rdiff -u -r1.1068 -r1.1069 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/comp/ad.powerpc
cvs rdiff -u -r1.220 -r1.221 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.146 -r1.147 src/distrib/sets/lists/comp/md.i386

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1068 src/distrib/sets/lists/base/mi:1.1069
--- src/distrib/sets/lists/base/mi:1.1068	Sat Jul  5 19:25:58 2014
+++ src/distrib/sets/lists/base/mi	Sat Jul  5 20:17:50 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1068 2014/07/05 19:25:58 dholland Exp $
+# $NetBSD: mi,v 1.1069 2014/07/05 20:17:50 joerg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -819,9 +819,6 @@
 ./usr/include/c++/experimental			base-cxx-usr
 ./usr/include/c++/extbase-cxx-usr
 ./usr/include/cdkbase-obsolete		obsolete
-./usr/include/clang-3.0base-obsolete		obsolete
-./usr/include/clang-3.2base-obsolete		obsolete
-./usr/include/clang-3.3base-obsolete		obsolete
 ./usr/include/clang-3.4base-obsolete		obsolete
 ./usr/include/clang-3.5base-c-usr
 ./usr/include/compatbase-obsolete		obsolete

Index: src/distrib/sets/lists/comp/ad.powerpc
diff -u src/distrib/sets/lists/comp/ad.powerpc:1.68 src/distrib/sets/lists/comp/ad.powerpc:1.69
--- src/distrib/sets/lists/comp/ad.powerpc:1.68	Wed May 28 09:38:46 2014
+++ src/distrib/sets/lists/comp/ad.powerpc	Sat Jul  5 20:17:51 2014
@@ -1,10 +1,7 @@
-# $NetBSD: ad.powerpc,v 1.68 2014/05/28 09:38:46 mrg Exp $
+# $NetBSD: ad.powerpc,v 1.69 2014/07/05 20:17:51 joerg Exp $
 ./usr/bin/elf2aoutcomp-sysutil-bin
 ./usr/bin/psim	comp-debug-bin		gdb
 ./usr/include/altivec.hcomp-obsolete		obsolete
-./usr/include/clang-3.0/altivec.h		comp-obsolete		obsolete
-./usr/include/clang-3.2/altivec.h		comp-obsolete		obsolete
-./usr/include/clang-3.3/altivec.h		comp-obsolete		obsolete
 ./usr/include/clang-3.4/altivec.h		comp-obsolete		obsolete
 ./usr/include/clang-3.5/altivec.h		comp-c-include		llvm
 ./usr/include/g++/bits/powerpc			comp-c-include		compat,arch64

Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.220 src/distrib/sets/lists/comp/md.amd64:1.221
--- src/distrib/sets/lists/comp/md.amd64:1.220	Fri May 30 18:28:13 2014
+++ src/distrib/sets/lists/comp/md.amd64	Sat Jul  5 20:17:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.220 2014/05/30 18:28:13 joerg Exp $
+# $NetBSD: md.amd64,v 1.221 2014/07/05 20:17:51 joerg Exp $
 
 ./usr/include/amd64comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
@@ -69,79 +69,6 @@
 ./usr/include/amd64/varargs.h			comp-obsolete		obsolete
 ./usr/include/amd64/vmparam.h			comp-c-include
 ./usr/include/amd64/wchar_limits.h		comp-c-include
-./usr/include/clang-3.0/avx2intrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/avxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/bmi2intrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/bmiintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/emmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/fma4intrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/immintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/lzcntintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/mm3dnow.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/mm_malloc.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/mmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/nmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/pmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/popcntintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/smmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/tmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/wmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/x86intrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/xmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.2/__wmmintrin_aes.h	comp-obsolete		obsolete
-./usr/include/clang-3.2/__wmmintrin_pclmul.h	comp-obsolete		obsolete
-./usr/include/clang-3.2/ammintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.2/avx2intrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.2/avxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.2/bmi2intrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.2/bmiintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.2/emmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.2/f16cintrin.h		comp-obsolete		obsolete
-./usr/include/c

CVS commit: src/share/doc

2014-07-05 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Jul  5 19:36:16 UTC 2014

Added Files:
src/share/doc: README.docdirs

Log Message:
Add a file to help keep track of what's where and what we never
actually had.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/share/doc/README.docdirs

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

Added files:

Index: src/share/doc/README.docdirs
diff -u /dev/null src/share/doc/README.docdirs:1.1
--- /dev/null	Sat Jul  5 19:36:16 2014
+++ src/share/doc/README.docdirs	Sat Jul  5 19:36:16 2014
@@ -0,0 +1,152 @@
+In July 2014 the layout of /usr/share/doc was drastically rearranged.
+Because of the lack of rename support in CVS, the source dirs for the
+docs have not yet been rearranged to match. (And also, many of the
+source dirs are scattered across the tree and are hard to find
+anyhow.)
+
+The following is a hopefully complete list of the /usr/share/doc docs
+and where they come from. For things in external, I've listed where
+the makefiles that install the docs are; these point to the doc
+sources, which are usually somewhere somewhat different.
+
+
+Reference docs (in /usr/share/doc/reference/ref[1-9])
+
+
+	ref1/atf		src/external/bsd/atf
+	ref1/bzip		src/lib/libbz2
+	ref1/config		src/share/doc/smm/config
+	ref1/csh		src/bin/csh/USD.doc
+	ref1/ex			src/external/bsd/nvi/docs/USD.doc/exref
+	ref1/gprof		src/usr.bin/gprof/PSD.doc
+	ref1/kyua/*		src/external/bsd/kyua-*/share/doc/kyua-*
+	ref1/mail		src/usr.bin/mail/USD.doc
+	ref1/make		src/usr.bin/make/USD.doc
+	ref1/roff/memacros	src/share/doc/usd/19.memacros
+	ref1/roff/meref		src/share/doc/usd/20.meref
+	ref1/roff/msdiffs	src/share/doc/usd/18.msdiffs
+	ref1/roff/msmacros	src/share/doc/usd/17.msmacros
+	ref1/roff/mom		src/gnu/usr.bin/groff/contrib/mom/momdoc
+	ref1/roff/mom_examples	src/gnu/usr.bin/groff/contrib/mom/examples
+	ref1/sh			src/bin/sh/USD.doc
+	ref1/vi			src/external/bsd/nvi/docs/USD.doc/vi.ref
+
+	ref3/curses		src/lib/libcurses/PSD.doc
+	ref3/sysman		src/share/doc/psd/05.sysman
+	ref3/sockets		src/share/doc/psd/20.ipctut
+	ref3/sockets-advanced	src/share/doc/psd/21.ipc
+
+	ref6/rogue		src/games/rogue/USD.doc
+	ref6/trek		src/games/trek/USD.doc
+
+	ref7/quotas		src/share/doc/smm/04.quotas
+
+	ref8/bind9		src/external/bsd/bind/bin/html
+	ref8/lpd		src/usr.sbin/lpr/SMM.doc
+	ref8/ntp		src/external/bsd/ntp/html
+	ref8/postfix		src/external/ibm-public/postfix/share/html
+	ref8/timedop		src/usr.sbin/timed/SMM.doc/timedop
+	ref8/timed		src/usr.sbin/timed/SMM.doc/timed
+
+	ref9/net		src/share/doc/smm/18.net
+	ref9/nfs		src/share/doc/smm/06.nfs
+
+Papers (in /usr/share/doc/papers)
+
+
+	mckusick84-ffs		src/share/doc/smm/05.fastfs
+	mckusick85-fsck		src/sbin/fsck_ffs/SMM.doc
+	morris78-password	src/share/doc/smm/17.password
+
+User supplementary documents (in /usr/share/doc/usd)
+
+
+	beginner		src/share/doc/usd/01.begin
+	ed			external/bsd/nvi/docs/USD.doc/edit
+	vi			external/bsd/nvi/docs/USD.doc/vitut
+
+System manager manual (in /usr/share/doc/smm)
+
+
+	(none)
+
+Programmer supplementary documents (in /usr/share/doc/psd)
+
+
+	(none)
+
+
+
+Here is a list of the historic documents as of just before the reorg:
+
+
+	usd/01.begin		kept in USD
+	usd/02.learn		missing
+	usd/03.shell		-> ref1/sh
+	usd/04.csh		-> ref1/csh
+	usd/05.dc		missing
+	usd/06.bc		missing
+	usd/07.mail		-> ref1/mail
+	usd/08.mh		missing
+	usd/09.edtut		missing
+	usd/10.edadv		missing
+	usd/11.edit		kept in USD
+	usd/12.ex		-> ref1/ex
+	usd/12.vi		kept in USD
+	usd/13.viref		-> ref1/vi
+	usd/14.jove		missing
+	usd/15.sed		missing
+	usd/16.awk		missing
+	usd/17.msmacros		-> ref1/roff/msmacros
+	usd/18.msdiffs		-> ref1/roff/msdiffs
+	usd/19.memacros		-> ref1/roff/memacros
+	usd/20.meref		-> ref1/roff/meref
+	usd/21.troff		missing
+	usd/22.trofftut		missing
+	usd/23.eqn		missing
+	usd/24.eqnguide		missing
+	usd/25.tbl		missing
+	usd/26.refer		missing
+	usd/27.invert		missing
+	usd/28.bib		missing
+	usd/29.diction		missing
+	usd/30.rogue		-> ref6/rogue
+	usd/31.trek		-> ref6/trek
+
+	smm/01.setup		kept (for now) in SMM
+	smm/02.config		-> ref1/config
+	smm/03.fsck_ffs		-> papers/mckusick85-fsck
+	smm/04.quotas		-> ref7/quotas
+	smm/05.fastfs		-> papers/mckusick84-ffs
+	smm/06.nfs		-> ref9/nfs
+	smm/07.lpd		-> ref8/lpd
+	smm/11.timedop		-> ref8/timed
+	smm/12.timed		-> ref5/timed
+	smm/13.amd		missing
+	smm/16.security		missing
+	smm/17.password		-> papers/morris78-password
+	smm/18.net		-> ref9/net
+
+	(It is not clear what happened to SMM docs 8-10, 14-15, and 19+.)
+
+	psd/01.cacm		missing
+	p

CVS commit: src/etc/mtree

2014-07-05 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Jul  5 19:23:56 UTC 2014

Modified Files:
src/etc/mtree: NetBSD.dist.base

Log Message:
Update the distrib-dirs mtree specification for the new /usr/share/doc
layout.


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/etc/mtree/NetBSD.dist.base

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

Modified files:

Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.135 src/etc/mtree/NetBSD.dist.base:1.136
--- src/etc/mtree/NetBSD.dist.base:1.135	Mon Mar 31 11:25:48 2014
+++ src/etc/mtree/NetBSD.dist.base	Sat Jul  5 19:23:56 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.135 2014/03/31 11:25:48 martin Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.136 2014/07/05 19:23:56 dholland Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -271,95 +271,67 @@
 ./usr/share/dict/papers
 ./usr/share/dict/special
 ./usr/share/doc
-./usr/share/doc/atf
-./usr/share/doc/groff
-./usr/share/doc/groff/mom
-./usr/share/doc/html
-./usr/share/doc/html/bind9
-./usr/share/doc/html/bind9/arm
-./usr/share/doc/html/bzip2
-./usr/share/doc/html/groff
-./usr/share/doc/html/groff/mom
-./usr/share/doc/html/ntp
-./usr/share/doc/html/ntp/build
-./usr/share/doc/html/ntp/drivers
-./usr/share/doc/html/ntp/drivers/icons
-./usr/share/doc/html/ntp/drivers/scripts
-./usr/share/doc/html/ntp/icons
-./usr/share/doc/html/ntp/scripts
-./usr/share/doc/html/postfix
-./usr/share/doc/kyua-atf-compat
-./usr/share/doc/kyua-cli
-./usr/share/doc/kyua-testers
+./usr/share/doc/papers
+./usr/share/doc/papers/mckusick84-ffs
+./usr/share/doc/papers/mckusick85-fsck
+./usr/share/doc/papers/morris78-password
 ./usr/share/doc/psd
-./usr/share/doc/psd/01.cacm
-./usr/share/doc/psd/02.implement
-./usr/share/doc/psd/03.iosys
-./usr/share/doc/psd/04.uprog
-./usr/share/doc/psd/05.sysman
-./usr/share/doc/psd/06.Clang
-./usr/share/doc/psd/07.pascal
-./usr/share/doc/psd/08.f77
-./usr/share/doc/psd/09.f77io
-./usr/share/doc/psd/10.gdb
-./usr/share/doc/psd/11.adb
-./usr/share/doc/psd/12.make
-./usr/share/doc/psd/13.rcs
-./usr/share/doc/psd/14.sccs
-./usr/share/doc/psd/15.yacc
-./usr/share/doc/psd/16.lex
-./usr/share/doc/psd/17.m4
-./usr/share/doc/psd/18.gprof
-./usr/share/doc/psd/19.curses
-./usr/share/doc/psd/20.ipctut
-./usr/share/doc/psd/21.ipc
+./usr/share/doc/reference
+./usr/share/doc/reference/ref1
+./usr/share/doc/reference/ref1/atf
+./usr/share/doc/reference/ref1/bzip2
+./usr/share/doc/reference/ref1/config
+./usr/share/doc/reference/ref1/csh
+./usr/share/doc/reference/ref1/ex
+./usr/share/doc/reference/ref1/gprof
+./usr/share/doc/reference/ref1/kyua
+./usr/share/doc/reference/ref1/kyua/kyua-atf-compat
+./usr/share/doc/reference/ref1/kyua/kyua-cli
+./usr/share/doc/reference/ref1/kyua/kyua-testers
+./usr/share/doc/reference/ref1/mail
+./usr/share/doc/reference/ref1/make
+./usr/share/doc/reference/ref1/roff
+./usr/share/doc/reference/ref1/roff/memacros
+./usr/share/doc/reference/ref1/roff/meref
+./usr/share/doc/reference/ref1/roff/msdiffs
+./usr/share/doc/reference/ref1/roff/msmacros
+./usr/share/doc/reference/ref1/roff/mom
+./usr/share/doc/reference/ref1/roff/mom_examples
+./usr/share/doc/reference/ref1/sh
+./usr/share/doc/reference/ref1/vi
+./usr/share/doc/reference/ref2
+./usr/share/doc/reference/ref3
+./usr/share/doc/reference/ref3/curses
+./usr/share/doc/reference/ref3/sockets
+./usr/share/doc/reference/ref3/sockets-advanced
+./usr/share/doc/reference/ref3/sysman
+./usr/share/doc/reference/ref4
+./usr/share/doc/reference/ref5
+./usr/share/doc/reference/ref5/timed
+./usr/share/doc/reference/ref6
+./usr/share/doc/reference/ref6/rogue
+./usr/share/doc/reference/ref6/trek
+./usr/share/doc/reference/ref7
+./usr/share/doc/reference/ref7/quotas
+./usr/share/doc/reference/ref8
+./usr/share/doc/reference/ref8/bind9
+./usr/share/doc/reference/ref8/bind9/arm
+./usr/share/doc/reference/ref8/lpd
+./usr/share/doc/reference/ref8/ntp
+./usr/share/doc/reference/ref8/ntp/drivers
+./usr/share/doc/reference/ref8/ntp/drivers/scripts
+./usr/share/doc/reference/ref8/ntp/scripts
+./usr/share/doc/reference/ref8/postfix
+./usr/share/doc/reference/ref8/timed
+./usr/share/doc/reference/ref9
+./usr/share/doc/reference/ref9/net
+./usr/share/doc/reference/ref9/nfs
 ./usr/share/doc/smm
-./usr/share/doc/smm/01.setup
-./usr/share/doc/smm/02.config
-./usr/share/doc/smm/03.fsck_ffs
-./usr/share/doc/smm/04.quotas
-./usr/share/doc/smm/05.fastfs
-./usr/share/doc/smm/06.nfs
-./usr/share/doc/smm/07.lpd
-./usr/share/doc/smm/11.timedop
-./usr/share/doc/smm/12.timed
-./usr/share/doc/smm/13.amd
-./usr/share/doc/smm/16.security
-./usr/share/doc/smm/17.password
-./usr/share/doc/smm/18.net
+./usr/share/doc/smm/setup
 ./usr/share/doc/usd
-./usr/share/doc/usd/01.begin
-./usr/share/doc/usd/02.learn
-./usr/share/doc/usd/03.shell
-./usr/share/doc/usd/04.csh
-./usr/share/doc/usd/0

CVS commit: src/share/mk

2014-07-05 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Jul  5 19:23:39 UTC 2014

Modified Files:
src/share/mk: bsd.README bsd.own.mk

Log Message:
Remove HTMLDOCDIR; it is no longer used (and doesn't fit the docs
scheme) and it was never honored anyway except in a couple places.


To generate a diff of this commit:
cvs rdiff -u -r1.332 -r1.333 src/share/mk/bsd.README
cvs rdiff -u -r1.818 -r1.819 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.332 src/share/mk/bsd.README:1.333
--- src/share/mk/bsd.README:1.332	Thu May  8 13:58:34 2014
+++ src/share/mk/bsd.README	Sat Jul  5 19:23:38 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.332 2014/05/08 13:58:34 phx Exp $
+#	$NetBSD: bsd.README,v 1.333 2014/07/05 19:23:38 dholland Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -609,9 +609,6 @@ LIBMODE		Library mode.  [${NONBINMODE}]
 DOCDIR		Base path for system documentation (e.g. PSD, USD, etc.)
 	installation.  [/usr/share/doc]
 
-HTMLDOCDIR	Base path for html system documentation installation.
-		[/usr/share/doc/html]
-
 DOCGRP		Documentation group.  [wheel]
 
 DOCOWN		Documentation owner.  [root]

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.818 src/share/mk/bsd.own.mk:1.819
--- src/share/mk/bsd.own.mk:1.818	Sat Jul  5 19:22:04 2014
+++ src/share/mk/bsd.own.mk	Sat Jul  5 19:23:38 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.818 2014/07/05 19:22:04 dholland Exp $
+#	$NetBSD: bsd.own.mk,v 1.819 2014/07/05 19:23:38 dholland Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -638,7 +638,6 @@ LIBOWN?=	${BINOWN}
 LIBMODE?=	${NONBINMODE}
 
 DOCDIR?=	/usr/share/doc
-HTMLDOCDIR?=	/usr/share/doc/html
 DOCGRP?=	wheel
 DOCOWN?=	root
 DOCMODE?=	${NONBINMODE}

CVS commit: src

2014-07-05 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Jul  5 19:23:16 UTC 2014

Modified Files:
src/sbin/fsck_ffs/SMM.doc: Makefile
src/share/doc/smm/05.fastfs: Makefile
src/share/doc/smm/17.password: Makefile

Log Message:
Reorg docs, part 3:
Move the documents that are papers to /usr/share/doc/papers.
Give them suitable names (including the author and year).

The key property of papers that distinguishes them from documentation
is that they're historical: they're published at a particular time and
aren't updated or maintained. (Except cosmetically.)

We should only ship papers that are of interest to users, either for
historical perspective or because they're the original research
writeup of stuff that went into the system and is still pertinent.

The ffs papers clearly meet this standard; the other one here (about
passwords, in 1978) is probably past its sell-by date.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sbin/fsck_ffs/SMM.doc/Makefile
cvs rdiff -u -r1.6 -r1.7 src/share/doc/smm/05.fastfs/Makefile
cvs rdiff -u -r1.2 -r1.3 src/share/doc/smm/17.password/Makefile

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_ffs/SMM.doc/Makefile
diff -u src/sbin/fsck_ffs/SMM.doc/Makefile:1.4 src/sbin/fsck_ffs/SMM.doc/Makefile:1.5
--- src/sbin/fsck_ffs/SMM.doc/Makefile:1.4	Sat Jul  5 19:22:03 2014
+++ src/sbin/fsck_ffs/SMM.doc/Makefile	Sat Jul  5 19:23:15 2014
@@ -1,10 +1,12 @@
-#	$NetBSD: Makefile,v 1.4 2014/07/05 19:22:03 dholland Exp $
+#	$NetBSD: Makefile,v 1.5 2014/07/05 19:23:15 dholland Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
-SECTION=smm
-ARTICLE=fsck_ffs
+SECTION=papers
+ARTICLE=mckusick85-fsck
 SRCS=	0.t 1.t 2.t 3.t 4.t
 MACROS=	-ms
-EXTRAHTMLFILES=fsck_ffs1.png fsck_ffs2.png fsck_ffs3.png fsck_ffs4.png
+EXTRAHTMLFILES=\
+	mckusick85-fsck1.png mckusick85-fsck2.png \
+	mckusick85-fsck3.png mckusick85-fsck4.png
 
 .include 

Index: src/share/doc/smm/05.fastfs/Makefile
diff -u src/share/doc/smm/05.fastfs/Makefile:1.6 src/share/doc/smm/05.fastfs/Makefile:1.7
--- src/share/doc/smm/05.fastfs/Makefile:1.6	Sat Jul  5 19:22:03 2014
+++ src/share/doc/smm/05.fastfs/Makefile	Sat Jul  5 19:23:15 2014
@@ -1,17 +1,19 @@
-#	$NetBSD: Makefile,v 1.6 2014/07/05 19:22:03 dholland Exp $
+#	$NetBSD: Makefile,v 1.7 2014/07/05 19:23:15 dholland Exp $
 #
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
-SECTION=smm
-ARTICLE=fastfs
+SECTION=papers
+ARTICLE=mckusick84-ffs
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t
 MACROS=	-ms
 ROFF_TBL=yes
 ROFF_EQN=yes
 EXTRAHTMLFILES=\
-	fastfs1.png fastfs2.png fastfs3.png fastfs4.png fastfs5.png \
-	fastfs6.png fastfs7.png fastfs8.png fastfs9.png fastfs10.png \
-	fastfs11.png fastfs12.png fastfs13.png fastfs14.png fastfs15.png \
-	fastfs16.png fastfs-9.png
+	mckusick84-ffs1.png  mckusick84-ffs2.png  mckusick84-ffs3.png  \
+	mckusick84-ffs4.png  mckusick84-ffs5.png  mckusick84-ffs6.png  \
+	mckusick84-ffs7.png  mckusick84-ffs8.png  mckusick84-ffs9.png  \
+	mckusick84-ffs10.png mckusick84-ffs11.png mckusick84-ffs12.png \
+	mckusick84-ffs13.png mckusick84-ffs14.png mckusick84-ffs15.png \
+	mckusick84-ffs16.png mckusick84-ffs-9.png
 
 .include 

Index: src/share/doc/smm/17.password/Makefile
diff -u src/share/doc/smm/17.password/Makefile:1.2 src/share/doc/smm/17.password/Makefile:1.3
--- src/share/doc/smm/17.password/Makefile:1.2	Sat Jul  5 19:22:04 2014
+++ src/share/doc/smm/17.password/Makefile	Sat Jul  5 19:23:16 2014
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.2 2014/07/05 19:22:04 dholland Exp $
+#	$NetBSD: Makefile,v 1.3 2014/07/05 19:23:16 dholland Exp $
 
-SECTION=smm
-ARTICLE=password
+SECTION=papers
+ARTICLE=morris78-password
 SRCS=	password.ms
 MACROS=	-ms
-EXTRAHTMLFILES=password1.png
+EXTRAHTMLFILES=morris78-password1.png
 
 .include

CVS commit: src

2014-07-05 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Jul  5 19:22:05 UTC 2014

Modified Files:
src/bin/csh/USD.doc: Makefile
src/bin/sh/USD.doc: Makefile
src/external/bsd/nvi/docs/USD.doc/edit: Makefile
src/external/bsd/nvi/docs/USD.doc/exref: Makefile
src/external/bsd/nvi/docs/USD.doc/vi.ref: Makefile
src/external/bsd/nvi/docs/USD.doc/vitut: Makefile
src/games/rogue: Makefile
src/games/rogue/USD.doc: Makefile
src/games/trek: Makefile
src/games/trek/USD.doc: Makefile
src/lib/libcurses/PSD.doc: Makefile
src/sbin/fsck_ffs: Makefile
src/sbin/fsck_ffs/SMM.doc: Makefile
src/share/doc: Makefile
src/share/doc/psd: Makefile
src/share/doc/psd/05.sysman: Makefile
src/share/doc/psd/20.ipctut: Makefile
src/share/doc/psd/21.ipc: Makefile
src/share/doc/smm: Makefile
src/share/doc/smm/01.setup: Makefile
src/share/doc/smm/04.quotas: Makefile
src/share/doc/smm/05.fastfs: Makefile
src/share/doc/smm/06.nfs: Makefile
src/share/doc/smm/17.password: Makefile
src/share/doc/smm/18.net: Makefile
src/share/doc/smm/config: Makefile
src/share/doc/usd: Makefile
src/share/doc/usd/01.begin: Makefile
src/share/doc/usd/17.msmacros: Makefile
src/share/doc/usd/18.msdiffs: Makefile
src/share/doc/usd/19.memacros: Makefile
src/share/doc/usd/20.meref: Makefile
src/share/mk: bsd.doc.mk bsd.own.mk
src/usr.bin/gprof: Makefile
src/usr.bin/gprof/PSD.doc: Makefile
src/usr.bin/m4/PSD.doc: Makefile
src/usr.bin/mail: Makefile
src/usr.bin/mail/USD.doc: Makefile
src/usr.bin/make: Makefile
src/usr.bin/make/PSD.doc: Makefile
src/usr.sbin/lpr: Makefile
src/usr.sbin/lpr/SMM.doc: Makefile
src/usr.sbin/timed: Makefile
src/usr.sbin/timed/SMM.doc/timed: Makefile
src/usr.sbin/timed/SMM.doc/timedop: Makefile
Added Files:
src/bin/sh/USD.doc: referargs

Log Message:
Rework /usr/share/doc.

Update the  infrastructure, and update the docs to match
the new infrastructure.

- Build and install text, ps, pdf, and/or html, not roff sources.

- Don't wire the chapter numbers into the build system, or use them in
the installed pathnames. This didn't matter much when the docs were a
museum, but now that we're theoretically going to start maintaining
them again, we're going to add and remove documents periodically and
having the chapter numbers baked in creates a lot of thrashing for no
purpose.

- Specify the document name explicitly, rather than implicitly in a
path. Use this name (instead of other random strings) as the name
of the installed files.

- Specify the document section, which is the subdirectory of
/usr/share/doc to install into.

- Allow multiple subdocuments. (That is, multiple documents in one
output directory.)

- Enumerate the .png files groff emits along with html so they can be
installed.

- Remove assorted hand-rolled rules for running roff and roff widgetry
and add enough variable settings to make these unnecessary. This
includes support for
   - explicit use of soelim
   - refer
   - tbl
   - pic
   - eqn

- Forcibly apply at least minimal amounts of sanity to certain
autogenerated roff files.

- Don't exclude USD.doc, SMM.doc, and PSD.doc directories from the
build, as they now actually do stuff.

Note: currently we can't generate pdf. This turns out to be a
nontrivial problem with no immediate solution forthcoming. So for now,
as a workaround, install compressed .ps as the printable form.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/bin/csh/USD.doc/Makefile
cvs rdiff -u -r1.1 -r1.2 src/bin/sh/USD.doc/Makefile
cvs rdiff -u -r0 -r1.1 src/bin/sh/USD.doc/referargs
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nvi/docs/USD.doc/edit/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nvi/docs/USD.doc/exref/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nvi/docs/USD.doc/vitut/Makefile
cvs rdiff -u -r1.18 -r1.19 src/games/rogue/Makefile
cvs rdiff -u -r1.5 -r1.6 src/games/rogue/USD.doc/Makefile
cvs rdiff -u -r1.14 -r1.15 src/games/trek/Makefile
cvs rdiff -u -r1.4 -r1.5 src/games/trek/USD.doc/Makefile
cvs rdiff -u -r1.10 -r1.11 src/lib/libcurses/PSD.doc/Makefile
cvs rdiff -u -r1.44 -r1.45 src/sbin/fsck_ffs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sbin/fsck_ffs/SMM.doc/Makefile
cvs rdiff -u -r1.10 -r1.11 src/share/doc/Makefile
cvs rdiff -u -r1.13 -r1.14 src/share/doc/psd/Makefile
cvs rdiff -u -r1.8 -r1.9 src/share/doc/psd/05.sysman/Makefile
cvs rdiff -u -r1.5 -r1.6 src/share/doc/psd/20.ipctut/Makefile
cvs rdiff -u -r1.5 -r1.6 src/share/doc/psd/21.ipc/Makefile
cvs rdiff -u -r1.20 -r1.21 src/share/doc/smm/Makefile
cvs rdiff -u -r1.12 -r1.13 src/share/doc/smm/01.setup/Makefile
cvs rdiff -u -r1.7 -r1.8

CVS commit: src

2014-07-05 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Jul  5 19:22:43 UTC 2014

Modified Files:
src/bin/csh/USD.doc: Makefile
src/bin/sh/USD.doc: Makefile
src/external/bsd/atf/share/doc/atf: Makefile
src/external/bsd/bind: Makefile.inc
src/external/bsd/kyua-atf-compat/share/doc/kyua-atf-compat: Makefile
src/external/bsd/kyua-cli: Makefile.inc
src/external/bsd/kyua-testers/share/doc/kyua-testers: Makefile
src/external/bsd/ntp: Makefile.inc
src/external/bsd/ntp/html: Makefile
src/external/bsd/nvi/docs/USD.doc/exref: Makefile
src/external/bsd/nvi/docs/USD.doc/vi.ref: Makefile
src/external/bsd/nvi/docs/USD.doc/vitut: Makefile
src/external/ibm-public/postfix: Makefile.inc
src/games/rogue/USD.doc: Makefile
src/games/trek/USD.doc: Makefile
src/gnu/usr.bin/groff/contrib/mom/examples: Makefile
src/gnu/usr.bin/groff/contrib/mom/momdoc: Makefile
src/lib/libbz2: Makefile
src/lib/libcurses/PSD.doc: Makefile
src/share/doc/psd/05.sysman: Makefile
src/share/doc/psd/20.ipctut: Makefile
src/share/doc/psd/21.ipc: Makefile
src/share/doc/smm/04.quotas: Makefile
src/share/doc/smm/06.nfs: Makefile
src/share/doc/smm/18.net: Makefile
src/share/doc/smm/config: Makefile
src/share/doc/usd/17.msmacros: Makefile
src/share/doc/usd/18.msdiffs: Makefile
src/share/doc/usd/19.memacros: Makefile
src/share/doc/usd/20.meref: Makefile
src/usr.bin/gprof: Makefile
src/usr.bin/gprof/PSD.doc: Makefile
src/usr.bin/mail/USD.doc: Makefile
src/usr.bin/make/PSD.doc: Makefile
src/usr.sbin/lpr/SMM.doc: Makefile
src/usr.sbin/timed/SMM.doc/timed: Makefile
src/usr.sbin/timed/SMM.doc/timedop: Makefile

Log Message:
Reorg docs, part 1:
Move all the reference manuals to subdirs of /usr/share/doc/reference.
We have subdirs ref1-ref9, corresponding to man page sections 1-9.

Everything that's the reference manual for a program (sections 1, 6,
8), C interface (sections 2, 3), driver or file system (section 4),
format or configuration (section 5), or kernel internal interface
(section 9) belongs in here.

Section 7 is a little less clear: some things that might go in section
7 if they were a man page aren't really reference manuals. So I'm only
putting things in reference section 7 that are (to me) clearly
reference material, rather than e.g. tutorials, guides, FAQs, etc.
This obviously leaves some room for debate, especially without first
editing the docs with this distinction in mind, but if people hate
what I've done things can always be moved again.

Note also that while roff macro man pages traditionally go in section
7, I have put all the roff documentation (macros, tools, etc.) in one
place in reference/ref1/roff. This will make it easier to find and
also easier to edit it into some kind of coherent form.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/bin/csh/USD.doc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/bin/sh/USD.doc/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/share/doc/atf/Makefile
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/kyua-atf-compat/share/doc/kyua-atf-compat/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/kyua-cli/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/kyua-testers/share/doc/kyua-testers/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/html/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nvi/docs/USD.doc/exref/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nvi/docs/USD.doc/vitut/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/ibm-public/postfix/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/games/rogue/USD.doc/Makefile
cvs rdiff -u -r1.5 -r1.6 src/games/trek/USD.doc/Makefile
cvs rdiff -u -r1.8 -r1.9 src/gnu/usr.bin/groff/contrib/mom/examples/Makefile
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/groff/contrib/mom/momdoc/Makefile
cvs rdiff -u -r1.17 -r1.18 src/lib/libbz2/Makefile
cvs rdiff -u -r1.11 -r1.12 src/lib/libcurses/PSD.doc/Makefile
cvs rdiff -u -r1.9 -r1.10 src/share/doc/psd/05.sysman/Makefile
cvs rdiff -u -r1.6 -r1.7 src/share/doc/psd/20.ipctut/Makefile
cvs rdiff -u -r1.6 -r1.7 src/share/doc/psd/21.ipc/Makefile
cvs rdiff -u -r1.8 -r1.9 src/share/doc/smm/04.quotas/Makefile
cvs rdiff -u -r1.3 -r1.4 src/share/doc/smm/06.nfs/Makefile
cvs rdiff -u -r1.6 -r1.7 src/share/doc/smm/18.net/Makefile
cvs rdiff -u -r1.2 -r1.3 src/share/doc/smm/config/Makefile
cvs rdiff -u -r1.2 -r1.3 src/share/doc/usd/17.msmacros/Makefile
cvs rdiff -u -r1.4 -r1.5 src/share/doc/usd/18.msdiffs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/share/doc/usd/19.memacros/Makefile
cvs rdiff -u -r1.3 -r1.4 src/share/doc/usd/20.mer

CVS commit: src

2014-07-05 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Jul  5 19:23:00 UTC 2014

Modified Files:
src/bin/sh/USD.doc: Makefile
src/external/bsd/nvi/docs/USD.doc/vi.ref: Makefile
src/share/doc/psd/20.ipctut: Makefile
src/share/doc/psd/21.ipc: Makefile

Log Message:
Reorg docs, part 2:
Rename the following reference documents to match their programs:
   shell -> sh
   viref -> vi

and rename the following to match their topic better:
   ipctut -> sockets
   ipc -> sockets-advanced

Also, the old "timed" and "timedop" docs are now ref5/timed and
ref8/timed respectively, as the first of these documented the
protocol.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/bin/sh/USD.doc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile
cvs rdiff -u -r1.7 -r1.8 src/share/doc/psd/20.ipctut/Makefile
cvs rdiff -u -r1.7 -r1.8 src/share/doc/psd/21.ipc/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/sh/USD.doc/Makefile
diff -u src/bin/sh/USD.doc/Makefile:1.3 src/bin/sh/USD.doc/Makefile:1.4
--- src/bin/sh/USD.doc/Makefile:1.3	Sat Jul  5 19:22:41 2014
+++ src/bin/sh/USD.doc/Makefile	Sat Jul  5 19:23:00 2014
@@ -1,12 +1,12 @@
-#	$NetBSD: Makefile,v 1.3 2014/07/05 19:22:41 dholland Exp $
+#	$NetBSD: Makefile,v 1.4 2014/07/05 19:23:00 dholland Exp $
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
 
 SECTION=reference/ref1
-ARTICLE=shell
+ARTICLE=sh
 SRCS=	referargs t.mac t1 t2 t3 t4
 MACROS=-ms
 ROFF_REFER=yes
 #REFER_ARGS=-e -p Rv7man
-EXTRAHTMLFILES=shell1.png shell2.png shell3.png shell4.png shell5.png
+EXTRAHTMLFILES=sh1.png sh2.png sh3.png sh4.png sh5.png
 
 .include 

Index: src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile
diff -u src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile:1.3 src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile:1.4
--- src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile:1.3	Sat Jul  5 19:22:42 2014
+++ src/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile	Sat Jul  5 19:23:00 2014
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.3 2014/07/05 19:22:42 dholland Exp $
+#	$NetBSD: Makefile,v 1.4 2014/07/05 19:23:00 dholland Exp $
 #
 #	@(#)Makefile	8.20 (Berkeley) 8/18/96
 
 SECTION=	reference/ref1
-ARTICLE=	viref
+ARTICLE=	vi
 SRCS=		vi.ref
 DEPSRCS=	ex.cmd.roff set.opt.roff vi.cmd.roff ref.so index.so
 MACROS=		-me

Index: src/share/doc/psd/20.ipctut/Makefile
diff -u src/share/doc/psd/20.ipctut/Makefile:1.7 src/share/doc/psd/20.ipctut/Makefile:1.8
--- src/share/doc/psd/20.ipctut/Makefile:1.7	Sat Jul  5 19:22:42 2014
+++ src/share/doc/psd/20.ipctut/Makefile	Sat Jul  5 19:23:00 2014
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.7 2014/07/05 19:22:42 dholland Exp $
+#	$NetBSD: Makefile,v 1.8 2014/07/05 19:23:00 dholland Exp $
 #
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
 
 SECTION=reference/ref3
-ARTICLE=ipctut
+ARTICLE=sockets
 SRCS=	tutor.me
 DEPSRCS=dgramread.c dgramsend.c fig2.pic fig3.pic fig8.pic pipe.c \
 	socketpair.c strchkread.c streamread.c streamwrite.c \

Index: src/share/doc/psd/21.ipc/Makefile
diff -u src/share/doc/psd/21.ipc/Makefile:1.7 src/share/doc/psd/21.ipc/Makefile:1.8
--- src/share/doc/psd/21.ipc/Makefile:1.7	Sat Jul  5 19:22:42 2014
+++ src/share/doc/psd/21.ipc/Makefile	Sat Jul  5 19:23:00 2014
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.7 2014/07/05 19:22:42 dholland Exp $
+#	$NetBSD: Makefile,v 1.8 2014/07/05 19:23:00 dholland Exp $
 #
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
 SECTION=reference/ref3
-ARTICLE=ipc
+ARTICLE=sockets-advanced
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t
 MACROS=	-ms
 ROFF_TBL=yes

CVS commit: src/sys/dev/pci

2014-07-05 Thread Jonathan A. Kollasch

Module Name:src
Committed By:   jakllsch
Date:   Sat Jul  5 17:39:21 UTC 2014

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

Log Message:
Use M_ZERO.  From OpenBSD if_wpi.c 1.53.


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

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

Modified files:

Index: src/sys/dev/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.61 src/sys/dev/pci/if_wpi.c:1.62
--- src/sys/dev/pci/if_wpi.c:1.61	Sat Jul  5 17:18:11 2014
+++ src/sys/dev/pci/if_wpi.c	Sat Jul  5 17:39:21 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wpi.c,v 1.61 2014/07/05 17:18:11 jakllsch Exp $	*/
+/*	$NetBSD: if_wpi.c,v 1.62 2014/07/05 17:39:21 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.61 2014/07/05 17:18:11 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.62 2014/07/05 17:39:21 jakllsch Exp $");
 
 /*
  * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -722,15 +722,13 @@ wpi_alloc_tx_ring(struct wpi_softc *sc, 
 	}
 
 	ring->data = malloc(count * sizeof (struct wpi_tx_data), M_DEVBUF,
-	M_NOWAIT);
+	M_NOWAIT | M_ZERO);
 	if (ring->data == NULL) {
 		aprint_error_dev(sc->sc_dev,
 		"could not allocate tx data slots\n");
 		goto fail;
 	}
 
-	memset(ring->data, 0, count * sizeof (struct wpi_tx_data));
-
 	for (i = 0; i < count; i++) {
 		struct wpi_tx_data *data = &ring->data[i];

CVS commit: src/sys/dev/pci

2014-07-05 Thread Jonathan A. Kollasch

Module Name:src
Committed By:   jakllsch
Date:   Sat Jul  5 17:18:11 UTC 2014

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

Log Message:
Reduce wpi(4) diff to OpenBSD circa September 2007; mostly by following KNF.
The only functional changes in this commit are some %d to %u debugging printf
format specifier adjustments so as to match the OpenBSD code.


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

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

Modified files:

Index: src/sys/dev/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.60 src/sys/dev/pci/if_wpi.c:1.61
--- src/sys/dev/pci/if_wpi.c:1.60	Wed Jul  2 00:04:18 2014
+++ src/sys/dev/pci/if_wpi.c	Sat Jul  5 17:18:11 2014
@@ -1,4 +1,4 @@
-/*  $NetBSD: if_wpi.c,v 1.60 2014/07/02 00:04:18 jakllsch Exp $*/
+/*	$NetBSD: if_wpi.c,v 1.61 2014/07/05 17:18:11 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.60 2014/07/02 00:04:18 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.61 2014/07/05 17:18:11 jakllsch Exp $");
 
 /*
  * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -56,29 +56,20 @@ __KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1
 #include 
 #include 
 
-#include 
-#include 
-#include 
-
 #include 
 #include 
 #include 
 #include 
 
+#include 
+#include 
+#include 
+
 #include 
 
 #include 
 #include 
 
-#ifdef WPI_DEBUG
-#define DPRINTF(x)	if (wpi_debug > 0) printf x
-#define DPRINTFN(n, x)	if (wpi_debug >= (n)) printf x
-int wpi_debug = 1;
-#else
-#define DPRINTF(x)
-#define DPRINTFN(n, x)
-#endif
-
 static const char wpi_firmware_name[] = "iwlwifi-3945.ucode";
 static once_t wpi_firmware_init;
 static kmutex_t wpi_firmware_mutex;
@@ -86,83 +77,92 @@ static size_t wpi_firmware_users;
 static uint8_t *wpi_firmware_image;
 static size_t wpi_firmware_size;
 
-static int  wpi_match(device_t, cfdata_t, void *);
-static void wpi_attach(device_t, device_t, void *);
-static int  wpi_detach(device_t , int);
-static int  wpi_dma_contig_alloc(bus_dma_tag_t, struct wpi_dma_info *,
-	void **, bus_size_t, bus_size_t, int);
-static void wpi_dma_contig_free(struct wpi_dma_info *);
-static int  wpi_alloc_shared(struct wpi_softc *);
-static void wpi_free_shared(struct wpi_softc *);
-static int  wpi_alloc_fwmem(struct wpi_softc *);
-static void wpi_free_fwmem(struct wpi_softc *);
-static struct wpi_rbuf *wpi_alloc_rbuf(struct wpi_softc *);
-static void wpi_free_rbuf(struct mbuf *, void *, size_t, void *);
-static int  wpi_alloc_rpool(struct wpi_softc *);
-static void wpi_free_rpool(struct wpi_softc *);
-static int  wpi_alloc_rx_ring(struct wpi_softc *, struct wpi_rx_ring *);
-static void wpi_reset_rx_ring(struct wpi_softc *, struct wpi_rx_ring *);
-static void wpi_free_rx_ring(struct wpi_softc *, struct wpi_rx_ring *);
-static int  wpi_alloc_tx_ring(struct wpi_softc *, struct wpi_tx_ring *, int,
-	int);
-static void wpi_reset_tx_ring(struct wpi_softc *, struct wpi_tx_ring *);
-static void wpi_free_tx_ring(struct wpi_softc *, struct wpi_tx_ring *);
-static struct ieee80211_node * wpi_node_alloc(struct ieee80211_node_table *);
-static void wpi_newassoc(struct ieee80211_node *, int);
-static int  wpi_media_change(struct ifnet *);
-static int  wpi_newstate(struct ieee80211com *, enum ieee80211_state, int);
+static int	wpi_match(device_t, cfdata_t, void *);
+static void	wpi_attach(device_t, device_t, void *);
+static int	wpi_detach(device_t , int);
+static int	wpi_dma_contig_alloc(bus_dma_tag_t, struct wpi_dma_info *,
+		void **, bus_size_t, bus_size_t, int);
+static void	wpi_dma_contig_free(struct wpi_dma_info *);
+static int	wpi_alloc_shared(struct wpi_softc *);
+static void	wpi_free_shared(struct wpi_softc *);
+static int	wpi_alloc_fwmem(struct wpi_softc *);
+static void	wpi_free_fwmem(struct wpi_softc *);
+static struct	wpi_rbuf *wpi_alloc_rbuf(struct wpi_softc *);
+static void	wpi_free_rbuf(struct mbuf *, void *, size_t, void *);
+static int	wpi_alloc_rpool(struct wpi_softc *);
+static void	wpi_free_rpool(struct wpi_softc *);
+static int	wpi_alloc_rx_ring(struct wpi_softc *, struct wpi_rx_ring *);
+static void	wpi_reset_rx_ring(struct wpi_softc *, struct wpi_rx_ring *);
+static void	wpi_free_rx_ring(struct wpi_softc *, struct wpi_rx_ring *);
+static int	wpi_alloc_tx_ring(struct wpi_softc *, struct wpi_tx_ring *,
+		int, int);
+static void	wpi_reset_tx_ring(struct wpi_softc *, struct wpi_tx_ring *);
+static void	wpi_free_tx_ring(struct wpi_softc *, struct wpi_tx_ring *);
+static struct	ieee80211_node * wpi_node_alloc(struct ieee80211_node_table *);
+static void	wpi_newassoc(struct ieee80211_node *, int);
+static int	wpi_media_change(struct ifnet *);
+static int	wpi_newstate(struct ieee80211com *, enum ieee80211_state, int);
 static void	wpi_fix_channel(struct ieee80211com *, struct mbuf *);
-static void wpi_mem_lock(struct wpi_softc *);

CVS commit: src/sys/net

2014-07-05 Thread Alexander Nasonov

Module Name:src
Committed By:   alnsn
Date:   Sat Jul  5 11:13:13 UTC 2014

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

Log Message:
Review some SLJIT_MOV instructions with respect to width.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/net/bpfjit.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/net/bpfjit.c
diff -u src/sys/net/bpfjit.c:1.20 src/sys/net/bpfjit.c:1.21
--- src/sys/net/bpfjit.c:1.20	Fri Jul  4 21:32:08 2014
+++ src/sys/net/bpfjit.c	Sat Jul  5 11:13:13 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: bpfjit.c,v 1.20 2014/07/04 21:32:08 alnsn Exp $	*/
+/*	$NetBSD: bpfjit.c,v 1.21 2014/07/05 11:13:13 alnsn Exp $	*/
 
 /*-
  * Copyright (c) 2011-2014 Alexander Nasonov.
@@ -31,9 +31,9 @@
 
 #include 
 #ifdef _KERNEL
-__KERNEL_RCSID(0, "$NetBSD: bpfjit.c,v 1.20 2014/07/04 21:32:08 alnsn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpfjit.c,v 1.21 2014/07/05 11:13:13 alnsn Exp $");
 #else
-__RCSID("$NetBSD: bpfjit.c,v 1.20 2014/07/04 21:32:08 alnsn Exp $");
+__RCSID("$NetBSD: bpfjit.c,v 1.21 2014/07/05 11:13:13 alnsn Exp $");
 #endif
 
 #include 
@@ -140,7 +140,7 @@ struct bpfjit_stack
 	bpf_ctx_t *ctx;
 	uint32_t *extmem; /* pointer to external memory store */
 #ifdef _KERNEL
-	void *tmp;
+	int err; /* 3rd argument for m_xword/m_xhalf/m_xbyte function call */
 #endif
 	uint32_t mem[BPF_MEMWORDS]; /* internal memory store */
 };
@@ -243,7 +243,7 @@ bpfjit_modcmd(modcmd_t cmd, void *arg)
 #endif
 
 /*
- * Return a number of scratch regiters to pass
+ * Return a number of scratch registers to pass
  * to sljit_emit_enter() function.
  */
 static sljit_si
@@ -303,7 +303,7 @@ load_buf_buflen(struct sljit_compiler *c
 		return status;
 
 	status = sljit_emit_op1(compiler,
-	SLJIT_MOV,
+	SLJIT_MOV, /* size_t source */
 	BJ_BUFLEN, 0,
 	SLJIT_MEM1(BJ_ARGS),
 	offsetof(struct bpf_args, buflen));
@@ -525,11 +525,6 @@ emit_xcall(struct sljit_compiler *compil
 #endif
 	int status;
 
-	/*
-	 * The third argument of fn is an address on stack.
-	 */
-	const int arg3_offset = offsetof(struct bpfjit_stack, tmp);
-
 	if (BPF_CLASS(pc->code) == BPF_LDX) {
 		/* save A */
 		status = sljit_emit_op1(compiler,
@@ -566,8 +561,12 @@ emit_xcall(struct sljit_compiler *compil
 	if (status != SLJIT_SUCCESS)
 		return status;
 
+	/*
+	 * The third argument of fn is an address on stack.
+	 */
 	status = sljit_get_local_base(compiler,
-	SLJIT_SCRATCH_REG3, 0, arg3_offset);
+	SLJIT_SCRATCH_REG3, 0,
+	offsetof(struct bpfjit_stack, err));
 	if (status != SLJIT_SUCCESS)
 		return status;
 
@@ -600,7 +599,8 @@ emit_xcall(struct sljit_compiler *compil
 	status = sljit_emit_op1(compiler,
 	SLJIT_MOV_UI,
 	SLJIT_SCRATCH_REG3, 0,
-	SLJIT_MEM1(SLJIT_LOCALS_REG), arg3_offset);
+	SLJIT_MEM1(SLJIT_LOCALS_REG),
+	offsetof(struct bpfjit_stack, err));
 	if (status != SLJIT_SUCCESS)
 		return status;
 
@@ -700,7 +700,7 @@ emit_cop(struct sljit_compiler *compiler
 		 * memory addressing.
 		 */
 		status = sljit_emit_op1(compiler,
-		SLJIT_MOV_P,
+		SLJIT_MOV,
 		BJ_COPF_IDX, 0,
 		BJ_XREG, 0);
 		if (status != SLJIT_SUCCESS)
@@ -1708,7 +1708,7 @@ generate_insn_code(struct sljit_compiler
 			/* BPF_LD+BPF_W+BPF_LENA <- len */
 			if (pc->code == (BPF_LD|BPF_W|BPF_LEN)) {
 status = sljit_emit_op1(compiler,
-SLJIT_MOV,
+SLJIT_MOV, /* size_t source */
 BJ_AREG, 0,
 SLJIT_MEM1(BJ_ARGS),
 offsetof(struct bpf_args, wirelen));
@@ -1754,7 +1754,7 @@ generate_insn_code(struct sljit_compiler
 if (BPF_SIZE(pc->code) != BPF_W)
 	goto fail;
 status = sljit_emit_op1(compiler,
-SLJIT_MOV,
+SLJIT_MOV, /* size_t source */
 BJ_XREG, 0,
 SLJIT_MEM1(BJ_ARGS),
 offsetof(struct bpf_args, wirelen));

CVS commit: src/sys/dev/usb

2014-07-05 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Sat Jul  5 11:13:13 UTC 2014

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

Log Message:
PR/48964: In urndis(4), initialization of ifnet structure is not enough,
cause panic.

Update urndis_init to return and error and use as if_init based on the
patch in the PR with stylistic changes from me.

XXX IFF_RUNNING should be ignored here?


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/if_urndis.c

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

Modified files:

Index: src/sys/dev/usb/if_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.7 src/sys/dev/usb/if_urndis.c:1.8
--- src/sys/dev/usb/if_urndis.c:1.7	Sat Jul  5 09:30:08 2014
+++ src/sys/dev/usb/if_urndis.c	Sat Jul  5 11:13:13 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_urndis.c,v 1.7 2014/07/05 09:30:08 skrll Exp $ */
+/*	$NetBSD: if_urndis.c,v 1.8 2014/07/05 11:13:13 skrll Exp $ */
 /*	$OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
 
 /*
@@ -21,7 +21,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.7 2014/07/05 09:30:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.8 2014/07/05 11:13:13 skrll Exp $");
 
 #include 
 #include 
@@ -76,7 +76,7 @@ static void urndis_txeof(usbd_xfer_handl
 static int urndis_rx_list_init(struct urndis_softc *);
 static int urndis_tx_list_init(struct urndis_softc *);
 
-static void urndis_init(struct ifnet *);
+static int urndis_init(struct ifnet *);
 static void urndis_stop(struct ifnet *);
 
 static usbd_status urndis_ctrl_msg(struct urndis_softc *, uint8_t, uint8_t,
@@ -1022,53 +1022,57 @@ urndis_watchdog(struct ifnet *ifp)
 }
 #endif
 
-static void
+static int
 urndis_init(struct ifnet *ifp)
 {
 	struct urndis_softc	*sc;
 	int			 i, s;
-	usbd_status		 err;
+	int 			 err;
+	usbd_status		 usberr;
 
 	sc = ifp->if_softc;
 
 	if (ifp->if_flags & IFF_RUNNING)
-		return;
+		return EBUSY;
 
-	if (urndis_ctrl_init(sc) != RNDIS_STATUS_SUCCESS)
-		return;
+	err = urndis_ctrl_init(sc);
+	if (err != RNDIS_STATUS_SUCCESS)
+		return EIO;
 
 	s = splnet();
 
-	if (urndis_tx_list_init(sc) == ENOBUFS) {
+	err = urndis_tx_list_init(sc);
+	if (err) {
 		printf("%s: tx list init failed\n",
 		DEVNAME(sc));
 		splx(s);
-		return;
+		return err;
 	}
 
-	if (urndis_rx_list_init(sc) == ENOBUFS) {
+	err = urndis_rx_list_init(sc);
+	if (err) {
 		printf("%s: rx list init failed\n",
 		DEVNAME(sc));
 		splx(s);
-		return;
+		return err;
 	}
 
-	err = usbd_open_pipe(sc->sc_iface_data, sc->sc_bulkin_no,
+	usberr = usbd_open_pipe(sc->sc_iface_data, sc->sc_bulkin_no,
 	USBD_EXCLUSIVE_USE, &sc->sc_bulkin_pipe);
-	if (err) {
+	if (usberr) {
 		printf("%s: open rx pipe failed: %s\n", DEVNAME(sc),
 		usbd_errstr(err));
 		splx(s);
-		return;
+		return EIO;
 	}
 
-	err = usbd_open_pipe(sc->sc_iface_data, sc->sc_bulkout_no,
+	usberr = usbd_open_pipe(sc->sc_iface_data, sc->sc_bulkout_no,
 	USBD_EXCLUSIVE_USE, &sc->sc_bulkout_pipe);
-	if (err) {
+	if (usberr) {
 		printf("%s: open tx pipe failed: %s\n", DEVNAME(sc),
 		usbd_errstr(err));
 		splx(s);
-		return;
+		return EIO;
 	}
 
 	for (i = 0; i < RNDIS_RX_LIST_CNT; i++) {
@@ -1086,6 +1090,7 @@ urndis_init(struct ifnet *ifp)
 	ifp->if_flags &= ~IFF_OACTIVE;
 
 	splx(s);
+	return 0;
 }
 
 static void
@@ -1440,6 +1445,7 @@ urndis_attach(device_t parent, device_t 
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_start = urndis_start;
 	ifp->if_ioctl = urndis_ioctl;
+	ifp->if_init = urndis_init;
 #if 0
 	ifp->if_watchdog = urndis_watchdog;
 #endif

CVS commit: src/sys/arch/amiga/conf

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 10:00:42 UTC 2014

Modified Files:
src/sys/arch/amiga/conf: DRACO GENERIC INSTALL

Log Message:
Regen from GENERIC.in rev 1.125:

> Use COPTS="-O2 -fno-reorder-blocks" for kernels except INSTALL_CONFIGURATION.


To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.306 -r1.307 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/amiga/conf/INSTALL

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/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.174 src/sys/arch/amiga/conf/DRACO:1.175
--- src/sys/arch/amiga/conf/DRACO:1.174	Sat Jul  5 09:55:42 2014
+++ src/sys/arch/amiga/conf/DRACO	Sat Jul  5 10:00:42 2014
@@ -1,9 +1,9 @@
-# $NetBSD: DRACO,v 1.174 2014/07/05 09:55:42 tsutsui Exp $
+# $NetBSD: DRACO,v 1.175 2014/07/05 10:00:42 tsutsui Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
 #
-# Created from: # NetBSD: GENERIC.in,v 1.124 2014/07/05 09:47:30 tsutsui Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.125 2014/07/05 09:59:06 tsutsui Exp $
 #
 ##
 # GENERIC machine description file
@@ -29,8 +29,9 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.174 $"
+#ident 		"GENERIC-$Revision: 1.175 $"
 
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
 maxusers	8
 options 	RTC_OFFSET=0

Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.306 src/sys/arch/amiga/conf/GENERIC:1.307
--- src/sys/arch/amiga/conf/GENERIC:1.306	Sat Jul  5 09:55:42 2014
+++ src/sys/arch/amiga/conf/GENERIC	Sat Jul  5 10:00:42 2014
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC,v 1.306 2014/07/05 09:55:42 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.307 2014/07/05 10:00:42 tsutsui Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
 #
-# Created from: # NetBSD: GENERIC.in,v 1.124 2014/07/05 09:47:30 tsutsui Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.125 2014/07/05 09:59:06 tsutsui Exp $
 #
 ##
 # GENERIC machine description file
@@ -29,8 +29,9 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.306 $"
+#ident 		"GENERIC-$Revision: 1.307 $"
 
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
 maxusers	8
 options 	RTC_OFFSET=0

Index: src/sys/arch/amiga/conf/INSTALL
diff -u src/sys/arch/amiga/conf/INSTALL:1.124 src/sys/arch/amiga/conf/INSTALL:1.125
--- src/sys/arch/amiga/conf/INSTALL:1.124	Sat Jul  5 09:55:42 2014
+++ src/sys/arch/amiga/conf/INSTALL	Sat Jul  5 10:00:42 2014
@@ -1,9 +1,9 @@
-# $NetBSD: INSTALL,v 1.124 2014/07/05 09:55:42 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.125 2014/07/05 10:00:42 tsutsui Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
 #
-# Created from: # NetBSD: GENERIC.in,v 1.124 2014/07/05 09:47:30 tsutsui Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.125 2014/07/05 09:59:06 tsutsui Exp $
 #
 ##
 # GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.124 $"
+#ident 		"GENERIC-$Revision: 1.125 $"
 
 makeoptions	COPTS="-Os"

CVS commit: src/sys/arch/amiga/conf

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 09:59:06 UTC 2014

Modified Files:
src/sys/arch/amiga/conf: GENERIC.in

Log Message:
Use COPTS="-O2 -fno-reorder-blocks" for kernels except INSTALL_CONFIGURATION.


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/amiga/conf/GENERIC.in

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/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.124 src/sys/arch/amiga/conf/GENERIC.in:1.125
--- src/sys/arch/amiga/conf/GENERIC.in:1.124	Sat Jul  5 09:47:30 2014
+++ src/sys/arch/amiga/conf/GENERIC.in	Sat Jul  5 09:59:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.124 2014/07/05 09:47:30 tsutsui Exp $
+# $NetBSD: GENERIC.in,v 1.125 2014/07/05 09:59:06 tsutsui Exp $
 #
 ##
 # GENERIC machine description file
@@ -52,10 +52,12 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.124 $"
+#ident 		"GENERIC-$Revision: 1.125 $"
 
 m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
 makeoptions	COPTS="-Os"
+',`m4_dnl
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 ')m4_dnl
 
 maxusers	8

CVS commit: src/sys/arch/amiga/conf

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 09:55:42 UTC 2014

Modified Files:
src/sys/arch/amiga/conf: DRACO GENERIC INSTALL

Log Message:
Regen to reflect GENERIC.in rev 1.121-1.124:

rev 1.121:
> dd preliminary support for the Individual Computers ACA500 in the form of 
> acahf
> driver. If ACA500 is equipped with supported accelerator with MMU, it allows
> running NetBSD on an Amiga 500.
>
> Since ACA is not autoconf-aware, and the probe procedure does not exist yet, 
> the
> driver is activated with the ACA500_SUPPORT kernel option. The acahf driver
> is commented out in the GENERIC kernel for now (at least until it stops being
> very experimental and hackish).
>
> When it comes to ACA-specific hardware, for now the boot CF slot works. 
> Support for everything else is incoming...

rev 1.122:
> Changes to ACA500 support:
> - Add support for second (aux) CF slot.
> - Rework wdc attachment to be more sane.
> - Add support for clockport on ACA500.
> - Fix style where appropriate.

rev 1.123:
> Implement the probe procedure for ACA500. Now the user just needs acafh0
> compiled in his kernel and it all should(tm) work.
>
> Due to lack of obio in amiga port, the probe is called directly from 
> mbattach().
> This is going to change with the introduction of obio for all non-autoconfig
> expansions.

rev 1.124:
> Disable X-Surf devices for DRACO's configuration.
>
> - ne at xsh requires ax88190 and ax88190 requires mii(4),
>   but all mii devices are declared only inside AMIGA_CONFIGURATION
> - X-Surf also add wdc(4) but all children devices like atabus and
>   atapibus are declared only for AMIGA_CONFIGURATION
>
> XXX: DRACO kernel is not built during build.sh release.


To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.305 -r1.306 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/amiga/conf/INSTALL

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/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.173 src/sys/arch/amiga/conf/DRACO:1.174
--- src/sys/arch/amiga/conf/DRACO:1.173	Fri Oct  4 15:13:51 2013
+++ src/sys/arch/amiga/conf/DRACO	Sat Jul  5 09:55:42 2014
@@ -1,9 +1,9 @@
-# $NetBSD: DRACO,v 1.173 2013/10/04 15:13:51 rkujawa Exp $
+# $NetBSD: DRACO,v 1.174 2014/07/05 09:55:42 tsutsui Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
 #
-# Created from: # NetBSD: GENERIC.in,v 1.119 2013/08/11 16:15:52 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.124 2014/07/05 09:47:30 tsutsui Exp $
 #
 ##
 # GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.173 $"
+#ident 		"GENERIC-$Revision: 1.174 $"
 
 
 maxusers	8
@@ -292,14 +292,6 @@ ed*		at zbus0		# Hydra, ASDG LanRover
 es*		at zbus0		# CEI A4066 EthernetPLUS
 qn*		at zbus0		# Quicknet
 
-xsh*		at zbus0		# X-Surf 100
-ne*		at xshbus?		# NE2000 chip on X-Surf 100
-
-xsurf*		at zbus0		# X-Surf
-ne*		at xsurfbus?		# NE2000 chip on X-Surf
-gencp*		at xsurfbus?		# clockports on X-Surf
-wdc*		at xsurfbus?		# IDE on X-Surf
-clockport*	at gencp?
 
 # Arcnet
 bah*		at zbus0		# C=/Ameristar A2060 / 560

Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.305 src/sys/arch/amiga/conf/GENERIC:1.306
--- src/sys/arch/amiga/conf/GENERIC:1.305	Fri Oct  4 15:13:51 2013
+++ src/sys/arch/amiga/conf/GENERIC	Sat Jul  5 09:55:42 2014
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC,v 1.305 2013/10/04 15:13:51 rkujawa Exp $
+# $NetBSD: GENERIC,v 1.306 2014/07/05 09:55:42 tsutsui Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
 #
-# Created from: # NetBSD: GENERIC.in,v 1.119 2013/08/11 16:15:52 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.124 2014/07/05 09:47:30 tsutsui Exp $
 #
 ##
 # GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.305 $"
+#ident 		"GENERIC-$Revision: 1.306 $"
 
 
 maxusers	8
@@ -382,6 +382,7 @@ xsurf*		at zbus0		# X-Surf
 ne*		at xsurfbus?		# NE2000 chip on X-Surf
 gencp*		at xsurfbus?		# clockports on X-Surf
 wdc*		at xsurfbus?		# IDE on X-Surf
+
 clockport*	at gencp?
 
 # Arcnet
@@ -434,6 +435,10 @@ scsibus*	at cbiiisc0
 empsc0		at zbus0		# Emplant scsi
 scsibus*	at empsc0
 
+acafh0		at mainbus0		# Individual Computers ACA500
+wdc*		at acafhbus?		# CF slots on ACA500
+gencp*		at acafhbus?		# clockport on ACA500
+
 wdc0		at mainbus0		# A4000 & A1200 IDE bus
 wdc*		at zbus0		# Buddha / Catweasel
 #efa0		at mainbus0		# ELBOX FastATA 1200 Mk-III/Mk-IV 

Index: src/sys/arch/amiga/conf/INSTALL
diff -u src/sys/arch/amiga/c

CVS commit: src/sys/arch/amiga/conf

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 09:47:30 UTC 2014

Modified Files:
src/sys/arch/amiga/conf: GENERIC.in

Log Message:
Disable X-Surf devices for DRACO's configuration.

- ne at xsh requires ax88190 and ax88190 requires mii(4),
  but all mii devices are declared only inside AMIGA_CONFIGURATION
- X-Surf also add wdc(4) but all children devices like atabus and
  atapibus are declared only for AMIGA_CONFIGURATION

XXX: DRACO kernel is not built during build.sh release.


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/amiga/conf/GENERIC.in

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/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.123 src/sys/arch/amiga/conf/GENERIC.in:1.124
--- src/sys/arch/amiga/conf/GENERIC.in:1.123	Thu Dec 26 20:38:11 2013
+++ src/sys/arch/amiga/conf/GENERIC.in	Sat Jul  5 09:47:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.123 2013/12/26 20:38:11 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.124 2014/07/05 09:47:30 tsutsui Exp $
 #
 ##
 # GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.123 $"
+#ident 		"GENERIC-$Revision: 1.124 $"
 
 m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
 makeoptions	COPTS="-Os"
@@ -455,6 +455,7 @@ ed*		at zbus0		# Hydra, ASDG LanRover
 es*		at zbus0		# CEI A4066 EthernetPLUS
 qn*		at zbus0		# Quicknet
 
+m4_ifdef(`AMIGA_CONFIGURATION', `m4_dnl
 xsh*		at zbus0		# X-Surf 100
 ne*		at xshbus?		# NE2000 chip on X-Surf 100
 
@@ -464,6 +465,7 @@ gencp*		at xsurfbus?		# clockports on X-
 wdc*		at xsurfbus?		# IDE on X-Surf
 
 clockport*	at gencp?
+')m4_dnl
 
 # Arcnet
 bah*		at zbus0		# C=/Ameristar A2060 / 560

CVS commit: src/sys/arch/amiga/conf

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 09:39:35 UTC 2014

Modified Files:
src/sys/arch/amiga/conf: files.amiga

Log Message:
ne at xshbus seems to require ax88190, per if_ne_xsh.c.

On the other hand, dp8390nic is pulled by ne in sys/conf/files
so it isn't required here.


To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/sys/arch/amiga/conf/files.amiga

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/amiga/conf/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.175 src/sys/arch/amiga/conf/files.amiga:1.176
--- src/sys/arch/amiga/conf/files.amiga:1.175	Fri Jan  3 10:30:47 2014
+++ src/sys/arch/amiga/conf/files.amiga	Sat Jul  5 09:39:35 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.amiga,v 1.175 2014/01/03 10:30:47 rkujawa Exp $
+#	$NetBSD: files.amiga,v 1.176 2014/07/05 09:39:35 tsutsui Exp $
 
 # maxpartitions must be first item in files.${ARCH}.newconf
 maxpartitions 16			# NOTE THAT AMIGA IS SPECIAL!
@@ -247,7 +247,7 @@ device	xsh: xshbus
 attach	xsh at zbus
 file	arch/amiga/dev/xsh.c		xsh needs-flag
 
-attach	ne at xshbus with ne_xsh: dp8390nic
+attach	ne at xshbus with ne_xsh: ax88190
 file	arch/amiga/dev/if_ne_xsh.c	ne_xsh needs-flag
 
 # Hydra ethernet card

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

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 09:36:49 UTC 2014

Modified Files:
src/sys/arch/atari/dev: atari5380.c

Log Message:
Appease gcc48 -Wunused-but-set-variable warning.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/atari/dev/atari5380.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/atari/dev/atari5380.c
diff -u src/sys/arch/atari/dev/atari5380.c:1.60 src/sys/arch/atari/dev/atari5380.c:1.61
--- src/sys/arch/atari/dev/atari5380.c:1.60	Mon Mar 24 18:39:57 2014
+++ src/sys/arch/atari/dev/atari5380.c	Sat Jul  5 09:36:49 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: atari5380.c,v 1.60 2014/03/24 18:39:57 christos Exp $	*/
+/*	$NetBSD: atari5380.c,v 1.61 2014/07/05 09:36:49 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.60 2014/03/24 18:39:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.61 2014/07/05 09:36:49 tsutsui Exp $");
 
 #include "opt_atariscsi.h"
 
@@ -731,9 +731,8 @@ scsi_falcon_idisable(void)
 static inline void
 scsi_falcon_clr_ipend(void)
 {
-	int tmp;
 
-	tmp = get_falcon_5380_reg(NCR5380_IRCV);
+	(void)get_falcon_5380_reg(NCR5380_IRCV);
 	rem_sicallback((si_farg)ncr_ctrl_intr);
 }

CVS commit: src/sys/nfs

2014-07-05 Thread Juergen Hannken-Illjes

Module Name:src
Committed By:   hannken
Date:   Sat Jul  5 09:33:41 UTC 2014

Modified Files:
src/sys/nfs: nfs_vnops.c

Log Message:
Use vcache_rekey_* for nfs_lookitup() in the "*npp != NULL" case.


To generate a diff of this commit:
cvs rdiff -u -r1.304 -r1.305 src/sys/nfs/nfs_vnops.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/nfs/nfs_vnops.c
diff -u src/sys/nfs/nfs_vnops.c:1.304 src/sys/nfs/nfs_vnops.c:1.305
--- src/sys/nfs/nfs_vnops.c:1.304	Fri Feb  7 15:29:22 2014
+++ src/sys/nfs/nfs_vnops.c	Sat Jul  5 09:33:41 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_vnops.c,v 1.304 2014/02/07 15:29:22 hannken Exp $	*/
+/*	$NetBSD: nfs_vnops.c,v 1.305 2014/07/05 09:33:41 hannken Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.304 2014/02/07 15:29:22 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.305 2014/07/05 09:33:41 hannken Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
@@ -2943,12 +2943,12 @@ nfs_lookitup(struct vnode *dvp, const ch
 	struct vnode *newvp = (struct vnode *)0;
 	struct nfsnode *np, *dnp = VTONFS(dvp);
 	char *bpos, *dpos, *cp2;
-	int error = 0, fhlen;
+	int error = 0, ofhlen, fhlen;
 #ifndef NFS_V2_ONLY
 	int attrflag;
 #endif
 	struct mbuf *mreq, *mrep, *md, *mb;
-	nfsfh_t *nfhp;
+	nfsfh_t *ofhp, *nfhp;
 	const int v3 = NFS_ISV3(dvp);
 
 	nfsstats.rpccnt[NFSPROC_LOOKUP]++;
@@ -2961,6 +2961,17 @@ nfs_lookitup(struct vnode *dvp, const ch
 		nfsm_getfh(nfhp, fhlen, v3);
 		if (*npp) {
 		np = *npp;
+		newvp = NFSTOV(np);
+		ofhlen = np->n_fhsize;
+		ofhp = kmem_alloc(ofhlen, KM_SLEEP);
+		memcpy(ofhp, np->n_fhp, ofhlen);
+		error = vcache_rekey_enter(newvp->v_mount, newvp,
+			ofhp, ofhlen, nfhp, fhlen);
+		if (error) {
+			kmem_free(ofhp, ofhlen);
+			m_freem(mrep);
+			return error;
+		}
 		if (np->n_fhsize > NFS_SMALLFH && fhlen <= NFS_SMALLFH) {
 			kmem_free(np->n_fhp, np->n_fhsize);
 			np->n_fhp = &np->n_fh;
@@ -2971,7 +2982,9 @@ nfs_lookitup(struct vnode *dvp, const ch
 #endif
 		memcpy(np->n_fhp, nfhp, fhlen);
 		np->n_fhsize = fhlen;
-		newvp = NFSTOV(np);
+		vcache_rekey_exit(newvp->v_mount, newvp,
+			ofhp, ofhlen, np->n_fhp, fhlen);
+		kmem_free(ofhp, ofhlen);
 		} else if (NFS_CMPFH(dnp, nfhp, fhlen)) {
 		vref(dvp);
 		newvp = dvp;

CVS commit: src/sys

2014-07-05 Thread Juergen Hannken-Illjes

Module Name:src
Committed By:   hannken
Date:   Sat Jul  5 09:33:15 UTC 2014

Modified Files:
src/sys/kern: vfs_vnode.c
src/sys/sys: param.h vnode.h

Log Message:
Add vcache operations to support key changes:

vcache_rekey_enter locks the old cache node and creates and locks the
  new cache node.  It is an error if the new cache node exists.

vcache_rekey_exit removes the old cache node and finalizes and
  unlocks the new cache node.

No objections on tech-kern@

Welcome to 6.99.46


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.455 -r1.456 src/sys/sys/param.h
cvs rdiff -u -r1.248 -r1.249 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/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.36 src/sys/kern/vfs_vnode.c:1.37
--- src/sys/kern/vfs_vnode.c:1.36	Thu May  8 08:21:53 2014
+++ src/sys/kern/vfs_vnode.c	Sat Jul  5 09:33:15 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_vnode.c,v 1.36 2014/05/08 08:21:53 hannken Exp $	*/
+/*	$NetBSD: vfs_vnode.c,v 1.37 2014/07/05 09:33:15 hannken Exp $	*/
 
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.36 2014/05/08 08:21:53 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.37 2014/07/05 09:33:15 hannken Exp $");
 
 #define _VFS_VNODE_PRIVATE
 
@@ -1324,6 +1324,88 @@ again:
 }
 
 /*
+ * Prepare key change: lock old and new cache node.
+ * Return an error if the new node already exists.
+ */
+int
+vcache_rekey_enter(struct mount *mp, struct vnode *vp,
+const void *old_key, size_t old_key_len,
+const void *new_key, size_t new_key_len)
+{
+	uint32_t old_hash, new_hash;
+	struct vcache_key old_vcache_key, new_vcache_key;
+	struct vcache_node *node, *new_node;
+
+	old_vcache_key.vk_mount = mp;
+	old_vcache_key.vk_key = old_key;
+	old_vcache_key.vk_key_len = old_key_len;
+	old_hash = vcache_hash(&old_vcache_key);
+
+	new_vcache_key.vk_mount = mp;
+	new_vcache_key.vk_key = new_key;
+	new_vcache_key.vk_key_len = new_key_len;
+	new_hash = vcache_hash(&new_vcache_key);
+
+	new_node = pool_cache_get(vcache.pool, PR_WAITOK);
+	new_node->vn_vnode = NULL;
+	new_node->vn_key = new_vcache_key;
+
+	mutex_enter(&vcache.lock);
+	node = vcache_hash_lookup(&new_vcache_key, new_hash);
+	if (node != NULL) {
+		mutex_exit(&vcache.lock);
+		pool_cache_put(vcache.pool, new_node);
+		return EEXIST;
+	}
+	SLIST_INSERT_HEAD(&vcache.hashtab[new_hash & vcache.hashmask],
+	new_node, vn_hash);
+	node = vcache_hash_lookup(&old_vcache_key, old_hash);
+	KASSERT(node != NULL);
+	KASSERT(node->vn_vnode == vp);
+	node->vn_vnode = NULL;
+	node->vn_key = old_vcache_key;
+	mutex_exit(&vcache.lock);
+	return 0;
+}
+
+/*
+ * Key change complete: remove old node and unlock new node.
+ */
+void
+vcache_rekey_exit(struct mount *mp, struct vnode *vp,
+const void *old_key, size_t old_key_len,
+const void *new_key, size_t new_key_len)
+{
+	uint32_t old_hash, new_hash;
+	struct vcache_key old_vcache_key, new_vcache_key;
+	struct vcache_node *node;
+
+	old_vcache_key.vk_mount = mp;
+	old_vcache_key.vk_key = old_key;
+	old_vcache_key.vk_key_len = old_key_len;
+	old_hash = vcache_hash(&old_vcache_key);
+
+	new_vcache_key.vk_mount = mp;
+	new_vcache_key.vk_key = new_key;
+	new_vcache_key.vk_key_len = new_key_len;
+	new_hash = vcache_hash(&new_vcache_key);
+
+	mutex_enter(&vcache.lock);
+	node = vcache_hash_lookup(&new_vcache_key, new_hash);
+	KASSERT(node != NULL && node->vn_vnode == NULL);
+	KASSERT(node->vn_key.vk_key_len == new_key_len);
+	node->vn_vnode = vp;
+	node->vn_key = new_vcache_key;
+	node = vcache_hash_lookup(&old_vcache_key, old_hash);
+	KASSERT(node != NULL);
+	KASSERT(node->vn_vnode == NULL);
+	SLIST_REMOVE(&vcache.hashtab[old_hash & vcache.hashmask],
+	node, vcache_node, vn_hash);
+	mutex_exit(&vcache.lock);
+	pool_cache_put(vcache.pool, node);
+}
+
+/*
  * Remove a vnode / fs node pair from the cache.
  */
 void

Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.455 src/sys/sys/param.h:1.456
--- src/sys/sys/param.h:1.455	Tue Jul  1 13:25:21 2014
+++ src/sys/sys/param.h	Sat Jul  5 09:33:15 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.455 2014/07/01 13:25:21 rtr Exp $	*/
+/*	$NetBSD: param.h,v 1.456 2014/07/05 09:33:15 hannken Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -63,7 +63,7 @@
  *	2.99.9		(299000900)
  */
 
-#define	__NetBSD_Version__	699004500	/* NetBSD 6.99.45 */
+#define	__NetBSD_Version__	699004600	/* NetBSD 6.99.46 */
 
 #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
 (m) * 100) + (p) * 100) <= __NetBSD_Version__)

Index: src/sys/sys/vnode.h
diff -u src/sys/sys/vnode.h:1.248 src/sys/sys/vnode.h:1.249
--- src/sys/sys/vnode.h:1.248	Sun May 25 13:51:26 2014
+++ src/sys/sys/vnode.h	Sat Jul  5 09:33:15 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: v

CVS commit: src/sys/arch/atari/conf

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 09:32:48 UTC 2014

Modified Files:
src/sys/arch/atari/conf: MILAN-ISAIDE MILAN-PCIIDE

Log Message:
Regen from MILAN.in rev 1.27 and GENERIC.in rev 1.106:

> Enable options WSDISPLAY_COMPAT_USL in template, not in generated files.

> Use COPTS="-O2 -fno-reorder-blocks" for kernels except SMALL030_KERNEL.
>
> Also remove COPTS="-Os" from std.* files and specify it in
> GENERIC.in template for SMALL030_KERNEL.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/atari/conf/MILAN-ISAIDE
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/atari/conf/MILAN-PCIIDE

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/atari/conf/MILAN-ISAIDE
diff -u src/sys/arch/atari/conf/MILAN-ISAIDE:1.80 src/sys/arch/atari/conf/MILAN-ISAIDE:1.81
--- src/sys/arch/atari/conf/MILAN-ISAIDE:1.80	Sun Jun 30 21:38:55 2013
+++ src/sys/arch/atari/conf/MILAN-ISAIDE	Sat Jul  5 09:32:48 2014
@@ -1,14 +1,15 @@
 #
-# $NetBSD: MILAN-ISAIDE,v 1.80 2013/06/30 21:38:55 rmind Exp $
+# $NetBSD: MILAN-ISAIDE,v 1.81 2014/07/05 09:32:48 tsutsui Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: MILAN.in,v 1.25 2010/04/10 01:59:40 tsutsui Exp $
-#		NetBSD: GENERIC.in,v 1.92 2010/12/12 09:56:15 tsutsui Exp $
+#		NetBSD: MILAN.in,v 1.27 2014/07/05 09:24:23 tsutsui Exp $
+#		NetBSD: GENERIC.in,v 1.106 2014/07/05 09:28:48 tsutsui Exp $
 include "arch/atari/conf/std.milan"
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
 maxusers 16
 options HZ=64 # Set the clock-rate (48/64/96)
 options INSECURE # disable kernel security levels
@@ -106,7 +107,7 @@ audio* at eso?
 options WSEMUL_VT100 # VT100 / VT220 emulation
 options WS_KERNEL_FG=WSCOL_WHITE
 options WS_KERNEL_BG=WSCOL_BLACK
-options WSDISPLAY_COMPAT_USL		# wsconscfg VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
 options WSDISPLAY_DEFAULTSCREENS=4
 options PCDISPLAY_SOFTCURSOR
 isab0 at mainbus0 # ISA-bus

Index: src/sys/arch/atari/conf/MILAN-PCIIDE
diff -u src/sys/arch/atari/conf/MILAN-PCIIDE:1.84 src/sys/arch/atari/conf/MILAN-PCIIDE:1.85
--- src/sys/arch/atari/conf/MILAN-PCIIDE:1.84	Sun Jun 30 21:38:55 2013
+++ src/sys/arch/atari/conf/MILAN-PCIIDE	Sat Jul  5 09:32:48 2014
@@ -1,14 +1,15 @@
 #
-# $NetBSD: MILAN-PCIIDE,v 1.84 2013/06/30 21:38:55 rmind Exp $
+# $NetBSD: MILAN-PCIIDE,v 1.85 2014/07/05 09:32:48 tsutsui Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: MILAN.in,v 1.25 2010/04/10 01:59:40 tsutsui Exp $
-#		NetBSD: GENERIC.in,v 1.92 2010/12/12 09:56:15 tsutsui Exp $
+#		NetBSD: MILAN.in,v 1.27 2014/07/05 09:24:23 tsutsui Exp $
+#		NetBSD: GENERIC.in,v 1.106 2014/07/05 09:28:48 tsutsui Exp $
 include "arch/atari/conf/std.milan"
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
 maxusers 16
 options HZ=64 # Set the clock-rate (48/64/96)
 options INSECURE # disable kernel security levels
@@ -106,7 +107,7 @@ audio* at eso?
 options WSEMUL_VT100 # VT100 / VT220 emulation
 options WS_KERNEL_FG=WSCOL_WHITE
 options WS_KERNEL_BG=WSCOL_BLACK
-options WSDISPLAY_COMPAT_USL		# wsconscfg VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
 options WSDISPLAY_DEFAULTSCREENS=4
 options PCDISPLAY_SOFTCURSOR
 isab0 at mainbus0 # ISA-bus

CVS commit: src/sys/arch/atari/conf

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 09:31:21 UTC 2014

Modified Files:
src/sys/arch/atari/conf: ATARITT FALCON HADES SMALL030

Log Message:
Regen from GENERIC.in rev 1.106:

> Use COPTS="-O2 -fno-reorder-blocks" for kernels except SMALL030_KERNEL.
>
> Also remove COPTS="-Os" from std.* files and specify it in
> GENERIC.in template for SMALL030_KERNEL.


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/atari/conf/ATARITT
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/atari/conf/FALCON
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/atari/conf/HADES
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/atari/conf/SMALL030

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/atari/conf/ATARITT
diff -u src/sys/arch/atari/conf/ATARITT:1.112 src/sys/arch/atari/conf/ATARITT:1.113
--- src/sys/arch/atari/conf/ATARITT:1.112	Sun Jun 30 21:38:55 2013
+++ src/sys/arch/atari/conf/ATARITT	Sat Jul  5 09:31:21 2014
@@ -1,13 +1,14 @@
 #
-# $NetBSD: ATARITT,v 1.112 2013/06/30 21:38:55 rmind Exp $
+# $NetBSD: ATARITT,v 1.113 2014/07/05 09:31:21 tsutsui Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: GENERIC.in,v 1.92 2010/12/12 09:56:15 tsutsui Exp $
+#		NetBSD: GENERIC.in,v 1.106 2014/07/05 09:28:48 tsutsui Exp $
 include "arch/atari/conf/std.atari"
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
 maxusers 16
 options HZ=64 # Set the clock-rate (48/64/96)
 options INSECURE # disable kernel security levels
@@ -53,7 +54,7 @@ options COMPAT_20 # Compatibility with N
 options COMPAT_30 # NetBSD 3.0 compatibility.
 options COMPAT_40 # NetBSD 4.0 compatibility.
 options COMPAT_50 # NetBSD 5.0 compatibility.
-options	COMPAT_60 # NetBSD 6.0 compatibility.
+options COMPAT_60 # NetBSD 6.0 compatibility.
 options COMPAT_AOUT_M68K # Compatibility to a.out executables
 options EXEC_AOUT # a.out format executables
 options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.

Index: src/sys/arch/atari/conf/FALCON
diff -u src/sys/arch/atari/conf/FALCON:1.109 src/sys/arch/atari/conf/FALCON:1.110
--- src/sys/arch/atari/conf/FALCON:1.109	Sun Jun 30 21:38:55 2013
+++ src/sys/arch/atari/conf/FALCON	Sat Jul  5 09:31:21 2014
@@ -1,13 +1,14 @@
 #
-# $NetBSD: FALCON,v 1.109 2013/06/30 21:38:55 rmind Exp $
+# $NetBSD: FALCON,v 1.110 2014/07/05 09:31:21 tsutsui Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: GENERIC.in,v 1.92 2010/12/12 09:56:15 tsutsui Exp $
+#		NetBSD: GENERIC.in,v 1.106 2014/07/05 09:28:48 tsutsui Exp $
 include "arch/atari/conf/std.atari"
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
 maxusers 16
 options HZ=64 # Set the clock-rate (48/64/96)
 options INSECURE # disable kernel security levels

Index: src/sys/arch/atari/conf/HADES
diff -u src/sys/arch/atari/conf/HADES:1.103 src/sys/arch/atari/conf/HADES:1.104
--- src/sys/arch/atari/conf/HADES:1.103	Sun Jun 30 21:38:55 2013
+++ src/sys/arch/atari/conf/HADES	Sat Jul  5 09:31:21 2014
@@ -1,14 +1,15 @@
 #
-# $NetBSD: HADES,v 1.103 2013/06/30 21:38:55 rmind Exp $
+# $NetBSD: HADES,v 1.104 2014/07/05 09:31:21 tsutsui Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
 #		NetBSD: HADES.in,v 1.12 2010/12/12 10:05:25 tsutsui Exp $
-#		NetBSD: GENERIC.in,v 1.92 2010/12/12 09:56:15 tsutsui Exp $
+#		NetBSD: GENERIC.in,v 1.106 2014/07/05 09:28:48 tsutsui Exp $
 include "arch/atari/conf/std.hades"
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
 maxusers 16
 options HZ=64 # Set the clock-rate (48/64/96)
 options INSECURE # disable kernel security levels

Index: src/sys/arch/atari/conf/SMALL030
diff -u src/sys/arch/atari/conf/SMALL030:1.16 src/sys/arch/atari/conf/SMALL030:1.17
--- src/sys/arch/atari/conf/SMALL030:1.16	Wed Oct 17 14:48:09 2012
+++ src/sys/arch/atari/conf/SMALL030	Sat Jul  5 09:31:21 2014
@@ -1,12 +1,13 @@
 #
-# $NetBSD: SMALL030,v 1.16 2012/10/17 14:48:09 apb Exp $
+# $NetBSD: SMALL030,v 1.17 2014/07/05 09:31:21 tsutsui Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: GENERIC.in,v 1.96 2011/12/17 12:44:12 he Exp $
+#		NetBSD: GENERIC.in,v 1.106 2014/07/05 09:28:48 tsutsui Exp $
 include "arch/atari/conf/std.atari"
+makeoptions COPTS="-Os" # optimize for space
 maxusers 16
 options HZ=64 # Set the clock-rate (48/64/96)
 options INSECURE # disable kernel security levels

CVS commit: src/sys/dev/usb

2014-07-05 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Sat Jul  5 09:30:08 UTC 2014

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

Log Message:
PR/48963: kmem_free size mismatch causes panic when attaching urndis(4).

Fix the size passed in kmem_free in the urndis_ctrl_{query,set} functions


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/if_urndis.c

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

Modified files:

Index: src/sys/dev/usb/if_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.6 src/sys/dev/usb/if_urndis.c:1.7
--- src/sys/dev/usb/if_urndis.c:1.6	Thu Oct 17 21:07:37 2013
+++ src/sys/dev/usb/if_urndis.c	Sat Jul  5 09:30:08 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_urndis.c,v 1.6 2013/10/17 21:07:37 christos Exp $ */
+/*	$NetBSD: if_urndis.c,v 1.7 2014/07/05 09:30:08 skrll Exp $ */
 /*	$OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
 
 /*
@@ -21,7 +21,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.6 2013/10/17 21:07:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.7 2014/07/05 09:30:08 skrll Exp $");
 
 #include 
 #include 
@@ -513,7 +513,7 @@ urndis_ctrl_query(struct urndis_softc *s
 	le32toh(msg->rm_devicevchdl)));
 
 	rval = urndis_ctrl_send(sc, msg, sizeof(*msg));
-	kmem_free(msg, sizeof(*msg));
+	kmem_free(msg, sizeof(*msg) + qlen);
 
 	if (rval != RNDIS_STATUS_SUCCESS) {
 		printf("%s: query failed\n", DEVNAME(sc));
@@ -566,7 +566,7 @@ urndis_ctrl_set(struct urndis_softc *sc,
 	le32toh(msg->rm_devicevchdl)));
 
 	rval = urndis_ctrl_send(sc, msg, sizeof(*msg));
-	kmem_free(msg, sizeof(*msg));
+	kmem_free(msg, sizeof(*msg) + len);
 
 	if (rval != RNDIS_STATUS_SUCCESS) {
 		printf("%s: set failed\n", DEVNAME(sc));

CVS commit: src/sys/arch/atari/conf

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 09:28:48 UTC 2014

Modified Files:
src/sys/arch/atari/conf: GENERIC.in std.atari std.hades std.milan

Log Message:
Use COPTS="-O2 -fno-reorder-blocks" for kernels except SMALL030_KERNEL.

Also remove COPTS="-Os" from std.* files and specify it in
GENERIC.in template for SMALL030_KERNEL.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/atari/conf/GENERIC.in
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/atari/conf/std.atari
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/atari/conf/std.hades
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/atari/conf/std.milan

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/atari/conf/GENERIC.in
diff -u src/sys/arch/atari/conf/GENERIC.in:1.105 src/sys/arch/atari/conf/GENERIC.in:1.106
--- src/sys/arch/atari/conf/GENERIC.in:1.105	Sun Jun 30 21:38:55 2013
+++ src/sys/arch/atari/conf/GENERIC.in	Sat Jul  5 09:28:48 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.in,v 1.105 2013/06/30 21:38:55 rmind Exp $
+#	$NetBSD: GENERIC.in,v 1.106 2014/07/05 09:28:48 tsutsui Exp $
 #
 # Generic atari
 #
@@ -19,6 +19,12 @@ include "arch/atari/conf/std.milan"
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 #endif /* !SMALL030_KERNEL */
 
+#if !defined(SMALL030_KERNEL)
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
+#else
+makeoptions	COPTS="-Os"			# optimize for space
+#endif /* !SMALL030_KERNEL */
+
 #if defined(SMALL030_KERNEL) || \
   (!defined(TT030_KERNEL) && !defined(HADES_KERNEL) && !defined(MILAN_KERNEL))
 #define   NO_PHYS_NETWORK 1

Index: src/sys/arch/atari/conf/std.atari
diff -u src/sys/arch/atari/conf/std.atari:1.26 src/sys/arch/atari/conf/std.atari:1.27
--- src/sys/arch/atari/conf/std.atari:1.26	Thu Dec 15 13:27:06 2011
+++ src/sys/arch/atari/conf/std.atari	Sat Jul  5 09:28:48 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: std.atari,v 1.26 2011/12/15 13:27:06 tsutsui Exp $
+#	$NetBSD: std.atari,v 1.27 2014/07/05 09:28:48 tsutsui Exp $
 #
 # standard atari information
 #
@@ -6,8 +6,6 @@ machine		atari m68k
 include		"conf/std"			# MI standard options
 include		"arch/m68k/conf/std.m68k"	# m68k standard options
 
-makeoptions	COPTS="-Os"		# XXX for wasteful gcc 4.5
-
 options 	_ATARIHW_		# Original Atari like mainboard hw.
 
 mainbus0	at root

Index: src/sys/arch/atari/conf/std.hades
diff -u src/sys/arch/atari/conf/std.hades:1.8 src/sys/arch/atari/conf/std.hades:1.9
--- src/sys/arch/atari/conf/std.hades:1.8	Thu Dec 15 13:27:06 2011
+++ src/sys/arch/atari/conf/std.hades	Sat Jul  5 09:28:48 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: std.hades,v 1.8 2011/12/15 13:27:06 tsutsui Exp $
+#	$NetBSD: std.hades,v 1.9 2014/07/05 09:28:48 tsutsui Exp $
 #
 # standard Hades information
 #
@@ -6,8 +6,6 @@ machine		atari m68k
 include		"conf/std"			# MI standard options
 include		"arch/m68k/conf/std.m68k"	# m68k standard options
 
-makeoptions	COPTS="-Os"		# XXX for wasteful gcc 4.5
-
 options 	_ATARIHW_		# Original Atari like mainboard hw.
 
 mainbus0	at root

Index: src/sys/arch/atari/conf/std.milan
diff -u src/sys/arch/atari/conf/std.milan:1.7 src/sys/arch/atari/conf/std.milan:1.8
--- src/sys/arch/atari/conf/std.milan:1.7	Thu Dec 15 13:27:06 2011
+++ src/sys/arch/atari/conf/std.milan	Sat Jul  5 09:28:48 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: std.milan,v 1.7 2011/12/15 13:27:06 tsutsui Exp $
+#	$NetBSD: std.milan,v 1.8 2014/07/05 09:28:48 tsutsui Exp $
 #
 # standard atari information
 #
@@ -6,8 +6,6 @@ machine		atari m68k
 include		"conf/std"			# MI standard options
 include		"arch/m68k/conf/std.m68k"	# m68k standard options
 
-makeoptions	COPTS="-Os"		# XXX for wasteful gcc 4.5
-
 options 	_MILANHW_
 
 mainbus0	at root

CVS commit: src/sys/arch/atari/conf

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 09:24:23 UTC 2014

Modified Files:
src/sys/arch/atari/conf: MILAN.in

Log Message:
Enable options WSDISPLAY_COMPAT_USL in template, not in generated files.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/atari/conf/MILAN.in

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/atari/conf/MILAN.in
diff -u src/sys/arch/atari/conf/MILAN.in:1.26 src/sys/arch/atari/conf/MILAN.in:1.27
--- src/sys/arch/atari/conf/MILAN.in:1.26	Tue Jun  5 08:44:07 2012
+++ src/sys/arch/atari/conf/MILAN.in	Sat Jul  5 09:24:23 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: MILAN.in,v 1.26 2012/06/05 08:44:07 abs Exp $
+#	$NetBSD: MILAN.in,v 1.27 2014/07/05 09:24:23 tsutsui Exp $
 #
 # Milan
 #
@@ -23,7 +23,7 @@ options 	WS_KERNEL_FG=WSCOL_WHITE
 options 	WS_KERNEL_BG=WSCOL_BLACK
 
 # compatibility to other console drivers
-#options 	WSDISPLAY_COMPAT_USL	# wsconscfg VT handling
+options 	WSDISPLAY_COMPAT_USL	# wsconscfg VT handling
 #options 	WSDISPLAY_COMPAT_RAWKBD	# can get raw scancodes
 
 # see dev/pckbport/wskbdmap_mfii.c for implemented layouts

CVS commit: src/sys/arch

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 09:21:14 UTC 2014

Modified Files:
src/sys/arch/cesfic/conf: GENERIC
src/sys/arch/mac68k/conf: GENERIC
src/sys/arch/mvme68k/conf: GENERIC RAMDISK VME147 VME162 VME167 VME172
VME177
src/sys/arch/next68k/conf: GENERIC

Log Message:
Use COPTS="-O2 -fno-reorder-blocks" as defined in sys.mk for userland.

Compile tests only.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/cesfic/conf/GENERIC
cvs rdiff -u -r1.215 -r1.216 src/sys/arch/mac68k/conf/GENERIC
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/mvme68k/conf/GENERIC
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/mvme68k/conf/RAMDISK
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/mvme68k/conf/VME147
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mvme68k/conf/VME162 \
src/sys/arch/mvme68k/conf/VME172
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/mvme68k/conf/VME167
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mvme68k/conf/VME177
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/next68k/conf/GENERIC

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/cesfic/conf/GENERIC
diff -u src/sys/arch/cesfic/conf/GENERIC:1.60 src/sys/arch/cesfic/conf/GENERIC:1.61
--- src/sys/arch/cesfic/conf/GENERIC:1.60	Sun Jun 30 21:38:56 2013
+++ src/sys/arch/cesfic/conf/GENERIC	Sat Jul  5 09:21:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.60 2013/06/30 21:38:56 rmind Exp $
+# $NetBSD: GENERIC,v 1.61 2014/07/05 09:21:14 tsutsui Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,6 +22,8 @@ include 	"arch/cesfic/conf/std.cesfic"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
+
 # Need to set locally
 maxusers	32
 

Index: src/sys/arch/mac68k/conf/GENERIC
diff -u src/sys/arch/mac68k/conf/GENERIC:1.215 src/sys/arch/mac68k/conf/GENERIC:1.216
--- src/sys/arch/mac68k/conf/GENERIC:1.215	Tue Jul 16 07:31:40 2013
+++ src/sys/arch/mac68k/conf/GENERIC	Sat Jul  5 09:21:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.215 2013/07/16 07:31:40 jklos Exp $
+# $NetBSD: GENERIC,v 1.216 2014/07/05 09:21:14 tsutsui Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,9 @@ include		"arch/mac68k/conf/std.mac68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.215 $"
+#ident 		"GENERIC-$Revision: 1.216 $"
+
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
 maxusers	16		# estimated number of users
 

Index: src/sys/arch/mvme68k/conf/GENERIC
diff -u src/sys/arch/mvme68k/conf/GENERIC:1.89 src/sys/arch/mvme68k/conf/GENERIC:1.90
--- src/sys/arch/mvme68k/conf/GENERIC:1.89	Wed Jun  5 23:08:02 2013
+++ src/sys/arch/mvme68k/conf/GENERIC	Sat Jul  5 09:21:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.89 2013/06/05 23:08:02 christos Exp $
+# $NetBSD: GENERIC,v 1.90 2014/07/05 09:21:14 tsutsui Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,9 @@ include		"arch/mvme68k/conf/std.mvme68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.89 $"
+#ident 		"GENERIC-$Revision: 1.90 $"
+
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
 # Boards this kernel supports
 options 	MVME147

Index: src/sys/arch/mvme68k/conf/RAMDISK
diff -u src/sys/arch/mvme68k/conf/RAMDISK:1.28 src/sys/arch/mvme68k/conf/RAMDISK:1.29
--- src/sys/arch/mvme68k/conf/RAMDISK:1.28	Tue Nov 23 11:14:02 2010
+++ src/sys/arch/mvme68k/conf/RAMDISK	Sat Jul  5 09:21:14 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: RAMDISK,v 1.28 2010/11/23 11:14:02 hannken Exp $
+#	$NetBSD: RAMDISK,v 1.29 2014/07/05 09:21:14 tsutsui Exp $
 
 #
 # RAMDISK: Root/swap on ramdisk
@@ -14,6 +14,8 @@ include		"arch/mvme68k/conf/std.mvme68k"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
+
 # Boards this kernel supports
 options 	MVME147
 options 	MVME162

Index: src/sys/arch/mvme68k/conf/VME147
diff -u src/sys/arch/mvme68k/conf/VME147:1.57 src/sys/arch/mvme68k/conf/VME147:1.58
--- src/sys/arch/mvme68k/conf/VME147:1.57	Fri Mar  1 18:25:48 2013
+++ src/sys/arch/mvme68k/conf/VME147	Sat Jul  5 09:21:14 2014
@@ -1,9 +1,11 @@
-#	$NetBSD: VME147,v 1.57 2013/03/01 18:25:48 joerg Exp $
+#	$NetBSD: VME147,v 1.58 2014/07/05 09:21:14 tsutsui Exp $
 
 include		"arch/mvme68k/conf/std.mvme68k"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
+
 # Boards this kernel supports; need at lest the correct one
 options 	MVME147
 

Index: src/sys/arch/mvme68k/conf/VME162
diff -u src/sys/arch/mvme68k/conf/VME162:1.30 src/sys/arch/mvme68k/conf/VME162:1.31
--- src/sys/arch/mvme68k/conf/VME162:1.30	Fri Mar  1 18:25:48 2013
+++ src/sys/arch/mvme68k/conf/VME162	Sat Jul  5 09:21:14 2014
@@ -1

CVS commit: src/sys/arch/x68k/conf

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 09:18:47 UTC 2014

Modified Files:
src/sys/arch/x68k/conf: GENERIC

Log Message:
Use COPTS="-O2 -fno-reorder-blocks" as defined in sys.mk for userland.

with "-O2":
   textdata bss dec hex filename
2898020   54292  122728 3075040  2eebe0 netbsd

with "-O2 -fno-reorder-blocks":
   textdata bss dec hex filename
2589888   54292  122728 2766908  2a383c netbsd


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/sys/arch/x68k/conf/GENERIC

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/x68k/conf/GENERIC
diff -u src/sys/arch/x68k/conf/GENERIC:1.172 src/sys/arch/x68k/conf/GENERIC:1.173
--- src/sys/arch/x68k/conf/GENERIC:1.172	Mon Mar 24 14:15:38 2014
+++ src/sys/arch/x68k/conf/GENERIC	Sat Jul  5 09:18:47 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.172 2014/03/24 14:15:38 szptvlfn Exp $
+# $NetBSD: GENERIC,v 1.173 2014/07/05 09:18:47 tsutsui Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,9 @@ include 	"arch/x68k/conf/std.x68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.172 $"
+#ident 		"GENERIC-$Revision: 1.173 $"
+
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
 maxusers	8

CVS commit: src/sys/arch/luna68k/conf

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 09:16:45 UTC 2014

Modified Files:
src/sys/arch/luna68k/conf: GENERIC

Log Message:
Use COPTS="-O2 -fno-reorder-blocks" as defined in sys.mk for userland.

with "-O2":
   textdata bss dec hex filename
2064824   48784   85920 2199528  218fe8 netbsd

with "-O2 -fno-reorder-blocks":
   textdata bss dec hex filename
1842944   48784   85920 1977648  1e2d30 netbsd


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/luna68k/conf/GENERIC

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/luna68k/conf/GENERIC
diff -u src/sys/arch/luna68k/conf/GENERIC:1.110 src/sys/arch/luna68k/conf/GENERIC:1.111
--- src/sys/arch/luna68k/conf/GENERIC:1.110	Wed Jan  1 08:41:52 2014
+++ src/sys/arch/luna68k/conf/GENERIC	Sat Jul  5 09:16:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.110 2014/01/01 08:41:52 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.111 2014/07/05 09:16:45 tsutsui Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,9 @@ include		"arch/luna68k/conf/std.luna68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.110 $"
+#ident 		"GENERIC-$Revision: 1.111 $"
+
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
 maxusers	8

CVS commit: src/sys/arch/hp300/conf

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 09:15:38 UTC 2014

Modified Files:
src/sys/arch/hp300/conf: GENERIC

Log Message:
Use COPTS="-O2 -fno-reorder-blocks" as defined in sys.mk for userland.

with "-O2":
   textdata bss dec hex filename
3717740   86092  152864 3956696  3c5fd8 netbsd

with "-O2 -fno-reorder-blocks":
   textdata bss dec hex filename
3304404   86092  152864 3543360  361140 netbsd


To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 src/sys/arch/hp300/conf/GENERIC

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/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.181 src/sys/arch/hp300/conf/GENERIC:1.182
--- src/sys/arch/hp300/conf/GENERIC:1.181	Sat Apr 19 05:37:54 2014
+++ src/sys/arch/hp300/conf/GENERIC	Sat Jul  5 09:15:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.181 2014/04/19 05:37:54 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.182 2014/07/05 09:15:38 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,9 @@ include 	"arch/hp300/conf/std.hp300"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.181 $"
+#ident 		"GENERIC-$Revision: 1.182 $"
+
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
 maxusers	32		# estimated number of users

CVS commit: src/sys/arch/news68k/conf

2014-07-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 09:14:02 UTC 2014

Modified Files:
src/sys/arch/news68k/conf: GENERIC GENERIC_TINY

Log Message:
Use COPTS="-O2 -fno-reorder-blocks" as defined in sys.mk for userland.

with "-O2":
   textdata bss dec hex filename
3297898   65044  122584 3485526  352f56 netbsd

with "-O2 -fno-reorder-blocks":
   textdata bss dec hex filename
2930782   65044  122584 3118410  2f954a netbsd


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/news68k/conf/GENERIC
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/news68k/conf/GENERIC_TINY

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/news68k/conf/GENERIC
diff -u src/sys/arch/news68k/conf/GENERIC:1.118 src/sys/arch/news68k/conf/GENERIC:1.119
--- src/sys/arch/news68k/conf/GENERIC:1.118	Mon Mar 24 14:15:38 2014
+++ src/sys/arch/news68k/conf/GENERIC	Sat Jul  5 09:14:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.118 2014/03/24 14:15:38 szptvlfn Exp $
+# $NetBSD: GENERIC,v 1.119 2014/07/05 09:14:02 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,9 @@ include		"arch/news68k/conf/std.news68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.118 $"
+#ident 		"GENERIC-$Revision: 1.119 $"
+
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
 maxusers	8
 

Index: src/sys/arch/news68k/conf/GENERIC_TINY
diff -u src/sys/arch/news68k/conf/GENERIC_TINY:1.79 src/sys/arch/news68k/conf/GENERIC_TINY:1.80
--- src/sys/arch/news68k/conf/GENERIC_TINY:1.79	Mon Mar 24 14:15:38 2014
+++ src/sys/arch/news68k/conf/GENERIC_TINY	Sat Jul  5 09:14:02 2014
@@ -1,4 +1,4 @@
-# 	$NetBSD: GENERIC_TINY,v 1.79 2014/03/24 14:15:38 szptvlfn Exp $
+# 	$NetBSD: GENERIC_TINY,v 1.80 2014/07/05 09:14:02 tsutsui Exp $
 
 #	news68k GENERIC config file for low memory machines;
 #
@@ -6,7 +6,9 @@ include		"arch/news68k/conf/std.news68k"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC_TINY-$Revision: 1.79 $"
+#ident 		"GENERIC_TINY-$Revision: 1.80 $"
+
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
 maxusers	4

46 matches

Mail list logo