CVS commit: src
Module Name:src Committed By: maxv Date: Thu Sep 6 05:36:51 UTC 2018 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile src/sys/arch/algor/conf: P4032 P5064 P6032 src/sys/arch/alpha/conf: GENERIC INSTALL RAWHIDE src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0 src/sys/arch/arc/conf: GENERIC src/sys/arch/cats/conf: GENERIC INSTALL src/sys/arch/cobalt/conf: GENERIC INSTALL src/sys/arch/evbarm/conf: IXDP425 ZAO425 src/sys/arch/evbmips/conf: MALTA src/sys/arch/evbppc/conf: PMPPC src/sys/arch/hppa/conf: GENERIC src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY INSTALL_TINY XEN3PAE_DOM0 src/sys/arch/iyonix/conf: GENERIC src/sys/arch/sgimips/conf: GENERIC32_IP3x src/sys/arch/sparc/conf: GENERIC INSTALL src/sys/arch/sparc64/conf: GENERIC src/sys/conf: files src/sys/dev/pci: files.pci src/sys/dev/sbus: files.sbus Removed Files: src/share/man/man4: en.4 src/sys/dev/ic: midway.c midwayreg.h midwayvar.h src/sys/dev/pci: if_en_pci.c src/sys/dev/sbus: if_en.c Log Message: Retire the 'midway' driver. Discussed on tech-net@ recently and also three years ago, part of removing the network ATM code. To generate a diff of this commit: cvs rdiff -u -r1.1612 -r1.1613 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.665 -r1.666 src/share/man/man4/Makefile cvs rdiff -u -r1.8 -r0 src/share/man/man4/en.4 cvs rdiff -u -r1.76 -r1.77 src/sys/arch/algor/conf/P4032 cvs rdiff -u -r1.87 -r1.88 src/sys/arch/algor/conf/P5064 cvs rdiff -u -r1.78 -r1.79 src/sys/arch/algor/conf/P6032 cvs rdiff -u -r1.385 -r1.386 src/sys/arch/alpha/conf/GENERIC cvs rdiff -u -r1.110 -r1.111 src/sys/arch/alpha/conf/INSTALL cvs rdiff -u -r1.42 -r1.43 src/sys/arch/alpha/conf/RAWHIDE cvs rdiff -u -r1.100 -r1.101 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.504 -r1.505 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.156 -r1.157 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.190 -r1.191 src/sys/arch/arc/conf/GENERIC cvs rdiff -u -r1.168 -r1.169 src/sys/arch/cats/conf/GENERIC cvs rdiff -u -r1.105 -r1.106 src/sys/arch/cats/conf/INSTALL cvs rdiff -u -r1.159 -r1.160 src/sys/arch/cobalt/conf/GENERIC cvs rdiff -u -r1.68 -r1.69 src/sys/arch/cobalt/conf/INSTALL cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/conf/IXDP425 cvs rdiff -u -r1.62 -r1.63 src/sys/arch/evbarm/conf/ZAO425 cvs rdiff -u -r1.90 -r1.91 src/sys/arch/evbmips/conf/MALTA cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbppc/conf/PMPPC cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hppa/conf/GENERIC cvs rdiff -u -r1.450 -r1.451 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1191 -r1.1192 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.159 -r1.160 src/sys/arch/i386/conf/GENERIC_TINY cvs rdiff -u -r1.45 -r1.46 src/sys/arch/i386/conf/INSTALL_FLOPPY cvs rdiff -u -r1.157 -r1.158 src/sys/arch/i386/conf/INSTALL_TINY cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.101 -r1.102 src/sys/arch/iyonix/conf/GENERIC cvs rdiff -u -r1.118 -r1.119 src/sys/arch/sgimips/conf/GENERIC32_IP3x cvs rdiff -u -r1.260 -r1.261 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.100 -r1.101 src/sys/arch/sparc/conf/INSTALL cvs rdiff -u -r1.206 -r1.207 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.1204 -r1.1205 src/sys/conf/files cvs rdiff -u -r1.103 -r0 src/sys/dev/ic/midway.c cvs rdiff -u -r1.14 -r0 src/sys/dev/ic/midwayreg.h cvs rdiff -u -r1.19 -r0 src/sys/dev/ic/midwayvar.h cvs rdiff -u -r1.400 -r1.401 src/sys/dev/pci/files.pci cvs rdiff -u -r1.37 -r0 src/sys/dev/pci/if_en_pci.c cvs rdiff -u -r1.42 -r1.43 src/sys/dev/sbus/files.sbus cvs rdiff -u -r1.29 -r0 src/sys/dev/sbus/if_en.c 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1612 src/distrib/sets/lists/man/mi:1.1613 --- src/distrib/sets/lists/man/mi:1.1612 Sat Aug 25 20:12:21 2018 +++ src/distrib/sets/lists/man/mi Thu Sep 6 05:36:49 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1612 2018/08/25 20:12:21 rin Exp $ +# $NetBSD: mi,v 1.1613 2018/09/06 05:36:49 maxv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -7131,7 +7131,7 @@ ./usr/share/man/man4/emips/enic.4 man-sys-man .man ./usr/share/man/man4/emips/intro.4 man-sys-man .man ./usr/share/man/man4/emuxki.4 man-sys-man .man -./usr/share/man/man4/en.4 man-sys-man .man +./usr/share/man/man4/en.4 man-obsolete obsolete ./usr/share/man/man4/envsys.4 man-sys-man .man ./usr/share/man/man4/ep.4 man-sys-man .man ./usr/share/man/man4/epic.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.665 src/share/man/man4/Makefile:1.666 --- src/share/man/man4/Makefile:1.665 Sat Aug 25 20:12:21 2018 +++
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Thu Sep 6 00:44:43 UTC 2018 Modified Files: src/external/cddl/osnet/sys/sys: opentypes.h Log Message: remove duplicate typedef (it is in sunddi.h) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/sys/opentypes.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/sys/sys/opentypes.h diff -u src/external/cddl/osnet/sys/sys/opentypes.h:1.3 src/external/cddl/osnet/sys/sys/opentypes.h:1.4 --- src/external/cddl/osnet/sys/sys/opentypes.h:1.3 Thu May 31 20:56:19 2018 +++ src/external/cddl/osnet/sys/sys/opentypes.h Wed Sep 5 20:44:43 2018 @@ -84,6 +84,5 @@ typedef int32_t time32_t; #define S_READ UIO_READ #define S_WRITE UIO_WRITE struct aio_req; -typedef void *dev_info_t; #endif /* _OPENSOLARIS_SYS_OPENTYPES_H_ */
CVS commit: [pgoyette-compat] src/sys/kern
Module Name:src
Committed By: pgoyette
Date: Thu Sep 6 00:10:55 UTC 2018
Modified Files:
src/sys/kern [pgoyette-compat]: kern_module.c
Log Message:
One more time - let's get this right!
To generate a diff of this commit:
cvs rdiff -u -r1.130.2.19 -r1.130.2.20 src/sys/kern/kern_module.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/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.130.2.19 src/sys/kern/kern_module.c:1.130.2.20
--- src/sys/kern/kern_module.c:1.130.2.19 Wed Sep 5 22:04:51 2018
+++ src/sys/kern/kern_module.c Thu Sep 6 00:10:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.130.2.19 2018/09/05 22:04:51 pgoyette Exp $ */
+/* $NetBSD: kern_module.c,v 1.130.2.20 2018/09/06 00:10:55 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.19 2018/09/05 22:04:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.20 2018/09/06 00:10:55 pgoyette Exp $");
#define _MODULE_INTERNAL
@@ -1402,9 +1402,6 @@ module_do_unload(const char *name, bool
if (mod->mod_kobj != NULL) {
kobj_unload(mod->mod_kobj);
}
- if (mod->mod_required)
- kmem_free(mod->mod_required, mod->mod_arequired *
- sizeof(module_t));
if (mod->mod_source == MODULE_SOURCE_KERNEL) {
if (mod->mod_required != NULL) {
/*
CVS commit: [pgoyette-compat] src/tests/modules
Module Name:src Committed By: pgoyette Date: Wed Sep 5 23:38:40 UTC 2018 Modified Files: src/tests/modules [pgoyette-compat]: t_builtin.c Log Message: Don't forget to increment loop control - avoid infinite iteration To generate a diff of this commit: cvs rdiff -u -r1.3.12.2 -r1.3.12.3 src/tests/modules/t_builtin.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/modules/t_builtin.c diff -u src/tests/modules/t_builtin.c:1.3.12.2 src/tests/modules/t_builtin.c:1.3.12.3 --- src/tests/modules/t_builtin.c:1.3.12.2 Wed Sep 5 23:06:08 2018 +++ src/tests/modules/t_builtin.c Wed Sep 5 23:38:40 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: t_builtin.c,v 1.3.12.2 2018/09/05 23:06:08 pgoyette Exp $ */ +/* $NetBSD: t_builtin.c,v 1.3.12.3 2018/09/05 23:38:40 pgoyette Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. All rights reserved. @@ -176,6 +176,9 @@ ATF_TC_BODY(disabledstat, tc) found = true; break; } + ms++; + count--; + } ATF_REQUIRE(found); }
CVS commit: [pgoyette-compat] src/tests/modules
Module Name:src
Committed By: pgoyette
Date: Wed Sep 5 23:06:08 UTC 2018
Modified Files:
src/tests/modules [pgoyette-compat]: t_builtin.c
Log Message:
Remove no-longer-used variable
To generate a diff of this commit:
cvs rdiff -u -r1.3.12.1 -r1.3.12.2 src/tests/modules/t_builtin.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/modules/t_builtin.c
diff -u src/tests/modules/t_builtin.c:1.3.12.1 src/tests/modules/t_builtin.c:1.3.12.2
--- src/tests/modules/t_builtin.c:1.3.12.1 Wed Sep 5 21:53:45 2018
+++ src/tests/modules/t_builtin.c Wed Sep 5 23:06:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: t_builtin.c,v 1.3.12.1 2018/09/05 21:53:45 pgoyette Exp $ */
+/* $NetBSD: t_builtin.c,v 1.3.12.2 2018/09/05 23:06:08 pgoyette Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc. All rights reserved.
@@ -141,7 +141,6 @@ ATF_TC_BODY(disabledstat, tc)
{
modstat_t *ms;
struct iovec iov;
- size_t i;
size_t len;
int count;
bool found = false;
CVS commit: [pgoyette-compat] src/sys/kern
Module Name:src
Committed By: pgoyette
Date: Wed Sep 5 22:04:51 UTC 2018
Modified Files:
src/sys/kern [pgoyette-compat]: kern_module.c
Log Message:
After releasing the resources, make sure we don't retain pointer to them!
To generate a diff of this commit:
cvs rdiff -u -r1.130.2.18 -r1.130.2.19 src/sys/kern/kern_module.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/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.130.2.18 src/sys/kern/kern_module.c:1.130.2.19
--- src/sys/kern/kern_module.c:1.130.2.18 Wed Sep 5 09:42:57 2018
+++ src/sys/kern/kern_module.c Wed Sep 5 22:04:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.130.2.18 2018/09/05 09:42:57 pgoyette Exp $ */
+/* $NetBSD: kern_module.c,v 1.130.2.19 2018/09/05 22:04:51 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.18 2018/09/05 09:42:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.19 2018/09/05 22:04:51 pgoyette Exp $");
#define _MODULE_INTERNAL
@@ -1406,7 +1406,7 @@ module_do_unload(const char *name, bool
kmem_free(mod->mod_required, mod->mod_arequired *
sizeof(module_t));
if (mod->mod_source == MODULE_SOURCE_KERNEL) {
- if (mod->mod_arequired != 0) {
+ if (mod->mod_required != NULL) {
/*
* release "required" resources - will be re-parsed
* if the module is re-enabled
@@ -1415,6 +1415,7 @@ module_do_unload(const char *name, bool
mod->mod_arequired * sizeof(module_t *));
mod->mod_nrequired = 0;
mod->mod_arequired = 0;
+ mod->mod_required = NULL;
}
if (load_requires_force)
module_require_force(mod);
CVS commit: [pgoyette-compat] src/tests/modules
Module Name:src
Committed By: pgoyette
Date: Wed Sep 5 21:53:46 UTC 2018
Modified Files:
src/tests/modules [pgoyette-compat]: t_builtin.c
Log Message:
Adapt this test to the new MODCTL_STAT, too.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.12.1 src/tests/modules/t_builtin.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/modules/t_builtin.c
diff -u src/tests/modules/t_builtin.c:1.3 src/tests/modules/t_builtin.c:1.3.12.1
--- src/tests/modules/t_builtin.c:1.3 Fri Jan 13 21:30:42 2017
+++ src/tests/modules/t_builtin.c Wed Sep 5 21:53:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: t_builtin.c,v 1.3 2017/01/13 21:30:42 christos Exp $ */
+/* $NetBSD: t_builtin.c,v 1.3.12.1 2018/09/05 21:53:45 pgoyette Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc. All rights reserved.
@@ -139,9 +139,11 @@ ATF_TC_HEAD(disabledstat, tc)
ATF_TC_BODY(disabledstat, tc)
{
- struct modstat ms[128];
+ modstat_t *ms;
struct iovec iov;
size_t i;
+ size_t len;
+ int count;
bool found = false;
rump_init();
@@ -149,14 +151,30 @@ ATF_TC_BODY(disabledstat, tc)
RL(rump_sys_modctl(MODCTL_UNLOAD, kernfs));
- iov.iov_base = ms;
- iov.iov_len = sizeof(ms);
- RL(rump_sys_modctl(MODCTL_STAT, ));
-
- for (i = 0; i < __arraycount(ms); i++) {
- if (strcmp(ms[i].ms_name, kernfs) == 0) {
- ATF_REQUIRE_EQ(ms[i].ms_refcnt, (u_int)-1);
- found = 1;
+ for (len = 8192; ;) {
+ iov.iov_base = malloc(len);
+ iov.iov_len = len;
+
+ errno = 0;
+
+ if (rump_sys_modctl(MODCTL_STAT, ) != 0) {
+ int err = errno;
+ fprintf(stderr, "modctl(MODCTL_STAT) failed: %s\n",
+ strerror(err));
+ atf_tc_fail("Failed to query module status");
+ }
+ if (len >= iov.iov_len)
+ break;
+ free(iov.iov_base);
+ len = iov.iov_len;
+ }
+
+ count = *(int *)iov.iov_base;
+ ms = (modstat_t *)((char *)iov.iov_base + sizeof(int));
+ while ( count ) {
+ if (strcmp(ms->ms_name, kernfs) == 0) {
+ ATF_REQUIRE_EQ(ms->ms_refcnt, (u_int)-1);
+ found = true;
break;
}
}
CVS commit: src
Module Name:src
Committed By: kre
Date: Wed Sep 5 21:05:40 UTC 2018
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/usr.bin: Makefile
Added Files:
src/tests/usr.bin/printf: Makefile printf.sh t_builtin.sh t_command.sh
Log Message:
Add ATF tests for printf(1)
Two new test programs, one for the version of printf in /bin/sh
and one for the command /usr/bin/printf (t_builtin and t_command)
Each test program has 28 test cases (the same in each) of which
currently 27 pass, and 1 is skipped.
See the test scripts themselves for more information.
To generate a diff of this commit:
cvs rdiff -u -r1.793 -r1.794 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.152 -r1.153 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.25 -r1.26 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/printf/Makefile \
src/tests/usr.bin/printf/printf.sh src/tests/usr.bin/printf/t_builtin.sh \
src/tests/usr.bin/printf/t_command.sh
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.793 src/distrib/sets/lists/tests/mi:1.794
--- src/distrib/sets/lists/tests/mi:1.793 Tue Aug 21 11:07:40 2018
+++ src/distrib/sets/lists/tests/mi Wed Sep 5 21:05:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.793 2018/08/21 11:07:40 christos Exp $
+# $NetBSD: mi,v 1.794 2018/09/05 21:05:40 kre Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3945,6 +3945,11 @@
./usr/tests/usr.bin/pr/d_basic.in tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/pr/d_basic.out tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/pr/t_basic tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/printf tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/printf/Atffile tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/printf/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
+./usr/tests/usr.bin/printf/t_builtin tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/printf/t_command tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/rump_server tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/rump_server/Atffile tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/rump_server/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.152 src/etc/mtree/NetBSD.dist.tests:1.153
--- src/etc/mtree/NetBSD.dist.tests:1.152 Fri Aug 3 04:24:41 2018
+++ src/etc/mtree/NetBSD.dist.tests Wed Sep 5 21:05:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.152 2018/08/03 04:24:41 kamil Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.153 2018/09/05 21:05:40 kre Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -410,6 +410,7 @@
./usr/tests/usr.bin/nbperf
./usr/tests/usr.bin/pkill
./usr/tests/usr.bin/pr
+./usr/tests/usr.bin/printf
./usr/tests/usr.bin/rump_server
./usr/tests/usr.bin/sdiff
./usr/tests/usr.bin/sed
Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.25 src/tests/usr.bin/Makefile:1.26
--- src/tests/usr.bin/Makefile:1.25 Sun May 14 00:07:07 2017
+++ src/tests/usr.bin/Makefile Wed Sep 5 21:05:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/05/14 00:07:07 kamil Exp $
+# $NetBSD: Makefile,v 1.26 2018/09/05 21:05:40 kre Exp $
#
.include
@@ -8,7 +8,7 @@ TESTSDIR= ${TESTSBASE}/usr.bin
TESTS_SUBDIRS= awk basename bzip2 cc cmp config cut \
diff dirname find gdb grep gzip id \
infocmp jot ld m4 make mixerctl mkdep nbperf netpgpverify \
- pkill pr rump_server shmif_dumpbus sdiff \
+ pkill pr printf rump_server shmif_dumpbus sdiff \
sed sort tmux tr unifdef uniq vmstat xlint
.if ${MKCXX} != "no"
Added files:
Index: src/tests/usr.bin/printf/Makefile
diff -u /dev/null src/tests/usr.bin/printf/Makefile:1.1
--- /dev/null Wed Sep 5 21:05:40 2018
+++ src/tests/usr.bin/printf/Makefile Wed Sep 5 21:05:40 2018
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2018/09/05 21:05:40 kre Exp $
+
+.include
+
+TESTSDIR= ${TESTSBASE}/usr.bin/printf
+
+TESTS_SH= t_builtin t_command
+
+t_builtin: t_builtin.sh printf.sh
+
+t_command: t_command.sh printf.sh
+
+.include
Index: src/tests/usr.bin/printf/printf.sh
diff -u /dev/null src/tests/usr.bin/printf/printf.sh:1.1
--- /dev/null Wed Sep 5 21:05:40 2018
+++ src/tests/usr.bin/printf/printf.sh Wed Sep 5 21:05:40 2018
@@ -0,0 +1,1781 @@
+# $NetBSD: printf.sh,v 1.1 2018/09/05 21:05:40 kre Exp $
+#
+# Copyright (c) 2018 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
CVS commit: src/external/bsd/libpcap/lib
Module Name:src
Committed By: christos
Date: Wed Sep 5 17:10:27 UTC 2018
Modified Files:
src/external/bsd/libpcap/lib: Makefile
Log Message:
search first for the kernel bpf_filter.c
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/libpcap/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.20 src/external/bsd/libpcap/lib/Makefile:1.21
--- src/external/bsd/libpcap/lib/Makefile:1.20 Mon Sep 3 17:26:19 2018
+++ src/external/bsd/libpcap/lib/Makefile Wed Sep 5 13:10:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/09/03 21:26:19 kre Exp $
+# $NetBSD: Makefile,v 1.21 2018/09/05 17:10:27 christos Exp $
USE_SHLIBDIR=yes
.include
@@ -24,6 +24,8 @@ __sed: .USE
-e 's,3PCAP,3,g' < ${.ALLSRC} > ${.TARGET}
+# Search first in the kernel for bpf_filter.c
+.PATH: ${NETBSDSRCDIR}/sys/net
SRCDIR= ${.CURDIR}/../dist
.PATH: ${SRCDIR}
@@ -136,6 +138,7 @@ CPPFLAGS+= -DINET6
SRCS= \
bpf_dump.c \
+bpf_filter.c \
bpf_image.c \
etherent.c \
fad-getad.c \
@@ -152,8 +155,6 @@ scanner.l \
sf-pcap.c \
sf-pcapng.c
-.PATH: ${NETBSDSRCDIR}/sys/net
-SRCS+= bpf_filter.c
INCS= pcap/pcap.h pcap/namedb.h pcap/funcattrs.h \
pcap/pcap-inttypes.h pcap/compiler-tests.h
CVS commit: src/external/bsd/libpcap/dist
Module Name:src Committed By: christos Date: Wed Sep 5 17:10:07 UTC 2018 Modified Files: src/external/bsd/libpcap/dist: bpf_filter.c Log Message: make sure we don't accidentally compile this file. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/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/external/bsd/libpcap/dist/bpf_filter.c diff -u src/external/bsd/libpcap/dist/bpf_filter.c:1.2 src/external/bsd/libpcap/dist/bpf_filter.c:1.3 --- src/external/bsd/libpcap/dist/bpf_filter.c:1.2 Mon Sep 3 11:26:43 2018 +++ src/external/bsd/libpcap/dist/bpf_filter.c Wed Sep 5 13:10:07 2018 @@ -38,6 +38,8 @@ * @(#)bpf.c 7.5 (Berkeley) 7/15/91 */ +#error "We are using the kernel version of this file" + #ifdef HAVE_CONFIG_H #include #endif
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Wed Sep 5 12:49:55 UTC 2018 Modified Files: src/usr.sbin/sysinst: defs.h Log Message: For local builds, at least use the right prefix on nyftp To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/defs.h diff -u src/usr.sbin/sysinst/defs.h:1.12 src/usr.sbin/sysinst/defs.h:1.13 --- src/usr.sbin/sysinst/defs.h:1.12 Wed Sep 5 12:01:52 2018 +++ src/usr.sbin/sysinst/defs.h Wed Sep 5 12:49:55 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.12 2018/09/05 12:01:52 martin Exp $ */ +/* $NetBSD: defs.h,v 1.13 2018/09/05 12:49:55 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -345,8 +345,10 @@ int clean_xfer_dir; #define SYSINST_FTP_DIR "pub/NetBSD/NetBSD-" REL #elif defined(BUILDID) && defined(REL_PATH) #define SYSINST_FTP_DIR "pub/NetBSD-daily/" REL_PATH "/" BUILDID "Z" +#elif defined(REL_PATH) +#define SYSINST_FTP_DIR "pub/NetBSD-daily/" REL_PATH #else -#define SYSINST_FTP_DIR "pub/NetBSD-daily/NetBSD-" REL +#define SYSINST_FTP_DIR "pub/NetBSD/NetBSD-" REL #endif #endif
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Wed Sep 5 12:01:52 UTC 2018
Modified Files:
src/usr.sbin/sysinst: Makefile.inc defs.h
Log Message:
Try to guess the proper directory on ftp or nyftp where the binary
sets for the current build will end up.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/defs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.9 src/usr.sbin/sysinst/Makefile.inc:1.10
--- src/usr.sbin/sysinst/Makefile.inc:1.9 Wed Jun 8 02:00:40 2016
+++ src/usr.sbin/sysinst/Makefile.inc Wed Sep 5 12:01:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2016/06/08 02:00:40 christos Exp $
+# $NetBSD: Makefile.inc,v 1.10 2018/09/05 12:01:52 martin Exp $
#
# Makefile for sysinst
@@ -43,12 +43,31 @@ LDADD= -lcurses -ltermlib -lutil
UNIF_AWK= ${.CURDIR}/../../unif.awk
MSG_XLAT_SH= ${.CURDIR}/../../msg_xlat.sh
+
CATALOGDIR= /usr/share/sysinst/catalog
CPPFLAGS+= -I. -I${.CURDIR}/../.. -I${.CURDIR} \
-DREL=\"${DISTRIBVER}\" -DMACH=\"${MACHINE}\" \
-DMACH_${MACHINE} -DARCH_${MACHINE_ARCH} \
${NODISKLABEL:D-DNO_DISKLABEL}
+.if (defined(BUILDID))
+COPTS+= -DBUILDID=\"${BUILDID}\"
+.endif
+.if defined(NETBSD_OFFICIAL_RELEASE) && ${NETBSD_OFFICIAL_RELEASE} == "yes"
+CPPFLAGS+= -DSYSINST_FTP_HOST=\"ftp.NetBSD.org\" -DNETBSD_OFFICIAL_RELEASE
+CPPFLAGS+= -DSYSINST_HTTP_HOST=\"cdn.NetBSD.org\" -DNETBSD_OFFICIAL_RELEASE
+.else
+CPPFLAGS+= -DSYSINST_FTP_HOST=\"nyftp.NetBSD.org\"
+CPPFLAGS+= -DSYSINST_HTTP_HOST=\"nycdn.NetBSD.org\"
+.if (${DISTRIBVER:M*.99.*})
+CPPFLAGS+= -DREL_PATH=\"HEAD\"
+.elif (${DISTRIBVER:M*.[0-9].[0-9]*})
+CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*$//:S/./-/}\"
+.elif (${DISTRIBVER:M*.[0-9]*})
+CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*$//}\"
+.endif
+.endif
+
.if !defined(DEBUG)
CPPFLAGS+= -DCATALOG_DIR=\"${CATALOGDIR}\"
.endif
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.11 src/usr.sbin/sysinst/defs.h:1.12
--- src/usr.sbin/sysinst/defs.h:1.11 Sun Jun 3 13:16:30 2018
+++ src/usr.sbin/sysinst/defs.h Wed Sep 5 12:01:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.11 2018/06/03 13:16:30 martin Exp $ */
+/* $NetBSD: defs.h,v 1.12 2018/09/05 12:01:52 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -341,11 +341,17 @@ int clean_xfer_dir;
#endif
#if !defined(SYSINST_FTP_DIR)
+#if defined(NETBSD_OFFICIAL_RELEASE)
#define SYSINST_FTP_DIR "pub/NetBSD/NetBSD-" REL
+#elif defined(BUILDID) && defined(REL_PATH)
+#define SYSINST_FTP_DIR "pub/NetBSD-daily/" REL_PATH "/" BUILDID "Z"
+#else
+#define SYSINST_FTP_DIR "pub/NetBSD-daily/NetBSD-" REL
+#endif
#endif
#if !defined(SYSINST_PKG_HOST)
-#define SYSINST_PKG_HOST SYSINST_FTP_HOST
+#define SYSINST_PKG_HOST "pub/NetBSD/NetBSD-" REL
#endif
#if !defined(SYSINST_PKG_DIR)
CVS commit: src/sys/arch/arm/fdt
Module Name:src
Committed By: jmcneill
Date: Wed Sep 5 10:38:30 UTC 2018
Modified Files:
src/sys/arch/arm/fdt: cpu_fdt.c
Log Message:
Match non-standard compat string "arm,armv8" (should be "arm,arm-v8")
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/fdt/cpu_fdt.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/arm/fdt/cpu_fdt.c
diff -u src/sys/arch/arm/fdt/cpu_fdt.c:1.9 src/sys/arch/arm/fdt/cpu_fdt.c:1.10
--- src/sys/arch/arm/fdt/cpu_fdt.c:1.9 Sun Aug 26 18:15:49 2018
+++ src/sys/arch/arm/fdt/cpu_fdt.c Wed Sep 5 10:38:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_fdt.c,v 1.9 2018/08/26 18:15:49 ryo Exp $ */
+/* $NetBSD: cpu_fdt.c,v 1.10 2018/09/05 10:38:29 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.9 2018/08/26 18:15:49 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.10 2018/09/05 10:38:29 jmcneill Exp $");
#include
#include
@@ -68,6 +68,7 @@ static const struct of_compat_data compa
{ "arm,cortex-a15", ARM_CPU_ARMV7 },
{ "arm,cortex-a17", ARM_CPU_ARMV7 },
+ { "arm,armv8", ARM_CPU_ARMV8 }, /* nonstandard */
{ "arm,arm-v8", ARM_CPU_ARMV8 },
{ "arm,cortex-a53", ARM_CPU_ARMV8 },
{ "arm,cortex-a57", ARM_CPU_ARMV8 },
CVS commit: src/sys/arch/arm/fdt
Module Name:src Committed By: jmcneill Date: Wed Sep 5 10:20:47 UTC 2018 Modified Files: src/sys/arch/arm/fdt: fdt_intr.h Log Message: Bump PIX_MAXSOURCES to 480 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/fdt/fdt_intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/fdt/fdt_intr.h diff -u src/sys/arch/arm/fdt/fdt_intr.h:1.3 src/sys/arch/arm/fdt/fdt_intr.h:1.4 --- src/sys/arch/arm/fdt/fdt_intr.h:1.3 Fri Jun 15 14:25:22 2018 +++ src/sys/arch/arm/fdt/fdt_intr.h Wed Sep 5 10:20:47 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: fdt_intr.h,v 1.3 2018/06/15 14:25:22 jakllsch Exp $ */ +/* $NetBSD: fdt_intr.h,v 1.4 2018/09/05 10:20:47 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -36,7 +36,7 @@ #define __HAVE_PIC_SET_PRIORITY #define __HAVE_PIC_PENDING_INTRS -#define PIC_MAXSOURCES 352 +#define PIC_MAXSOURCES 480 #define PIC_MAXMAXSOURCES (PIC_MAXSOURCES + 32) void arm_fdt_irq_set_handler(void (*)(void *));
CVS commit: [pgoyette-compat] src/sys/rump/net/lib/libpppoe
Module Name:src Committed By: pgoyette Date: Wed Sep 5 09:53:57 UTC 2018 Modified Files: src/sys/rump/net/lib/libpppoe [pgoyette-compat]: Makefile Log Message: if_spppsubr.c is now required, since it was split out from if_pppoe.c To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.20.1 src/sys/rump/net/lib/libpppoe/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/net/lib/libpppoe/Makefile diff -u src/sys/rump/net/lib/libpppoe/Makefile:1.1 src/sys/rump/net/lib/libpppoe/Makefile:1.1.20.1 --- src/sys/rump/net/lib/libpppoe/Makefile:1.1 Fri Apr 15 01:35:26 2016 +++ src/sys/rump/net/lib/libpppoe/Makefile Wed Sep 5 09:53:57 2018 @@ -5,7 +5,7 @@ LIB= rumpnet_pppoe COMPONENT= PPP over Ethernet protocol network interface IOCONF= PPPOE.ioconf -SRCS= if_pppoe.c +SRCS= if_pppoe.c if_spppsubr.c SRCS+= pppoe_component.c
CVS commit: [pgoyette-compat] src/sys/kern
Module Name:src
Committed By: pgoyette
Date: Wed Sep 5 09:42:58 UTC 2018
Modified Files:
src/sys/kern [pgoyette-compat]: kern_module.c
Log Message:
ooppss - don't forget the structure pointer!
To generate a diff of this commit:
cvs rdiff -u -r1.130.2.17 -r1.130.2.18 src/sys/kern/kern_module.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/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.130.2.17 src/sys/kern/kern_module.c:1.130.2.18
--- src/sys/kern/kern_module.c:1.130.2.17 Wed Sep 5 09:26:59 2018
+++ src/sys/kern/kern_module.c Wed Sep 5 09:42:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.130.2.17 2018/09/05 09:26:59 pgoyette Exp $ */
+/* $NetBSD: kern_module.c,v 1.130.2.18 2018/09/05 09:42:57 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.17 2018/09/05 09:26:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.18 2018/09/05 09:42:57 pgoyette Exp $");
#define _MODULE_INTERNAL
@@ -1406,7 +1406,7 @@ module_do_unload(const char *name, bool
kmem_free(mod->mod_required, mod->mod_arequired *
sizeof(module_t));
if (mod->mod_source == MODULE_SOURCE_KERNEL) {
- if (mod_arequired != 0) {
+ if (mod->mod_arequired != 0) {
/*
* release "required" resources - will be re-parsed
* if the module is re-enabled
CVS commit: [pgoyette-compat] src/sys/kern
Module Name:src
Committed By: pgoyette
Date: Wed Sep 5 09:26:59 UTC 2018
Modified Files:
src/sys/kern [pgoyette-compat]: kern_module.c
Log Message:
If a built-in module is "unloaded", release all the resources associated
with the "required" list. The list will be re-parsed if the module is
later re-enabled.
To generate a diff of this commit:
cvs rdiff -u -r1.130.2.16 -r1.130.2.17 src/sys/kern/kern_module.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/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.130.2.16 src/sys/kern/kern_module.c:1.130.2.17
--- src/sys/kern/kern_module.c:1.130.2.16 Tue Sep 4 11:53:46 2018
+++ src/sys/kern/kern_module.c Wed Sep 5 09:26:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.130.2.16 2018/09/04 11:53:46 pgoyette Exp $ */
+/* $NetBSD: kern_module.c,v 1.130.2.17 2018/09/05 09:26:59 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.16 2018/09/04 11:53:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.17 2018/09/05 09:26:59 pgoyette Exp $");
#define _MODULE_INTERNAL
@@ -1406,8 +1406,16 @@ module_do_unload(const char *name, bool
kmem_free(mod->mod_required, mod->mod_arequired *
sizeof(module_t));
if (mod->mod_source == MODULE_SOURCE_KERNEL) {
- mod->mod_nrequired = 0; /* will be re-parsed */
- mod->mod_arequired = 0;
+ if (mod_arequired != 0) {
+ /*
+ * release "required" resources - will be re-parsed
+ * if the module is re-enabled
+ */
+ kmem_free(mod->mod_required,
+ mod->mod_arequired * sizeof(module_t *));
+ mod->mod_nrequired = 0;
+ mod->mod_arequired = 0;
+ }
if (load_requires_force)
module_require_force(mod);
TAILQ_INSERT_TAIL(_builtins, mod, mod_chain);
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Sep 5 09:23:21 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ammend ticket #1008 To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.19 src/doc/CHANGES-8.1:1.1.2.20 --- src/doc/CHANGES-8.1:1.1.2.19 Wed Sep 5 09:00:37 2018 +++ src/doc/CHANGES-8.1 Wed Sep 5 09:23:21 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.19 2018/09/05 09:00:37 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.20 2018/09/05 09:23:21 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -759,11 +759,16 @@ lib/libc/net/if_nametoindex.c 1.6 external/gpl3/gcc/dist/config/tls.m4 1.2 external/gpl3/gcc/dist/libgcc/configure 1.5 tools/gcc/gcc-version.mk 1.11 (patch) -tools/gcc/mknative-gcc1.93 +tools/gcc/mknative-gcc1.93,1.94 - Correct extra parens, regen configure (selectively), + Correct extra parens, regen configure (selectively). + Also pullout INTERNAL_CFLAGS for the libgcc build, where it may have + -DHAVE_CC_TLS defined on the command line. (we already collect all + the other components.) Fixes root cause of PR toolchain/53567. Normalize source tree path so mknative runs are reproducable. Remove GCC 5 marker. This is now nb3 20180905. [mrg, ticket #1008] + +
CVS commit: [netbsd-8] src/tools/gcc
Module Name:src
Committed By: martin
Date: Wed Sep 5 09:21:37 UTC 2018
Modified Files:
src/tools/gcc [netbsd-8]: mknative-gcc
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1008):
tools/gcc/mknative-gcc: revision 1.94
also pullout INTERNAL_CFLAGS for the libgcc build, where it may have
-DHAVE_CC_TLS defined on the command line. (we already collect all
the other components.)
To generate a diff of this commit:
cvs rdiff -u -r1.89.6.2 -r1.89.6.3 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.89.6.2 src/tools/gcc/mknative-gcc:1.89.6.3
--- src/tools/gcc/mknative-gcc:1.89.6.2 Wed Sep 5 08:59:04 2018
+++ src/tools/gcc/mknative-gcc Wed Sep 5 09:21:37 2018
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.89.6.2 2018/09/05 08:59:04 martin Exp $
+# $NetBSD: mknative-gcc,v 1.89.6.3 2018/09/05 09:21:37 martin Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -71,7 +71,9 @@ get_libgcc () {
cd $_TMPDIR/$_PLATFORM/libgcc
{
getvars $_PLATFORM/libgcc/Makefile \
- INCLUDES LIB2ADD LIB2ADDEH LIB2ADD_ST \
+ INCLUDES \
+ INTERNAL_CFLAGS \
+ LIB2ADD LIB2ADDEH LIB2ADD_ST \
LIB1ASMFUNCS LIB1ASMSRC \
LIB2_DIVMOD_FUNCS LIB2FUNCS_ST \
LIB2FUNCS_EXTRA \
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Sep 5 09:00:37 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Tickets #1004 - #1008 To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.18 src/doc/CHANGES-8.1:1.1.2.19 --- src/doc/CHANGES-8.1:1.1.2.18 Sat Sep 1 06:35:20 2018 +++ src/doc/CHANGES-8.1 Wed Sep 5 09:00:37 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.18 2018/09/01 06:35:20 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.19 2018/09/05 09:00:37 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -727,3 +727,43 @@ sys/external/bsd/drm2/linux/linux_ww_mut specific code. [riastradh, ticket #1003] +share/man/man4/acphy.41.4 +share/man/man4/acpicpu.4 1.35 +share/man/man4/adb.41.4 +share/man/man4/atppc.41.16 +share/man/man4/axe.41.14 +share/man/man4/az.41.7 +share/man/man4/bktr.41.19 +share/man/man4/cgd.41.22 + + axe(4): Add the correct PHY to SYNOPSIS. + Various markup fixes. + [sevan, ticket #1004] + +etc/MAKEDEV.tmpl1.192 + + Create fw(4) & fwmem(4) device nodes by default, + so fwctl(8) works out of the box. + [sevan, ticket #1005] + +sys/dev/pci/ixgbe/ixgbe.c 1.164 + + Fix a bug that media change may fail. + [msaitoh, ticket #1006] + +lib/libc/net/if_nametoindex.c 1.6 + + Make if_freenameindex(3) use SIOCGIFINDEX to improve performance. + [msaitoh, ticket #1007] + +external/gpl3/gcc/dist/config/tls.m4 1.2 +external/gpl3/gcc/dist/libgcc/configure 1.5 +tools/gcc/gcc-version.mk 1.11 (patch) +tools/gcc/mknative-gcc1.93 + + Correct extra parens, regen configure (selectively), + Fixes root cause of PR toolchain/53567. + Normalize source tree path so mknative runs are reproducable. + Remove GCC 5 marker. This is now nb3 20180905. + [mrg, ticket #1008] +
CVS commit: [netbsd-8] src
Module Name:src
Committed By: martin
Date: Wed Sep 5 08:59:05 UTC 2018
Modified Files:
src/external/gpl3/gcc/dist/config [netbsd-8]: tls.m4
src/external/gpl3/gcc/dist/libgcc [netbsd-8]: configure
src/tools/gcc [netbsd-8]: gcc-version.mk mknative-gcc
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1008):
tools/gcc/gcc-version.mk: revision 1.11
tools/gcc/mknative-gcc: revision 1.93
external/gpl3/gcc/dist/config/tls.m4: revision 1.2
external/gpl3/gcc/dist/libgcc/configure: revision 1.5
Correct extra parens, regen configure (selectively)
Fixes root cause of PR toolchain/53567
in configargs.h, as well as normalising to /usr/src, normalise the
--build to the same as the --host, so that it never changes based
upon the host you ran mknative on. (some recent changes are only
because i updated a system from netbsd-7 to netbsd-8. this will
avoid that in the future.)
remove GCC 5 marker. this is now nb3 20180905.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.34.1 \
src/external/gpl3/gcc/dist/config/tls.m4
cvs rdiff -u -r1.3 -r1.3.8.1 src/external/gpl3/gcc/dist/libgcc/configure
cvs rdiff -u -r1.7.4.1 -r1.7.4.2 src/tools/gcc/gcc-version.mk
cvs rdiff -u -r1.89.6.1 -r1.89.6.2 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/config/tls.m4
diff -u src/external/gpl3/gcc/dist/config/tls.m4:1.1.1.1 src/external/gpl3/gcc/dist/config/tls.m4:1.1.1.1.34.1
--- src/external/gpl3/gcc/dist/config/tls.m4:1.1.1.1 Tue Jun 21 01:23:58 2011
+++ src/external/gpl3/gcc/dist/config/tls.m4 Wed Sep 5 08:59:05 2018
@@ -104,7 +104,7 @@ AC_DEFUN([GCC_CHECK_CC_TLS], [
gcc_cv_have_cc_tls, [
AC_COMPILE_IFELSE([__thread int a; int b; int main() { return a = b; }],
[gcc_cv_have_cc_tls=yes], [gcc_cv_have_cc_tls=no])]
-)])
+)
if test "$enable_tls $gcc_cv_have_cc_tls" = "yes yes"; then
AC_DEFINE(HAVE_CC_TLS, 1,
[Define to 1 if the target assembler supports thread-local storage.])
Index: src/external/gpl3/gcc/dist/libgcc/configure
diff -u src/external/gpl3/gcc/dist/libgcc/configure:1.3 src/external/gpl3/gcc/dist/libgcc/configure:1.3.8.1
--- src/external/gpl3/gcc/dist/libgcc/configure:1.3 Sun Jan 24 09:43:35 2016
+++ src/external/gpl3/gcc/dist/libgcc/configure Wed Sep 5 08:59:05 2018
@@ -4940,6 +4940,11 @@ rm -f core conftest.err conftest.$ac_obj
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_have_cc_tls" >&5
$as_echo "$gcc_cv_have_cc_tls" >&6; }
+ if test "$enable_tls $gcc_cv_have_cc_tls" = "yes yes"; then
+
+$as_echo "#define HAVE_CC_TLS 1" >>confdefs.h
+
+ fi
set_have_cc_tls=
if test "$enable_tls $gcc_cv_have_cc_tls" = "yes yes"; then
set_have_cc_tls="-DHAVE_CC_TLS"
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.7.4.1 src/tools/gcc/gcc-version.mk:1.7.4.2
--- src/tools/gcc/gcc-version.mk:1.7.4.1 Sun Apr 1 09:00:42 2018
+++ src/tools/gcc/gcc-version.mk Wed Sep 5 08:59:04 2018
@@ -1,5 +1,5 @@
-# $NetBSD: gcc-version.mk,v 1.7.4.1 2018/04/01 09:00:42 martin Exp $
+# $NetBSD: gcc-version.mk,v 1.7.4.2 2018/09/05 08:59:04 martin Exp $
# common location for tools and native build
-NETBSD_GCC_VERSION=nb2 20180327
+NETBSD_GCC_VERSION=nb3 20180905
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.89.6.1 src/tools/gcc/mknative-gcc:1.89.6.2
--- src/tools/gcc/mknative-gcc:1.89.6.1 Mon Oct 9 17:59:16 2017
+++ src/tools/gcc/mknative-gcc Wed Sep 5 08:59:04 2018
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.89.6.1 2017/10/09 17:59:16 snj Exp $
+# $NetBSD: mknative-gcc,v 1.89.6.2 2018/09/05 08:59:04 martin Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -366,10 +366,9 @@ __EOF__
if [ "${f}" = "configargs" ]
then
_srcquoted=$(echo "$_SRC" | sed 's/\//\\\//g')
- ex <<__EOF__ $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h
-/static const char configuration_arguments/ s/$_srcquoted/\/usr\/src/g
-wq
-__EOF__
+ sed -i -E -e "s,$_srcquoted,/usr/src,g" \
+ -e 's/--build=[^ ]+ --host=([^ ]+)/--build=\1 --host=\1/' \
+$_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h
fi
done
CVS commit: [pgoyette-compat] src/tests/modules
Module Name:src
Committed By: pgoyette
Date: Wed Sep 5 08:58:03 UTC 2018
Modified Files:
src/tests/modules [pgoyette-compat]: t_modctl.c
Log Message:
Update the check for module existence via modctl(3) to use the new
format of returned data.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.30.1 src/tests/modules/t_modctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/modules/t_modctl.c
diff -u src/tests/modules/t_modctl.c:1.12 src/tests/modules/t_modctl.c:1.12.30.1
--- src/tests/modules/t_modctl.c:1.12 Mon Aug 20 08:07:52 2012
+++ src/tests/modules/t_modctl.c Wed Sep 5 08:58:03 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: t_modctl.c,v 1.12 2012/08/20 08:07:52 martin Exp $ */
+/* $NetBSD: t_modctl.c,v 1.12.30.1 2018/09/05 08:58:03 pgoyette Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: t_modctl.c,v 1.12 2012/08/20 08:07:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: t_modctl.c,v 1.12.30.1 2018/09/05 08:58:03 pgoyette Exp $");
#include
#include
@@ -84,11 +84,12 @@ get_modstat_info(const char *name, modst
{
bool found;
size_t len;
+ int count;
struct iovec iov;
modstat_t *ms;
check_permission();
- for (len = 4096; ;) {
+ for (len = 8192; ;) {
iov.iov_base = malloc(len);
iov.iov_len = len;
@@ -107,14 +108,17 @@ get_modstat_info(const char *name, modst
}
found = false;
- len = iov.iov_len / sizeof(modstat_t);
- for (ms = (modstat_t *)iov.iov_base; len != 0 && !found;
- ms++, len--) {
+ count = *(int *)iov.iov_base;
+ ms = (modstat_t *)((char *)iov.iov_base + sizeof(int));
+ while ( count ) {
if (strcmp(ms->ms_name, name) == 0) {
if (msdest != NULL)
*msdest = *ms;
found = true;
+ break;
}
+ ms++;
+ count--;
}
free(iov.iov_base);
CVS commit: [netbsd-8] src/lib/libc/net
Module Name:src
Committed By: martin
Date: Wed Sep 5 08:45:52 UTC 2018
Modified Files:
src/lib/libc/net [netbsd-8]: if_nametoindex.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1007):
lib/libc/net/if_nametoindex.c: revision 1.6
- SIOCGIFINDEX was added in 2013, but if_freenameindex(3) have not used it
for years. Use it to improve performance. Same as FreeBSD.
- KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.8.1 src/lib/libc/net/if_nametoindex.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/if_nametoindex.c
diff -u src/lib/libc/net/if_nametoindex.c:1.5 src/lib/libc/net/if_nametoindex.c:1.5.8.1
--- src/lib/libc/net/if_nametoindex.c:1.5 Tue Sep 1 09:54:34 2015
+++ src/lib/libc/net/if_nametoindex.c Wed Sep 5 08:45:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_nametoindex.c,v 1.5 2015/09/01 09:54:34 ozaki-r Exp $ */
+/* $NetBSD: if_nametoindex.c,v 1.5.8.1 2018/09/05 08:45:52 martin Exp $ */
/* $KAME: if_nametoindex.c,v 1.6 2000/11/24 08:18:54 itojun Exp $ */
/*-
@@ -28,19 +28,21 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: if_nametoindex.c,v 1.5 2015/09/01 09:54:34 ozaki-r Exp $");
+__RCSID("$NetBSD: if_nametoindex.c,v 1.5.8.1 2018/09/05 08:45:52 martin Exp $");
#endif /* LIBC_SCCS and not lint */
#ifndef RUMP_ACTION
#include "namespace.h"
#endif
#include
+#include
#include
#include
#include
#include
#include
#include
+#include
#include
#ifndef RUMP_ACTION
@@ -71,11 +73,24 @@ __weak_alias(if_nametoindex,_if_nametoin
unsigned int
if_nametoindex(const char *ifname)
{
+ int s;
+ struct ifreq ifr;
struct ifaddrs *ifaddrs, *ifa;
unsigned int ni;
+ s = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
+ if (s != -1) {
+ memset(, 0, sizeof(ifr));
+ strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+ if (ioctl(s, SIOCGIFINDEX, ) != -1) {
+ close(s);
+ return (ifr.ifr_index);
+ }
+ close(s);
+ }
+
if (getifaddrs() < 0)
- return(0);
+ return 0;
ni = 0;
@@ -92,5 +107,5 @@ if_nametoindex(const char *ifname)
freeifaddrs(ifaddrs);
if (!ni)
errno = ENXIO;
- return(ni);
+ return ni;
}
CVS commit: [netbsd-8] src/sys/dev/pci/ixgbe
Module Name:src
Committed By: martin
Date: Wed Sep 5 08:42:22 UTC 2018
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-8]: ixgbe.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1006):
sys/dev/pci/ixgbe/ixgbe.c: revision 1.164
Fix a bug that media change may fail. I noticed that ifconfig ixgN media XXX
took a 10 or more seconds on a Denverton machie. I occurred by trying take a
lock and timed out. The reason was that ixgbe_media_change() didn't take
CORE_LOCK. Do it.
This problem was from FreeBSD's pre-iflib ixgbe (I don't know whether this
problem really occurs on FreeBSD or not). Post-iflib ixgbe has no problem
because iflib_media_change() takes a lock.
XXX pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.88.2.22 -r1.88.2.23 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.22 src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.23
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.22 Tue Aug 7 13:33:23 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Sep 5 08:42:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.88.2.22 2018/08/07 13:33:23 martin Exp $ */
+/* $NetBSD: ixgbe.c,v 1.88.2.23 2018/09/05 08:42:22 martin Exp $ */
/**
@@ -2841,6 +2841,7 @@ ixgbe_media_change(struct ifnet *ifp)
if (hw->phy.media_type == ixgbe_media_type_backplane)
return (EPERM);
+ IXGBE_CORE_LOCK(adapter);
/*
* We don't actually need to check against the supported
* media types of the adapter; ifmedia will take care of
@@ -2853,6 +2854,7 @@ ixgbe_media_change(struct ifnet *ifp)
if (err != IXGBE_SUCCESS) {
device_printf(adapter->dev, "Unable to determine "
"supported advertise speeds\n");
+ IXGBE_CORE_UNLOCK(adapter);
return (ENODEV);
}
speed |= link_caps;
@@ -2913,10 +2915,12 @@ ixgbe_media_change(struct ifnet *ifp)
adapter->advertise |= 1 << 5;
}
+ IXGBE_CORE_UNLOCK(adapter);
return (0);
invalid:
device_printf(adapter->dev, "Invalid media type!\n");
+ IXGBE_CORE_UNLOCK(adapter);
return (EINVAL);
} /* ixgbe_media_change */
CVS commit: [netbsd-8] src/etc
Module Name:src Committed By: martin Date: Wed Sep 5 08:40:06 UTC 2018 Modified Files: src/etc [netbsd-8]: MAKEDEV.tmpl Log Message: Pull up following revision(s) (requested by sevan in ticket #1005): etc/MAKEDEV.tmpl: revision 1.192 Create fw(4) & fwmem(4) device nodes by default so fwctl(8) works out of the box. To generate a diff of this commit: cvs rdiff -u -r1.183.6.2 -r1.183.6.3 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.183.6.2 src/etc/MAKEDEV.tmpl:1.183.6.3 --- src/etc/MAKEDEV.tmpl:1.183.6.2 Fri Dec 8 05:48:21 2017 +++ src/etc/MAKEDEV.tmpl Wed Sep 5 08:40:05 2018 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.183.6.2 2017/12/08 05:48:21 msaitoh Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.183.6.3 2018/09/05 08:40:05 martin Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -846,6 +846,7 @@ all) makedev hdmicec0 makedev dtrace makedev veriexec + makedev fw0 fw1 fw2 fw3 makedev local # do this last ;;
CVS commit: [netbsd-8] src/share/man/man4
Module Name:src Committed By: martin Date: Wed Sep 5 08:35:55 UTC 2018 Modified Files: src/share/man/man4 [netbsd-8]: acphy.4 acpicpu.4 adb.4 atppc.4 axe.4 az.4 bktr.4 cgd.4 Log Message: Pull up following revision(s) (requested by sevan in ticket #1004): share/man/man4/az.4: revision 1.7 share/man/man4/axe.4: revision 1.14 share/man/man4/cgd.4: revision 1.22 share/man/man4/acphy.4: revision 1.4 share/man/man4/adb.4: revision 1.4 share/man/man4/bktr.4: revision 1.19 share/man/man4/atppc.4: revision 1.16 share/man/man4/acpicpu.4: revision 1.35 Add the correct PHY to SYNOPSIS axe0 at uhub3 port 1 axe0: Apple Computer (0x5ac) Apple USB to Ethernet (0x1402), rev 2.00/0.01, addr 3 axe0: Ethernet address b8:8d:12:XX:XX:XX ukphy0 at axe0 phy 16: OUI 0x007063, model 0x0006, rev. 1 ukphy0: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto - Apply Tn macro to XTS - New sentence, new line. - Pp before Bl - Use the An macro in the AUTHORS section. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.92.1 src/share/man/man4/acphy.4 cvs rdiff -u -r1.34 -r1.34.34.1 src/share/man/man4/acpicpu.4 cvs rdiff -u -r1.3 -r1.3.18.1 src/share/man/man4/adb.4 cvs rdiff -u -r1.15 -r1.15.92.1 src/share/man/man4/atppc.4 cvs rdiff -u -r1.13 -r1.13.4.1 src/share/man/man4/axe.4 cvs rdiff -u -r1.6 -r1.6.92.1 src/share/man/man4/az.4 cvs rdiff -u -r1.18 -r1.18.34.1 src/share/man/man4/bktr.4 cvs rdiff -u -r1.21 -r1.21.6.1 src/share/man/man4/cgd.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/acphy.4 diff -u src/share/man/man4/acphy.4:1.3 src/share/man/man4/acphy.4:1.3.92.1 --- src/share/man/man4/acphy.4:1.3 Fri Jan 17 06:23:53 2003 +++ src/share/man/man4/acphy.4 Wed Sep 5 08:35:55 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: acphy.4,v 1.3 2003/01/17 06:23:53 gendalia Exp $ +.\" $NetBSD: acphy.4,v 1.3.92.1 2018/09/05 08:35:55 martin Exp $ .\" .\" Copyright 2001 Wasabi Systems, Inc. .\" All rights reserved. @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 24, 2001 +.Dd August 31, 2018 .Dt ACPHY 4 .Os .Sh NAME @@ -45,9 +45,9 @@ The .Nm driver supports the Altima AC101, AC101L and AMD Am79c874 NetPHY-1LP -10/100 Ethernet PHYs. These PHYs are often found on low-power -Ethernet interfaces, such as MiniPCI interfaces found in -laptops and embedded systems. +10/100 Ethernet PHYs. +These PHYs are often found on low-power Ethernet interfaces, such as MiniPCI +interfaces found in laptops and embedded systems. .Pp The AMD 79c874 is a work-alike (most likely an OEM of the core) of the Altima part. Index: src/share/man/man4/acpicpu.4 diff -u src/share/man/man4/acpicpu.4:1.34 src/share/man/man4/acpicpu.4:1.34.34.1 --- src/share/man/man4/acpicpu.4:1.34 Tue Aug 9 07:18:54 2011 +++ src/share/man/man4/acpicpu.4 Wed Sep 5 08:35:55 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: acpicpu.4,v 1.34 2011/08/09 07:18:54 jruoho Exp $ +.\" $NetBSD: acpicpu.4,v 1.34.34.1 2018/09/05 08:35:55 martin Exp $ .\" .\" Copyright (c) 2010 Jukka Ruohonen .\" All rights reserved. @@ -24,7 +24,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 6, 2011 +.Dd August 31, 2018 .Dt ACPICPU 4 .Os .Sh NAME @@ -69,7 +69,6 @@ The following C-states are typically ava Additional processor or vendor specific states (C4, ..., Cn) are handled internally by .Nm . -.Pp .Bl -tag -width C1 -offset indent .It Dv C0 This is the normal state of a processor; the Index: src/share/man/man4/adb.4 diff -u src/share/man/man4/adb.4:1.3 src/share/man/man4/adb.4:1.3.18.1 --- src/share/man/man4/adb.4:1.3 Tue Aug 6 17:32:30 2013 +++ src/share/man/man4/adb.4 Wed Sep 5 08:35:55 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: adb.4,v 1.3 2013/08/06 17:32:30 snj Exp $ +.\" $NetBSD: adb.4,v 1.3.18.1 2018/09/05 08:35:55 martin Exp $ .\" .\" Copyright (c) 2003 Alex Zepeda .\" Copyright (c) 1997 Colin Wood @@ -30,7 +30,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 21, 2003 +.Dd August 31, 2018 .Dt ADB 4 .Os .Sh NAME @@ -210,14 +210,17 @@ interface first appeared in .Nx 0.9 . It has been under development ever since. .Sh AUTHORS -Bradley A. Grantham wrote the original +.An -nosplit +.An "Bradley A. Grantham" +wrote the original .Nm driver, including the .Tn MRG support. The hardware direct interface was written by -John P. Wittkowski. -The PowerManager interface was written by Takashi Hamada. +.An "John P. Wittkowski" . +The PowerManager interface was written by +.An "Takashi Hamada" . .Sh BUGS .Bl -bullet .It Index: src/share/man/man4/atppc.4 diff -u
CVS commit: src/sys/arch/hppa/stand/common
Module Name:src
Committed By: riastradh
Date: Wed Sep 5 07:32:45 UTC 2018
Modified Files:
src/sys/arch/hppa/stand/common: pdc.c
Log Message:
One more min->uimin straggler confirmed by 201809042300Z autobuild.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/stand/common/pdc.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/hppa/stand/common/pdc.c
diff -u src/sys/arch/hppa/stand/common/pdc.c:1.1 src/sys/arch/hppa/stand/common/pdc.c:1.2
--- src/sys/arch/hppa/stand/common/pdc.c:1.1 Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/stand/common/pdc.c Wed Sep 5 07:32:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pdc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: pdc.c,v 1.2 2018/09/05 07:32:45 riastradh Exp $ */
/* $OpenBSD: pdc.c,v 1.10 1999/05/06 02:27:44 mickey Exp $ */
@@ -101,7 +101,7 @@ pdc_init(void)
err = (*pdc)(PDC_STABLE, PDC_STABLE_SIZE, pdcbuf, 0, 0);
if (err >= 0) {
- sstorsiz = min(pdcbuf[0],sizeof(sstor));
+ sstorsiz = uimin(pdcbuf[0],sizeof(sstor));
err = (*pdc)(PDC_STABLE, PDC_STABLE_READ, 0, , sstorsiz);
}
@@ -203,7 +203,7 @@ iodcstrategy(void *devdata, int rw, dadd
if (dp->last_blk <= blk && (dp->last_blk + dp->last_read) > blk) {
twiddle();
offset = blk - dp->last_blk;
- xfer = min(dp->last_read - offset, size);
+ xfer = uimin(dp->last_read - offset, size);
size -= xfer;
blk += xfer;
#ifdef PDCDEBUG
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Wed Sep 5 06:54:30 UTC 2018
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
flip all ports to gcc.old GCC 6.4.
To generate a diff of this commit:
cvs rdiff -u -r1.1074 -r1.1075 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.own.mk
diff -u src/share/mk/bsd.own.mk:1.1074 src/share/mk/bsd.own.mk:1.1075
--- src/share/mk/bsd.own.mk:1.1074 Sun Aug 12 18:36:27 2018
+++ src/share/mk/bsd.own.mk Wed Sep 5 06:54:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1074 2018/08/12 18:36:27 maya Exp $
+# $NetBSD: bsd.own.mk,v 1.1075 2018/09/05 06:54:29 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -71,8 +71,6 @@ MKGCCCMDS?= no
# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC.
#
.if ${HAVE_GCC} == 6
-EXTERNAL_GCC_SUBDIR?= gcc
-.elif ${HAVE_GCC} == 5
EXTERNAL_GCC_SUBDIR?= gcc.old
.else
EXTERNAL_GCC_SUBDIR=? /does/not/exist
