CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Fri Oct 9 05:41:16 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch powerpc, sh3, vax and m68k to GCC 9. that's everyone.
thanks espcially to rin@ for testing and fixing issues.
To generate a diff of this commit:
cvs rdiff -u -r1.1223 -r1.1224 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.1223 src/share/mk/bsd.own.mk:1.1224
--- src/share/mk/bsd.own.mk:1.1223 Fri Oct 9 04:19:43 2020
+++ src/share/mk/bsd.own.mk Fri Oct 9 05:41:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1223 2020/10/09 04:19:43 macallan Exp $
+# $NetBSD: bsd.own.mk,v 1.1224 2020/10/09 05:41:16 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -63,10 +63,6 @@ TOOLCHAIN_MISSING?= no
#
# What GCC is used?
#
-.if ${MACHINE_CPU} == "powerpc" || ${MACHINE_CPU} == "sh3" || \
-${MACHINE_CPU} == "m68k" || ${MACHINE} == "vax"
-HAVE_GCC?= 8
-.endif
HAVE_GCC?= 9
#
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Fri Oct 9 05:41:16 UTC 2020 Modified Files: src/share/mk: bsd.own.mk Log Message: switch powerpc, sh3, vax and m68k to GCC 9. that's everyone. thanks espcially to rin@ for testing and fixing issues. To generate a diff of this commit: cvs rdiff -u -r1.1223 -r1.1224 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.
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: macallan Date: Fri Oct 9 04:32:58 UTC 2020 Added Files: src/distrib/sets/lists/xserver: md.hppa Log Message: set list for hppa To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/xserver/md.hppa Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: macallan Date: Fri Oct 9 04:32:58 UTC 2020 Added Files: src/distrib/sets/lists/xserver: md.hppa Log Message: set list for hppa To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/xserver/md.hppa Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/distrib/sets/lists/xserver/md.hppa diff -u /dev/null src/distrib/sets/lists/xserver/md.hppa:1.1 --- /dev/null Fri Oct 9 04:32:58 2020 +++ src/distrib/sets/lists/xserver/md.hppa Fri Oct 9 04:32:58 2020 @@ -0,0 +1,118 @@ +# $NetBSD: md.hppa,v 1.1 2020/10/09 04:32:58 macallan Exp $ +./usr/X11R7/bin/X xserver-xorg-server-bin xorg +./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg +./usr/X11R7/bin/cvt xserver-xorg-server-bin xorg +./usr/X11R7/bin/gtf xserver-xorg-server-bin xorg +./usr/X11R7/lib/X11/doc/README.modes xserver-xorg-server-lib xorg +./usr/X11R7/lib/modules/drivers/kbd_drv.so xserver-xf86-input-keyboard-drivers xorg +./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 xserver-xf86-input-keyboard-drivers xorg +./usr/X11R7/lib/modules/drivers/mouse_drv.so xserver-xf86-input-mouse-drivers xorg +./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 xserver-xf86-input-mouse-drivers xorg +./usr/X11R7/lib/modules/drivers/ws_drv.so xserver-xf86-input-ws-drivers xorg +./usr/X11R7/lib/modules/drivers/ws_drv.so.1 xserver-xf86-input-ws-drivers xorg +./usr/X11R7/lib/modules/drivers/mga_drv.so xserver-xf86-video-mga-drivers xorg +./usr/X11R7/lib/modules/drivers/mga_drv.so.2 xserver-xf86-video-mga-drivers xorg +./usr/X11R7/lib/modules/drivers/r128_drv.so xserver-xf86-video-r128-drivers xorg +./usr/X11R7/lib/modules/drivers/r128_drv.so.6 xserver-xf86-video-r128-drivers xorg +./usr/X11R7/lib/modules/drivers/wsfb_drv.so xserver-xf86-video-wsfb-drivers xorg +./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 xserver-xf86-video-wsfb-drivers xorg +./usr/X11R7/lib/modules/extensions/libdbe.a xserver-obsolete xorg,obsolete +./usr/X11R7/lib/modules/extensions/libdbe.so -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/extensions/libdbe.so xserver-obsolete xorg,xorg_server_ver=120,obsolete +./usr/X11R7/lib/modules/extensions/libdbe.so.0 -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/extensions/libdbe.so.0 xserver-obsolete xorg,xorg_server_ver=120,obsolete +./usr/X11R7/lib/modules/extensions/libdbe_pic.a xserver-obsolete xorg,picinstall,obsolete +./usr/X11R7/lib/modules/extensions/libdri.a xserver-dri-modules xorg +./usr/X11R7/lib/modules/extensions/libdri.so xserver-dri-modules xorg +./usr/X11R7/lib/modules/extensions/libdri.so.0 xserver-dri-modules xorg +./usr/X11R7/lib/modules/extensions/libdri2.a xserver-dri2-modules xorg +./usr/X11R7/lib/modules/extensions/libdri2.so xserver-dri2-modules xorg +./usr/X11R7/lib/modules/extensions/libdri2.so.0 xserver-dri2-modules xorg +./usr/X11R7/lib/modules/extensions/libdri2_pic.a xserver-obsolete xorg,picinstall,obsolete +./usr/X11R7/lib/modules/extensions/libdri_pic.a xserver-obsolete xorg,picinstall,obsolete +./usr/X11R7/lib/modules/extensions/libextmod.a xserver-obsolete xorg,obsolete +./usr/X11R7/lib/modules/extensions/libextmod.so -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/extensions/libextmod.so xserver-obsolete xorg,xorg_server_ver=120,obsolete +./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/extensions/libextmod.so.0 xserver-obsolete xorg,xorg_server_ver=120,obsolete +./usr/X11R7/lib/modules/extensions/libextmod_pic.a xserver-obsolete xorg,picinstall,obsolete +./usr/X11R7/lib/modules/extensions/libglx.a xserver-obsolete xorg,obsolete +./usr/X11R7/lib/modules/extensions/libglx.so xserver-glx-modules xorg +./usr/X11R7/lib/modules/extensions/libglx.so.0 xserver-glx-modules xorg +./usr/X11R7/lib/modules/extensions/libglx_pic.a xserver-obsolete xorg,picinstall,obsolete +./usr/X11R7/lib/modules/extensions/librecord.a xserver-obsolete xorg,obsolete +./usr/X11R7/lib/modules/extensions/librecord.so -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/extensions/librecord.so xserver-obsolete xorg,xorg_server_ver=120,obsolete +./usr/X11R7/lib/modules/extensions/librecord.so.0 -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/extensions/librecord.so.0 xserver-obsolete xorg,xorg_server_ver=120,obsolete +./usr/X11R7/lib/modules/extensions/librecord_pic.a xserver-obsolete xorg,picinstall,obsolete +./usr/X11R7/lib/modules/extensions/libshadow.a xserver-obsolete xorg,obsolete +./usr/X11R7/lib/modules/extensions/libshadow.so xserver-shadow-modules xorg +./usr/X11R7/lib/modules/extensions/libshadow.so.0 xserver-shadow-modules xorg +./usr/X11R7/lib/modules/extensions/libshadow_pic.a xserver-obsolete xorg,picinstall,obsolete +./usr/X11R7/lib/modules/libexa.a xserver-obsolete xorg,obsolete +./usr/X11R7/lib/modules/libexa.so
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: macallan
Date: Fri Oct 9 04:28:38 UTC 2020
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
build some potentially useful drivers on hppa
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/external/mit/xorg/server/drivers/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.99 src/external/mit/xorg/server/drivers/Makefile:1.100
--- src/external/mit/xorg/server/drivers/Makefile:1.99 Sun Jan 19 10:45:50 2020
+++ src/external/mit/xorg/server/drivers/Makefile Fri Oct 9 04:28:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2020/01/19 10:45:50 jmcneill Exp $
+# $NetBSD: Makefile,v 1.100 2020/10/09 04:28:38 macallan Exp $
.include
@@ -212,6 +212,13 @@ SUBDIR+= \
xf86-video-wsfb
.endif # ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
+.if ${MACHINE} == "hppa"
+SUBDIR+= \
+ xf86-video-mga \
+ xf86-video-r128 \
+ xf86-video-wsfb
+.endif # ${MACHINE} == "hppa"
+
.if ${MACHINE} == "ibmnws"
SUBDIR+= \
xf86-video-s3
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src Committed By: macallan Date: Fri Oct 9 04:28:38 UTC 2020 Modified Files: src/external/mit/xorg/server/drivers: Makefile Log Message: build some potentially useful drivers on hppa To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/external/mit/xorg/server/drivers/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: macallan Date: Fri Oct 9 04:19:43 UTC 2020 Modified Files: src/share/mk: bsd.own.mk Log Message: build Xorg server on hppa To generate a diff of this commit: cvs rdiff -u -r1.1222 -r1.1223 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.
CVS commit: src/share/mk
Module Name:src
Committed By: macallan
Date: Fri Oct 9 04:19:43 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
build Xorg server on hppa
To generate a diff of this commit:
cvs rdiff -u -r1.1222 -r1.1223 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.1222 src/share/mk/bsd.own.mk:1.1223
--- src/share/mk/bsd.own.mk:1.1222 Sat Sep 26 17:49:50 2020
+++ src/share/mk/bsd.own.mk Fri Oct 9 04:19:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1222 2020/09/26 17:49:50 jmcneill Exp $
+# $NetBSD: bsd.own.mk,v 1.1223 2020/10/09 04:19:43 macallan Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1311,6 +1311,7 @@ MKSLJIT= yes
${MACHINE} == "hpcarm" || \
${MACHINE} == "hpcmips" || \
${MACHINE} == "hpcsh" || \
+${MACHINE} == "hppa" || \
${MACHINE} == "i386" || \
${MACHINE} == "ibmnws" || \
${MACHINE} == "iyonix" || \
re: CVS commit: src/sys/kern
On Mon, 07 Sep 2020 at 20:47:25 +1000, matthew green wrote: "Jason R Thorpe" writes: Module Name:src Committed By: thorpej Date: Mon Sep 7 03:50:41 UTC 2020 Modified Files: src/sys/kern: files.kern init_main.c Log Message: Add the ability to set an alternate cnmagic in the kernel config file, e.g.: optionsCNMAGIC="\"+\"" thanks! i need this for my er4 that some how does do break properly.. options(4) update? I just added an entry for this to options(4). The bare bones, anyway. (It seems that DDB_BREAK_CHAR is only used in one place now, that being src/sys/arch/arm/sa11x0/sa11x0_com.c. I'm not sure if another detail to contextualize DDB_BREAK_CHAR vs. CNMAGIC would be warranted?) Dave
CVS commit: src/share/man/man4
Module Name:src Committed By: gutteridge Date: Fri Oct 9 01:49:53 UTC 2020 Modified Files: src/share/man/man4: options.4 Log Message: options.4: add a basic entry for the CNMAGIC option To generate a diff of this commit: cvs rdiff -u -r1.516 -r1.517 src/share/man/man4/options.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/options.4 diff -u src/share/man/man4/options.4:1.516 src/share/man/man4/options.4:1.517 --- src/share/man/man4/options.4:1.516 Fri Aug 28 16:07:49 2020 +++ src/share/man/man4/options.4 Fri Oct 9 01:49:53 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: options.4,v 1.516 2020/08/28 16:07:49 fcambus Exp $ +.\" $NetBSD: options.4,v 1.517 2020/10/09 01:49:53 gutteridge Exp $ .\" .\" Copyright (c) 1996 .\" Perry E. Metzger. All rights reserved. @@ -30,7 +30,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd August 25, 2020 +.Dd October 9, 2020 .Dt OPTIONS 4 .Os .Sh NAME @@ -562,6 +562,10 @@ This option overrides using break to ent on the serial console. The value given is the ASCII value to be used instead. This is currently only supported by the com driver. +.It Cd options CNMAGIC=string +This option overrides the +.Xr cnmagic 9 +string used to enter the kernel debugger. .It Cd options DDB_VERBOSE_HELP This option adds more verbose descriptions to the .Em help @@ -2706,6 +2710,7 @@ support in the kernel. .Xr quotaon 8 , .Xr rpc.rquotad 8 , .Xr sysctl 8 , +.Xr cnmagic 9 , .Xr in_getifa 9 , .Xr kernhist 9 .Sh HISTORY
CVS commit: src/share/man/man4
Module Name:src Committed By: gutteridge Date: Fri Oct 9 01:49:53 UTC 2020 Modified Files: src/share/man/man4: options.4 Log Message: options.4: add a basic entry for the CNMAGIC option To generate a diff of this commit: cvs rdiff -u -r1.516 -r1.517 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libpciaccess/dist/src
Module Name:xsrc Committed By: jmcneill Date: Thu Oct 8 23:04:34 UTC 2020 Modified Files: xsrc/external/mit/libpciaccess/dist/src: netbsd_pci.c Log Message: Fix crash when more than 32 pci(4) devices are attached. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 \ xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libpciaccess/dist/src
Module Name:xsrc
Committed By: jmcneill
Date: Thu Oct 8 23:04:34 UTC 2020
Modified Files:
xsrc/external/mit/libpciaccess/dist/src: netbsd_pci.c
Log Message:
Fix crash when more than 32 pci(4) devices are attached.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
diff -u xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.18 xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.19
--- xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.18 Fri Oct 26 11:17:33 2018
+++ xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c Thu Oct 8 23:04:34 2020
@@ -66,7 +66,7 @@ typedef struct _pcibus {
int maxdevs; /* maximum number of devices */
} PciBus;
-static PciBus buses[32]; /* indexed by pci_device.domain */
+static PciBus *buses = NULL; /* indexed by pci_device.domain */
static int nbuses = 0; /* number of buses found */
/*
@@ -99,7 +99,7 @@ pci_read(int domain, int bus, int dev, i
{
uint32_t rval;
- if ((domain < 0) || (domain > nbuses))
+ if ((domain < 0) || (domain >= nbuses))
return -1;
if (pcibus_conf_read(buses[domain].fd, (unsigned int)bus,
@@ -115,7 +115,7 @@ static int
pci_write(int domain, int bus, int dev, int func, uint32_t reg, uint32_t val)
{
- if ((domain < 0) || (domain > nbuses))
+ if ((domain < 0) || (domain >= nbuses))
return -1;
return pcibus_conf_write(buses[domain].fd, (unsigned int)bus,
@@ -127,7 +127,7 @@ pci_nfuncs(int domain, int bus, int dev)
{
uint32_t hdr;
- if ((domain < 0) || (domain > nbuses))
+ if ((domain < 0) || (domain >= nbuses))
return -1;
if (pci_read(domain, bus, dev, 0, PCI_BHLC_REG, ) != 0)
@@ -907,13 +907,42 @@ static const struct pci_system_methods n
.has_kernel_driver = pci_device_netbsd_has_kernel_driver,
};
+static int
+pci_system_netbsd_open_device(int unit)
+{
+ char netbsd_devname[32];
+ int pcifd;
+
+ snprintf(netbsd_devname, 32, "/dev/pci%d", unit);
+ pcifd = open(netbsd_devname, O_RDWR | O_CLOEXEC);
+ if (pcifd == -1)
+ pcifd = open(netbsd_devname, O_RDONLY | O_CLOEXEC);
+
+ return pcifd;
+}
+
+static int
+pci_system_netbsd_count_buses(void)
+{
+ int pcifd, nbuses;
+
+ do {
+ pcifd = pci_system_netbsd_open_device(nbuses);
+ if (pcifd != -1) {
+ close(pcifd);
+ nbuses++;
+ }
+ } while (pcifd != -1);
+
+ return nbuses;
+}
+
int
pci_system_netbsd_create(void)
{
struct pci_device_private *device;
- int bus, dev, func, ndevs, nfuncs, domain, pcifd;
+ int bus, dev, func, ndevs, nfuncs, domain, pcifd, n;
uint32_t reg;
- char netbsd_devname[32];
struct pciio_businfo businfo;
pci_sys = calloc(1, sizeof(struct pci_system));
@@ -921,19 +950,18 @@ pci_system_netbsd_create(void)
pci_sys->methods = _pci_methods;
ndevs = 0;
- nbuses = 0;
- snprintf(netbsd_devname, 32, "/dev/pci%d", nbuses);
- pcifd = open(netbsd_devname, O_RDWR | O_CLOEXEC);
- if (pcifd == -1)
- pcifd = open(netbsd_devname, O_RDONLY | O_CLOEXEC);
+ nbuses = pci_system_netbsd_count_buses();
+ if (nbuses > 0)
+ buses = calloc(nbuses, sizeof(PciBus));
+
+ for (n = 0; n < nbuses; n++) {
+ pcifd = pci_system_netbsd_open_device(n);
- while (pcifd > 0) {
ioctl(pcifd, PCI_IOC_BUSINFO, );
- buses[nbuses].fd = pcifd;
- buses[nbuses].num = bus = businfo.busno;
- buses[nbuses].maxdevs = businfo.maxdevs;
- domain = nbuses;
- nbuses++;
+ buses[n].fd = pcifd;
+ buses[n].num = bus = businfo.busno;
+ buses[n].maxdevs = businfo.maxdevs;
+ domain = n;
for (dev = 0; dev < businfo.maxdevs; dev++) {
nfuncs = pci_nfuncs(domain, bus, dev);
for (func = 0; func < nfuncs; func++) {
@@ -947,10 +975,6 @@ pci_system_netbsd_create(void)
ndevs++;
}
}
- snprintf(netbsd_devname, 32, "/dev/pci%d", nbuses);
- pcifd = open(netbsd_devname, O_RDWR);
- if (pcifd == -1)
- pcifd = open(netbsd_devname, O_RDONLY | O_CLOEXEC);
}
pci_sys->num_devices = ndevs;
CVS commit: src/sys/arch/arm/rockchip
Module Name:src
Committed By: tnn
Date: Thu Oct 8 22:14:00 UTC 2020
Modified Files:
src/sys/arch/arm/rockchip: rk3399_pcie.c
Log Message:
rk3399_pcie: do reset timing according to PCI Express Base Specification
Don't do link training or configuration space accesses within the time
allowed by the standard for the downstream card to come out of reset
after deasserting PERST#.
This fixes detection issues seen with a dual port wm(4) NIC,
an ASMedia SATA card and also Pericom bridges (but they need more work
to be useful).
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/rockchip/rk3399_pcie.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/rockchip/rk3399_pcie.c
diff -u src/sys/arch/arm/rockchip/rk3399_pcie.c:1.10 src/sys/arch/arm/rockchip/rk3399_pcie.c:1.11
--- src/sys/arch/arm/rockchip/rk3399_pcie.c:1.10 Wed Jun 17 06:51:08 2020
+++ src/sys/arch/arm/rockchip/rk3399_pcie.c Thu Oct 8 22:14:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3399_pcie.c,v 1.10 2020/06/17 06:51:08 thorpej Exp $ */
+/* $NetBSD: rk3399_pcie.c,v 1.11 2020/10/08 22:14:00 tnn Exp $ */
/*
* Copyright (c) 2018 Mark Kettenis
*
@@ -17,7 +17,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.10 2020/06/17 06:51:08 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.11 2020/10/08 22:14:00 tnn Exp $");
#include
#include
@@ -278,7 +278,7 @@ again:
reset_assert(phandle, "mgmt-sticky");
reset_assert(phandle, "pipe");
- delay(10);
+ delay(1000); /* TPERST. use 1ms */
reset_deassert(phandle, "pm");
reset_deassert(phandle, "aclk");
@@ -311,11 +311,12 @@ again:
reset_deassert(phandle, "mgmt");
reset_deassert(phandle, "pipe");
+ fdtbus_gpio_write(ep_gpio, 1);
+ delay(2); /* 20 ms according to PCI-e BS "Conventional Reset" */
+
/* Start link training. */
HWRITE4(sc, PCIE_CLIENT_BASIC_STRAP_CONF, PCBSC_LINK_TRAIN_EN);
- fdtbus_gpio_write(ep_gpio, 1);
-
for (timo = 500; timo > 0; timo--) {
status = HREAD4(sc, PCIE_CLIENT_BASIC_STATUS1);
if (PCBS1_LINK_ST(status) == PCBS1_LS_DL_DONE)
@@ -346,6 +347,7 @@ again:
goto again;
}
}
+ delay(8); /* wait 100 ms before CSR access. already waited 20. */
fdtbus_gpio_release(ep_gpio);
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: tnn Date: Thu Oct 8 22:14:00 UTC 2020 Modified Files: src/sys/arch/arm/rockchip: rk3399_pcie.c Log Message: rk3399_pcie: do reset timing according to PCI Express Base Specification Don't do link training or configuration space accesses within the time allowed by the standard for the downstream card to come out of reset after deasserting PERST#. This fixes detection issues seen with a dual port wm(4) NIC, an ASMedia SATA card and also Pericom bridges (but they need more work to be useful). To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/rockchip/rk3399_pcie.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: nisimura Date: Thu Oct 8 21:00:25 UTC 2020 Modified Files: src/sys/dev/ic: dm9000reg.h Log Message: add DM9000A register definitions To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/dm9000reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/dm9000reg.h diff -u src/sys/dev/ic/dm9000reg.h:1.5 src/sys/dev/ic/dm9000reg.h:1.6 --- src/sys/dev/ic/dm9000reg.h:1.5 Thu Oct 8 11:29:04 2020 +++ src/sys/dev/ic/dm9000reg.h Thu Oct 8 21:00:25 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: dm9000reg.h,v 1.5 2020/10/08 11:29:04 nisimura Exp $ */ +/* $NetBSD: dm9000reg.h,v 1.6 2020/10/08 21:00:25 nisimura Exp $ */ /* * Copyright (c) 2009 Paul Fleischer @@ -167,17 +167,29 @@ #define DM9000_PID1 0x2B /* product ID 15:8 */ #define DM9000_CHIPR 0x2C /* chip revision */ -#define DM9000_SMCR 0x2F /* "serial mode" control */ +#define DM9000_TCR2 0x2D /* Tx control 2 */ +#define DM9000_OTCR 0x2E /* operation test control */ +#define DM9000_SMCR 0x2F /* special mode control */ #define DM9000_FB0 (1<<0) /* force shortest back-off time */ #define DM9000_FB1 (1<<1) /* force longeset back-off time */ #define DM9000_FLC (1<<2) /* force late collsion */ #define DM9000_SM_EN (1<<7) /* serial mode enable */ -#define DM9000_MRCMDX 0xF0 /* "no increment" read byte */ -#define DM9000_MRCMD 0xF2 /* "auto increment" read byte */ +#define DM9000_ETXCSR 0x30 /* early xmit control and status */ +#define DM9000_TCSCR 0x31 /* xmit checksum control */ +#define DM9000_RCSCSR 0x32 /* recv checksum control and status */ +#define DM9000_MPAR 0x33 /* MII PHY address */ +#define DM9000_LEDCR 0x34 /* LED pin control */ +#define DM9000_BUSCR 0x38 /* processor bus control */ +#define DM9000_INTCR 0x39 /* INT pin control */ +#define DM9000_SCCR 0x50 /* system clock turn on control */ +#define DM9000_RSCCR 0x51 /* resume system clock control */ +#define DM9000_MRCMDX 0xF0 /* "no increment" pre-fetch read */ +#define DM9000_MRCMDX1 0xF1 /* "no increment" read */ +#define DM9000_MRCMD 0xF2 /* "auto increment" read */ #define DM9000_MRRL 0xF4 /* memory read address 7:0 */ #define DM9000_MRRH 0xF5 /* memory read address 15:8 */ -#define DM9000_MWCMDX 0xF6 /* "no increment" write byte */ -#define DM9000_MWCMD 0xF8 /* "auto increment" write byte */ +#define DM9000_MWCMDX 0xF6 /* "no increment" write */ +#define DM9000_MWCMD 0xF8 /* "auto increment" write */ #define DM9000_MWRL 0xFA /* memory write address 7:0 */ #define DM9000_MWRH 0xFB /* memory write address 15:8 */ #define DM9000_TXPLL 0xFC /* frame len 7:0 to transmit */
CVS commit: src/sys/dev/ic
Module Name:src Committed By: nisimura Date: Thu Oct 8 21:00:25 UTC 2020 Modified Files: src/sys/dev/ic: dm9000reg.h Log Message: add DM9000A register definitions To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/dm9000reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Thu Oct 8 19:11:36 UTC 2020 Modified Files: src/usr.bin/make/unit-tests: Makefile Log Message: make(1): remove test misc.mk from Makefile To generate a diff of this commit: cvs rdiff -u -r1.163 -r1.164 src/usr.bin/make/unit-tests/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/unit-tests/Makefile diff -u src/usr.bin/make/unit-tests/Makefile:1.163 src/usr.bin/make/unit-tests/Makefile:1.164 --- src/usr.bin/make/unit-tests/Makefile:1.163 Thu Oct 8 17:54:20 2020 +++ src/usr.bin/make/unit-tests/Makefile Thu Oct 8 19:11:35 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.163 2020/10/08 17:54:20 rillig Exp $ +# $NetBSD: Makefile,v 1.164 2020/10/08 19:11:35 rillig Exp $ # # Unit tests for make(1) # @@ -174,7 +174,6 @@ TESTS+= include-main TESTS+= job-output-long-lines TESTS+= lint TESTS+= make-exported -TESTS+= misc TESTS+= moderrs TESTS+= modmatch TESTS+= modmisc
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Thu Oct 8 19:11:36 UTC 2020 Modified Files: src/usr.bin/make/unit-tests: Makefile Log Message: make(1): remove test misc.mk from Makefile To generate a diff of this commit: cvs rdiff -u -r1.163 -r1.164 src/usr.bin/make/unit-tests/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Thu Oct 8 19:09:08 UTC 2020
Modified Files:
src/distrib/sets/lists/tests: mi
src/usr.bin/make/unit-tests: varname-dot-curdir.mk
Removed Files:
src/usr.bin/make/unit-tests: misc.exp misc.mk
Log Message:
make(1): move test for .CURDIR from misc.mk to varname-dot-curname.mk
To generate a diff of this commit:
cvs rdiff -u -r1.938 -r1.939 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r0 src/usr.bin/make/unit-tests/misc.exp \
src/usr.bin/make/unit-tests/misc.mk
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/varname-dot-curdir.mk
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.938 src/distrib/sets/lists/tests/mi:1.939
--- src/distrib/sets/lists/tests/mi:1.938 Sun Oct 4 06:53:15 2020
+++ src/distrib/sets/lists/tests/mi Thu Oct 8 19:09:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.938 2020/10/04 06:53:15 rillig Exp $
+# $NetBSD: mi,v 1.939 2020/10/08 19:09:08 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4829,8 +4829,8 @@
./usr/tests/usr.bin/make/unit-tests/lint.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/make-exported.exptests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/make-exported.mktests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/make/unit-tests/misc.exp tests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/make/unit-tests/misc.mk tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/misc.exp tests-obsolete obsolete
+./usr/tests/usr.bin/make/unit-tests/misc.mk tests-obsolete obsolete
./usr/tests/usr.bin/make/unit-tests/moderrs.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/moderrs.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/modmatch.exptests-usr.bin-tests compattestfile,atf
Index: src/usr.bin/make/unit-tests/varname-dot-curdir.mk
diff -u src/usr.bin/make/unit-tests/varname-dot-curdir.mk:1.6 src/usr.bin/make/unit-tests/varname-dot-curdir.mk:1.7
--- src/usr.bin/make/unit-tests/varname-dot-curdir.mk:1.6 Mon Oct 5 19:27:48 2020
+++ src/usr.bin/make/unit-tests/varname-dot-curdir.mk Thu Oct 8 19:09:08 2020
@@ -1,8 +1,26 @@
-# $NetBSD: varname-dot-curdir.mk,v 1.6 2020/10/05 19:27:48 rillig Exp $
+# $NetBSD: varname-dot-curdir.mk,v 1.7 2020/10/08 19:09:08 rillig Exp $
#
-# Tests for the special .CURDIR variable.
+# Tests for the special .CURDIR variable, which is initially set to the
+# canonical path of the current working directory, when make started.
-# TODO: Implementation
+# In all normal situations, the current directory exists, and its name can
+# be resolved. If not, make fails at startup.
+#
+# It would be possible on some systems to remove the current directory, even
+# while a process runs in it, but this is so unrealistic that it's no worth
+# testing.
+.if !exists(${.CURDIR})
+. error
+.endif
+.if !exists(${.CURDIR}/)
+. error
+.endif
+.if !exists(${.CURDIR}/.)
+. error
+.endif
+.if !exists(${.CURDIR}/..)
+. error
+.endif
# Until 2020-10-04, assigning the result of a shell assignment to .CURDIR
# tried to add the shell command ("echo /") to the .PATH instead of the
CVS commit: src
Module Name:src Committed By: rillig Date: Thu Oct 8 19:09:08 UTC 2020 Modified Files: src/distrib/sets/lists/tests: mi src/usr.bin/make/unit-tests: varname-dot-curdir.mk Removed Files: src/usr.bin/make/unit-tests: misc.exp misc.mk Log Message: make(1): move test for .CURDIR from misc.mk to varname-dot-curname.mk To generate a diff of this commit: cvs rdiff -u -r1.938 -r1.939 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.1 -r0 src/usr.bin/make/unit-tests/misc.exp \ src/usr.bin/make/unit-tests/misc.mk cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/varname-dot-curdir.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Thu Oct 8 18:37:26 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: archive.exp archive.mk
Log Message:
make(1): make individual targets in test archive.mk visible
This test still fails on FreeBSD, printing the "ar cru, ranlib" lines
twice, and I don't know why.
To get more insights into the inner details, without activating the full
-dA logging, split the output into paragraphs, one per target.
This change reveals another interesting detail: Dependencies without any
commands (in this case create-archive) don't inherit the commands from
.USEBEFORE and .USE sources.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/archive.exp
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/archive.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/archive.exp
diff -u src/usr.bin/make/unit-tests/archive.exp:1.5 src/usr.bin/make/unit-tests/archive.exp:1.6
--- src/usr.bin/make/unit-tests/archive.exp:1.5 Fri Sep 4 17:03:17 2020
+++ src/usr.bin/make/unit-tests/archive.exp Thu Oct 8 18:37:26 2020
@@ -1,14 +1,28 @@
+Making remove-archive
rm -f libprog.a
+
+Making libprog.a out-of-date archive.mk modmisc.mk varmisc.mk
ar cru libprog.a archive.mk modmisc.mk varmisc.mk
ranlib libprog.a
+
+Making create-archive out-of-date libprog.a
+
+Making list-archive out-of-date libprog.a
ar t libprog.a
archive.mk
modmisc.mk
varmisc.mk
+
+Making list-archive-wildcard out-of-date ternary.mk archive-suffix.mk archive.mk
list-archive-wildcard: archive-suffix.mk
list-archive-wildcard: archive.mk
list-archive-wildcard: ternary.mk
+
+Making depend-on-existing-member out-of-date archive.mk
depend-on-existing-member
+
`depend-on-nonexistent-member' is up to date.
+Making remove-archive
rm -f libprog.a
+
exit status 0
Index: src/usr.bin/make/unit-tests/archive.mk
diff -u src/usr.bin/make/unit-tests/archive.mk:1.8 src/usr.bin/make/unit-tests/archive.mk:1.9
--- src/usr.bin/make/unit-tests/archive.mk:1.8 Mon Sep 7 05:16:32 2020
+++ src/usr.bin/make/unit-tests/archive.mk Thu Oct 8 18:37:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: archive.mk,v 1.8 2020/09/07 05:16:32 rillig Exp $
+# $NetBSD: archive.mk,v 1.9 2020/10/08 18:37:26 rillig Exp $
#
# Very basic demonstration of handling archives, based on the description
# in PSD.doc/tutorial.ms.
@@ -17,9 +17,9 @@ all:
.if ${.PARSEDIR:tA} != ${.CURDIR:tA}
@cd ${MAKEFILE:H} && cp ${FILES} [at]*.mk ${.CURDIR}
.endif
-# The following targets are run in sub-makes to ensure that they get the
-# current state of the filesystem right, since they creating and removing
-# files.
+# The following targets create and remove files. The filesystem cache in
+# dir.c would probably not handle this correctly, therefore each of the
+# targets is run in its separate sub-make.
${RUN} ${MAKE_CMD} remove-archive
${RUN} ${MAKE_CMD} create-archive
${RUN} ${MAKE_CMD} list-archive
@@ -28,30 +28,35 @@ all:
${RUN} ${MAKE_CMD} depend-on-nonexistent-member
${RUN} ${MAKE_CMD} remove-archive
-create-archive: ${ARCHIVE}
+create-archive: ${ARCHIVE} pre post
# The indirect references with the $$ cover the code in Arch_ParseArchive
# that calls Var_Parse. It's an esoteric scenario since at the point where
# Arch_ParseArchive is called, the dependency line is already fully expanded.
#
-${ARCHIVE}: $${:Ulibprog.a}(archive.mk modmisc.mk $${:Uvarmisc.mk})
+${ARCHIVE}: $${:Ulibprog.a}(archive.mk modmisc.mk $${:Uvarmisc.mk}) pre post
ar cru ${.TARGET} ${.OODATE}
ranlib ${.TARGET}
-list-archive: ${ARCHIVE}
+list-archive: ${ARCHIVE} pre post
ar t ${.ALLSRC}
# XXX: I had expected that this dependency would select all *.mk files from
# the archive. Instead, the globbing is done in the current directory.
# To prevent an overly long file list, the pattern is restricted to [at]*.mk.
-list-archive-wildcard: ${ARCHIVE}([at]*.mk)
+list-archive-wildcard: ${ARCHIVE}([at]*.mk) pre post
${RUN} printf '%s\n' ${.ALLSRC:O:@member@${.TARGET:Q}': '${member:Q}@}
-depend-on-existing-member: ${ARCHIVE}(archive.mk)
+depend-on-existing-member: ${ARCHIVE}(archive.mk) pre post
${RUN} echo $@
-depend-on-nonexistent-member: ${ARCHIVE}(nonexistent.mk)
+depend-on-nonexistent-member: ${ARCHIVE}(nonexistent.mk) pre post
${RUN} echo $@
-remove-archive:
+remove-archive: pre post
rm -f ${ARCHIVE}
+
+pre: .USEBEFORE
+ @echo Making ${.TARGET} ${.OODATE:C,.+,out-of-date,W} ${.OODATE}
+post: .USE
+ @echo
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Thu Oct 8 18:37:26 UTC 2020 Modified Files: src/usr.bin/make/unit-tests: archive.exp archive.mk Log Message: make(1): make individual targets in test archive.mk visible This test still fails on FreeBSD, printing the "ar cru, ranlib" lines twice, and I don't know why. To get more insights into the inner details, without activating the full -dA logging, split the output into paragraphs, one per target. This change reveals another interesting detail: Dependencies without any commands (in this case create-archive) don't inherit the commands from .USEBEFORE and .USE sources. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/archive.exp cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/archive.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Thu Oct 8 18:11:21 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #1097 - #1105 To generate a diff of this commit: cvs rdiff -u -r1.1.2.118 -r1.1.2.119 src/doc/CHANGES-9.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-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.118 src/doc/CHANGES-9.1:1.1.2.119 --- src/doc/CHANGES-9.1:1.1.2.118 Sun Oct 4 18:24:07 2020 +++ src/doc/CHANGES-9.1 Thu Oct 8 18:11:21 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.118 2020/10/04 18:24:07 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.119 2020/10/08 18:11:21 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -5047,4 +5047,63 @@ sys/dev/fdt/dw_apb_uart.c 1.8 from + to default. [rin, ticket #1096] +external/mit/xorg/bin/xterm/Makefile 1.18 + + xterm: Enable SIXEL graphics support. + [nia, ticket #1097] + +external/mit/xorg/bin/xeyes/Makefile 1.3 + + xeyes: Enable anti-aliasing with XRENDER. + [nia, ticket #1098] + +external/mit/xdm/dist/config/Xsession.in 1.2-1.5 +external/mit/xinit/dist/xinitrc.cpp 1.5-1.7 +external/mit/xsm/dist/system.xsm 1.2 +distrib/sets/lists/xbase/mi 1.157 +external/mit/ctwm/Makefile 1.2-1.5 +external/mit/ctwm/bin/ctwm/Makefile 1.6-1.8 +external/mit/ctwm/etc/Makefile 1.1,1.2 +external/mit/ctwm/etc/system.ctwmrc 1.1 +external/mit/ctwm/libexec/Makefile 1.1 +external/mit/ctwm/libexec/ctwm_app_menu 1.1 + + Make ctwm the default X session window manager. + Add a script for dynamically generating a menu in the ctwm desktop. + Move the new ctwmrc here so it doesn't conflict with the upstream one. + [nia, ticket #1099] + +share/man/man4/pms.41.38 +sys/dev/pckbport/synaptics.c 1.69,1.70 + + pms(4): synaptics: emulate scrolling when the middle button is held + with TrackPoints. + [nia, ticket #1100] + +share/man/man8/afterboot.8 1.74 + + Fix wifi setup instructions. + [nia, ticket #1101] + +etc/ntp.conf 1.21,1.22 + + Use "pool" for the pool.ntp.org servers. Add some hints. + [kim, ticket #1102] + +sys/netipsec/xform_esp.c 1.101 + + Make sequence number of esp header MP-safe for IPsec Tx side. + [knakahara, ticket #1103] + +sys/netinet/in.c1.241 +sys/netinet6/in6.c1.282 + + Fix detached address handling for interfaces transitioning + from DOWN to UNKNOWN link state. + [roy, ticket #1104] + +sys/arch/arm/include/arm32/vmparam.h 1.56 + + Maximize allowed data size. + [he, ticket #1105]
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Thu Oct 8 18:11:21 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #1097 - #1105 To generate a diff of this commit: cvs rdiff -u -r1.1.2.118 -r1.1.2.119 src/doc/CHANGES-9.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/arm/include/arm32
Module Name:src Committed By: martin Date: Thu Oct 8 18:10:01 UTC 2020 Modified Files: src/sys/arch/arm/include/arm32 [netbsd-9]: vmparam.h Log Message: Pull up following revision(s) (requested by he in ticket #1105): sys/arch/arm/include/arm32/vmparam.h: revision 1.56 Bump MAXDSIZ from 1536 to 1836. 1836 is 2048-128(MAXTSIZ)-64(MAXSSIZ). Gives us a fighting chance to build rust natively. OK'ed by skrll@ To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.45.2.1 src/sys/arch/arm/include/arm32/vmparam.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/include/arm32/vmparam.h diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.45 src/sys/arch/arm/include/arm32/vmparam.h:1.45.2.1 --- src/sys/arch/arm/include/arm32/vmparam.h:1.45 Wed Jun 19 09:54:42 2019 +++ src/sys/arch/arm/include/arm32/vmparam.h Thu Oct 8 18:10:00 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.45 2019/06/19 09:54:42 skrll Exp $ */ +/* $NetBSD: vmparam.h,v 1.45.2.1 2020/10/08 18:10:00 martin Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -67,7 +67,7 @@ #define DFLDSIZ (384*1024*1024) /* initial data size limit */ #endif #ifndef MAXDSIZ -#define MAXDSIZ (1536*1024*1024) /* max data size */ +#define MAXDSIZ (1856*1024*1024) /* max data size */ #endif #ifndef DFLSSIZ #define DFLSSIZ (4*1024*1024) /* initial stack size limit */
CVS commit: [netbsd-9] src/sys/arch/arm/include/arm32
Module Name:src Committed By: martin Date: Thu Oct 8 18:10:01 UTC 2020 Modified Files: src/sys/arch/arm/include/arm32 [netbsd-9]: vmparam.h Log Message: Pull up following revision(s) (requested by he in ticket #1105): sys/arch/arm/include/arm32/vmparam.h: revision 1.56 Bump MAXDSIZ from 1536 to 1836. 1836 is 2048-128(MAXTSIZ)-64(MAXSSIZ). Gives us a fighting chance to build rust natively. OK'ed by skrll@ To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.45.2.1 src/sys/arch/arm/include/arm32/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Thu Oct 8 18:07:38 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1611 - #1613 To generate a diff of this commit: cvs rdiff -u -r1.1.2.40 -r1.1.2.41 src/doc/CHANGES-8.3 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.3 diff -u src/doc/CHANGES-8.3:1.1.2.40 src/doc/CHANGES-8.3:1.1.2.41 --- src/doc/CHANGES-8.3:1.1.2.40 Sun Sep 27 10:34:32 2020 +++ src/doc/CHANGES-8.3 Thu Oct 8 18:07:38 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.40 2020/09/27 10:34:32 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.41 2020/10/08 18:07:38 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1082,3 +1082,20 @@ sys/dev/ic/nvme.c1.50 (patch) with multiple (partialy unused) name spaces. [kardel, ticket #1610] +etc/ntp.conf 1.21,1.22 + + Use "pool" for the pool.ntp.org servers. Add some hints. + [kim, ticket #1611] + +sys/netipsec/xform_esp.c 1.101 + + Make sequence number of esp header MP-safe for IPsec Tx side. + [knakahara, ticket #1612] + +sys/netinet/in.c1.241 +sys/netinet6/in6.c1.282 + + Fix detached address handling for interfaces transitioning + from DOWN to UNKNOWN link state. + [roy, ticket #1613] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Thu Oct 8 18:07:38 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1611 - #1613 To generate a diff of this commit: cvs rdiff -u -r1.1.2.40 -r1.1.2.41 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys
Module Name:src
Committed By: martin
Date: Thu Oct 8 18:06:13 UTC 2020
Modified Files:
src/sys/netinet [netbsd-8]: in.c
src/sys/netinet6 [netbsd-8]: in6.c
Log Message:
Pull up following revision(s) (requested by roy in ticket #1613):
sys/netinet/in.c: revision 1.241
sys/netinet6/in6.c: revision 1.282
inet: Treat LINK_STATE_UNKNOWN as LINK_STATE_UP when changing
It's something we have always done.
it's really rare for anything to transition to UNKNOWN from either
UP or DOWN, but technically it is possible.
To generate a diff of this commit:
cvs rdiff -u -r1.203.2.13 -r1.203.2.14 src/sys/netinet/in.c
cvs rdiff -u -r1.245.2.12 -r1.245.2.13 src/sys/netinet6/in6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/in.c
diff -u src/sys/netinet/in.c:1.203.2.13 src/sys/netinet/in.c:1.203.2.14
--- src/sys/netinet/in.c:1.203.2.13 Mon Apr 9 04:04:21 2018
+++ src/sys/netinet/in.c Thu Oct 8 18:06:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.203.2.13 2018/04/09 04:04:21 snj Exp $ */
+/* $NetBSD: in.c,v 1.203.2.14 2020/10/08 18:06:12 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.203.2.13 2018/04/09 04:04:21 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.203.2.14 2020/10/08 18:06:12 martin Exp $");
#include "arp.h"
@@ -1553,14 +1553,15 @@ void
in_if_link_state_change(struct ifnet *ifp, int link_state)
{
- switch (link_state) {
- case LINK_STATE_DOWN:
+ /*
+ * Treat LINK_STATE_UNKNOWN as UP.
+ * LINK_STATE_UNKNOWN transitions to LINK_STATE_DOWN when
+ * if_link_state_change() transitions to LINK_STATE_UP.
+ */
+ if (link_state == LINK_STATE_DOWN)
in_if_link_down(ifp);
- break;
- case LINK_STATE_UP:
+ else
in_if_link_up(ifp);
- break;
- }
}
/*
Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.245.2.12 src/sys/netinet6/in6.c:1.245.2.13
--- src/sys/netinet6/in6.c:1.245.2.12 Tue Nov 6 14:38:58 2018
+++ src/sys/netinet6/in6.c Thu Oct 8 18:06:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.245.2.12 2018/11/06 14:38:58 martin Exp $ */
+/* $NetBSD: in6.c,v 1.245.2.13 2020/10/08 18:06:13 martin Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.245.2.12 2018/11/06 14:38:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.245.2.13 2020/10/08 18:06:13 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2325,14 +2325,15 @@ void
in6_if_link_state_change(struct ifnet *ifp, int link_state)
{
- switch (link_state) {
- case LINK_STATE_DOWN:
+ /*
+ * Treat LINK_STATE_UNKNOWN as UP.
+ * LINK_STATE_UNKNOWN transitions to LINK_STATE_DOWN when
+ * if_link_state_change() transitions to LINK_STATE_UP.
+ */
+ if (link_state == LINK_STATE_DOWN)
in6_if_link_down(ifp);
- break;
- case LINK_STATE_UP:
+ else
in6_if_link_up(ifp);
- break;
- }
}
/*
CVS commit: [netbsd-8] src/sys
Module Name:src Committed By: martin Date: Thu Oct 8 18:06:13 UTC 2020 Modified Files: src/sys/netinet [netbsd-8]: in.c src/sys/netinet6 [netbsd-8]: in6.c Log Message: Pull up following revision(s) (requested by roy in ticket #1613): sys/netinet/in.c: revision 1.241 sys/netinet6/in6.c: revision 1.282 inet: Treat LINK_STATE_UNKNOWN as LINK_STATE_UP when changing It's something we have always done. it's really rare for anything to transition to UNKNOWN from either UP or DOWN, but technically it is possible. To generate a diff of this commit: cvs rdiff -u -r1.203.2.13 -r1.203.2.14 src/sys/netinet/in.c cvs rdiff -u -r1.245.2.12 -r1.245.2.13 src/sys/netinet6/in6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys
Module Name:src Committed By: martin Date: Thu Oct 8 18:05:00 UTC 2020 Modified Files: src/sys/netinet [netbsd-9]: in.c src/sys/netinet6 [netbsd-9]: in6.c Log Message: Pull up following revision(s) (requested by roy in ticket #1104): sys/netinet/in.c: revision 1.241 sys/netinet6/in6.c: revision 1.282 inet: Treat LINK_STATE_UNKNOWN as LINK_STATE_UP when changing It's something we have always done. it's really rare for anything to transition to UNKNOWN from either UP or DOWN, but technically it is possible. To generate a diff of this commit: cvs rdiff -u -r1.234 -r1.234.2.1 src/sys/netinet/in.c cvs rdiff -u -r1.275 -r1.275.2.1 src/sys/netinet6/in6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys
Module Name:src
Committed By: martin
Date: Thu Oct 8 18:05:00 UTC 2020
Modified Files:
src/sys/netinet [netbsd-9]: in.c
src/sys/netinet6 [netbsd-9]: in6.c
Log Message:
Pull up following revision(s) (requested by roy in ticket #1104):
sys/netinet/in.c: revision 1.241
sys/netinet6/in6.c: revision 1.282
inet: Treat LINK_STATE_UNKNOWN as LINK_STATE_UP when changing
It's something we have always done.
it's really rare for anything to transition to UNKNOWN from either
UP or DOWN, but technically it is possible.
To generate a diff of this commit:
cvs rdiff -u -r1.234 -r1.234.2.1 src/sys/netinet/in.c
cvs rdiff -u -r1.275 -r1.275.2.1 src/sys/netinet6/in6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/in.c
diff -u src/sys/netinet/in.c:1.234 src/sys/netinet/in.c:1.234.2.1
--- src/sys/netinet/in.c:1.234 Mon Apr 29 11:57:22 2019
+++ src/sys/netinet/in.c Thu Oct 8 18:04:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.234 2019/04/29 11:57:22 roy Exp $ */
+/* $NetBSD: in.c,v 1.234.2.1 2020/10/08 18:04:59 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.234 2019/04/29 11:57:22 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.234.2.1 2020/10/08 18:04:59 martin Exp $");
#include "arp.h"
@@ -1555,14 +1555,15 @@ void
in_if_link_state_change(struct ifnet *ifp, int link_state)
{
- switch (link_state) {
- case LINK_STATE_DOWN:
+ /*
+ * Treat LINK_STATE_UNKNOWN as UP.
+ * LINK_STATE_UNKNOWN transitions to LINK_STATE_DOWN when
+ * if_link_state_change() transitions to LINK_STATE_UP.
+ */
+ if (link_state == LINK_STATE_DOWN)
in_if_link_down(ifp);
- break;
- case LINK_STATE_UP:
+ else
in_if_link_up(ifp);
- break;
- }
}
/*
Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.275 src/sys/netinet6/in6.c:1.275.2.1
--- src/sys/netinet6/in6.c:1.275 Mon Apr 29 11:57:22 2019
+++ src/sys/netinet6/in6.c Thu Oct 8 18:04:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.275 2019/04/29 11:57:22 roy Exp $ */
+/* $NetBSD: in6.c,v 1.275.2.1 2020/10/08 18:04:59 martin Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.275 2019/04/29 11:57:22 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.275.2.1 2020/10/08 18:04:59 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2324,14 +2324,15 @@ void
in6_if_link_state_change(struct ifnet *ifp, int link_state)
{
- switch (link_state) {
- case LINK_STATE_DOWN:
+ /*
+ * Treat LINK_STATE_UNKNOWN as UP.
+ * LINK_STATE_UNKNOWN transitions to LINK_STATE_DOWN when
+ * if_link_state_change() transitions to LINK_STATE_UP.
+ */
+ if (link_state == LINK_STATE_DOWN)
in6_if_link_down(ifp);
- break;
- case LINK_STATE_UP:
+ else
in6_if_link_up(ifp);
- break;
- }
}
/*
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Thu Oct 8 17:54:20 UTC 2020 Modified Files: src/usr.bin/make/unit-tests: Makefile opt-debug-jobs.exp Log Message: make(1): fix test opt-debug-jobs on non-native platforms To generate a diff of this commit: cvs rdiff -u -r1.162 -r1.163 src/usr.bin/make/unit-tests/Makefile cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/opt-debug-jobs.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Thu Oct 8 17:54:20 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile opt-debug-jobs.exp
Log Message:
make(1): fix test opt-debug-jobs on non-native platforms
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/opt-debug-jobs.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.162 src/usr.bin/make/unit-tests/Makefile:1.163
--- src/usr.bin/make/unit-tests/Makefile:1.162 Mon Oct 5 19:27:48 2020
+++ src/usr.bin/make/unit-tests/Makefile Thu Oct 8 17:54:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.162 2020/10/05 19:27:48 rillig Exp $
+# $NetBSD: Makefile,v 1.163 2020/10/08 17:54:20 rillig Exp $
#
# Unit tests for make(1)
#
@@ -414,6 +414,8 @@ SED_CMDS.opt-debug-jobs= -e 's,([0-9][0-
SED_CMDS.opt-debug-jobs+= -e 's,pid [0-9][0-9]*,pid ,'
SED_CMDS.opt-debug-jobs+= -e 's,Process [0-9][0-9]*,Process ,'
SED_CMDS.opt-debug-jobs+= -e 's,JobFinish: [0-9][0-9]*,JobFinish: ,'
+# The "-q" may be there or not, see jobs.c, variable shells.
+SED_CMDS.opt-debug-jobs+= -e 's,^\(.Command: sh\) -q,\1,'
SED_CMDS.varmod-subst-regex+= \
-e 's,\(Regex compilation error:\).*,\1 (details omitted),'
SED_CMDS.varmod-edge+= -e 's, line [0-9]*:, line omitted:,'
Index: src/usr.bin/make/unit-tests/opt-debug-jobs.exp
diff -u src/usr.bin/make/unit-tests/opt-debug-jobs.exp:1.4 src/usr.bin/make/unit-tests/opt-debug-jobs.exp:1.5
--- src/usr.bin/make/unit-tests/opt-debug-jobs.exp:1.4 Mon Oct 5 19:27:48 2020
+++ src/usr.bin/make/unit-tests/opt-debug-jobs.exp Thu Oct 8 17:54:20 2020
@@ -11,7 +11,7 @@ echo ": 'single' and \"double\" quotes"
{ : 'single' and "double" quotes
} || exit $?
Running all locally
- Command: sh -q
+ Command: sh
JobExec(all): pid added to jobs table
job table @ job started
job 0, status 3, flags 0, pid
CVS commit: [netbsd-8] src/sys/netipsec
Module Name:src
Committed By: martin
Date: Thu Oct 8 17:50:11 UTC 2020
Modified Files:
src/sys/netipsec [netbsd-8]: xform_esp.c
Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1612):
sys/netipsec/xform_esp.c: revision 1.101
Make sequence number of esp header MP-safe for IPsec Tx side. reviewed by
ozaki-r@n.o
In IPsec Tx side, one Security Association can be used by multiple CPUs.
On the other hand, in IPsec Rx side, one Security Association is used
by only one CPU.
XXX pullup-{8,9}
To generate a diff of this commit:
cvs rdiff -u -r1.55.2.3 -r1.55.2.4 src/sys/netipsec/xform_esp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/netipsec
Module Name:src
Committed By: martin
Date: Thu Oct 8 17:50:11 UTC 2020
Modified Files:
src/sys/netipsec [netbsd-8]: xform_esp.c
Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1612):
sys/netipsec/xform_esp.c: revision 1.101
Make sequence number of esp header MP-safe for IPsec Tx side. reviewed by
ozaki-r@n.o
In IPsec Tx side, one Security Association can be used by multiple CPUs.
On the other hand, in IPsec Rx side, one Security Association is used
by only one CPU.
XXX pullup-{8,9}
To generate a diff of this commit:
cvs rdiff -u -r1.55.2.3 -r1.55.2.4 src/sys/netipsec/xform_esp.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/netipsec/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.55.2.3 src/sys/netipsec/xform_esp.c:1.55.2.4
--- src/sys/netipsec/xform_esp.c:1.55.2.3 Fri Mar 30 11:53:13 2018
+++ src/sys/netipsec/xform_esp.c Thu Oct 8 17:50:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_esp.c,v 1.55.2.3 2018/03/30 11:53:13 martin Exp $ */
+/* $NetBSD: xform_esp.c,v 1.55.2.4 2020/10/08 17:50:11 martin Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.55.2.3 2018/03/30 11:53:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.55.2.4 2020/10/08 17:50:11 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -804,11 +804,12 @@ esp_output(struct mbuf *m, const struct
#ifdef IPSEC_DEBUG
/* Emulate replay attack when ipsec_replay is TRUE. */
- if (!ipsec_replay)
+ if (ipsec_replay)
+ replay = htonl(sav->replay->count);
+ else
#endif
- sav->replay->count++;
+ replay = htonl(atomic_inc_32_nv(>replay->count));
- replay = htonl(sav->replay->count);
memcpy(mtod(mo,char *) + roff + sizeof(uint32_t), ,
sizeof(uint32_t));
}
CVS commit: [netbsd-9] src/sys/netipsec
Module Name:src
Committed By: martin
Date: Thu Oct 8 17:49:03 UTC 2020
Modified Files:
src/sys/netipsec [netbsd-9]: xform_esp.c
Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1103):
sys/netipsec/xform_esp.c: revision 1.101
Make sequence number of esp header MP-safe for IPsec Tx side. reviewed by
ozaki-r@n.o
In IPsec Tx side, one Security Association can be used by multiple CPUs.
On the other hand, in IPsec Rx side, one Security Association is used
by only one CPU.
XXX pullup-{8,9}
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.98.2.1 src/sys/netipsec/xform_esp.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/netipsec/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.98 src/sys/netipsec/xform_esp.c:1.98.2.1
--- src/sys/netipsec/xform_esp.c:1.98 Wed Jun 12 22:23:50 2019
+++ src/sys/netipsec/xform_esp.c Thu Oct 8 17:49:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_esp.c,v 1.98 2019/06/12 22:23:50 christos Exp $ */
+/* $NetBSD: xform_esp.c,v 1.98.2.1 2020/10/08 17:49:03 martin Exp $ */
/* $FreeBSD: xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.98 2019/06/12 22:23:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.98.2.1 2020/10/08 17:49:03 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -796,11 +796,12 @@ esp_output(struct mbuf *m, const struct
#ifdef IPSEC_DEBUG
/* Emulate replay attack when ipsec_replay is TRUE. */
- if (!ipsec_replay)
+ if (ipsec_replay)
+ replay = htonl(sav->replay->count);
+ else
#endif
- sav->replay->count++;
+ replay = htonl(atomic_inc_32_nv(>replay->count));
- replay = htonl(sav->replay->count);
memcpy(mtod(mo,char *) + roff + sizeof(uint32_t), ,
sizeof(uint32_t));
}
CVS commit: [netbsd-9] src/sys/netipsec
Module Name:src
Committed By: martin
Date: Thu Oct 8 17:49:03 UTC 2020
Modified Files:
src/sys/netipsec [netbsd-9]: xform_esp.c
Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1103):
sys/netipsec/xform_esp.c: revision 1.101
Make sequence number of esp header MP-safe for IPsec Tx side. reviewed by
ozaki-r@n.o
In IPsec Tx side, one Security Association can be used by multiple CPUs.
On the other hand, in IPsec Rx side, one Security Association is used
by only one CPU.
XXX pullup-{8,9}
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.98.2.1 src/sys/netipsec/xform_esp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-8] src/etc
Module Name:src Committed By: martin Date: Thu Oct 8 16:55:22 UTC 2020 Modified Files: src/etc [netbsd-8]: ntp.conf Log Message: Pull up following revision(s) (requested by kim in ticket #1611): etc/ntp.conf: revision 1.21 etc/ntp.conf: revision 1.22 Use "pool" for the pool.ntp.org servers. Add some new hints. - Use the "pool" keyword for obtaining servers from ntp.pool.org. - Add "tos minclock" and "tos maxclock" to limit the number of servers. - Add "restrict source" to apply appropriate restrictions to servers. (Specifically "nopeer" cannot be applied to "pool" servers.) - A single "pool" entry suffices -- using "2.netbsd.pool.ntp.org" so that we get both IPv4 and IPv6 addresses. (No addresses are returned for just "netbsd.pool.ntp.org.") - Add a comment about "tinker panic 0" -- useful for VMs and laptops. - Add a comment about "discard minimum" -- useful for some SNTP clients. - Add an explanation for the "limited" restriction keyword. - Unify whitespace and comment formatting. Add iburst to peer and server. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.6.1 src/etc/ntp.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/etc
Module Name:src Committed By: martin Date: Thu Oct 8 16:55:22 UTC 2020 Modified Files: src/etc [netbsd-8]: ntp.conf Log Message: Pull up following revision(s) (requested by kim in ticket #1611): etc/ntp.conf: revision 1.21 etc/ntp.conf: revision 1.22 Use "pool" for the pool.ntp.org servers. Add some new hints. - Use the "pool" keyword for obtaining servers from ntp.pool.org. - Add "tos minclock" and "tos maxclock" to limit the number of servers. - Add "restrict source" to apply appropriate restrictions to servers. (Specifically "nopeer" cannot be applied to "pool" servers.) - A single "pool" entry suffices -- using "2.netbsd.pool.ntp.org" so that we get both IPv4 and IPv6 addresses. (No addresses are returned for just "netbsd.pool.ntp.org.") - Add a comment about "tinker panic 0" -- useful for VMs and laptops. - Add a comment about "discard minimum" -- useful for some SNTP clients. - Add an explanation for the "limited" restriction keyword. - Unify whitespace and comment formatting. Add iburst to peer and server. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.6.1 src/etc/ntp.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ntp.conf diff -u src/etc/ntp.conf:1.20 src/etc/ntp.conf:1.20.6.1 --- src/etc/ntp.conf:1.20 Mon Jan 9 20:05:29 2017 +++ src/etc/ntp.conf Thu Oct 8 16:55:22 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ntp.conf,v 1.20 2017/01/09 20:05:29 christos Exp $ +# $NetBSD: ntp.conf,v 1.20.6.1 2020/10/08 16:55:22 martin Exp $ # # NetBSD default Network Time Protocol (NTP) configuration file for ntpd @@ -8,34 +8,52 @@ # other guides, may be found on the official NTP web site, in particular # # http://www.ntp.org/documentation.html -# # Process ID file, so that the daemon can be signalled from scripts -pidfile /var/run/ntpd.pid +pidfile /var/run/ntpd.pid + +# Don't give up even if the reference time is hugely different. This can +# happen if the system was suspended and resumed. + +#tinker panic 0 # The correction calculated by ntpd(8) for the local system clock's # drift is stored here. -driftfile /var/db/ntp.drift +driftfile /var/db/ntp.drift # Suppress the syslog(3) message for each peer synchronization change. -logconfig -syncstatus +logconfig -syncstatus # Refuse to set the local clock if there are too few good peers or servers. # This may help minimize disruptions due to network congestion. Don't # do this if you configure only one server! -tos minsane 2 +tos minsane 2 + +# Set the target and limit for adding servers configured via pool statements +# or discovered dynamically via mechanisms such as broadcast and manycast. +# Ntpd automatically adds maxclock-1 servers from configured pools, and may +# add as many as maxclock*2 if necessary to ensure that at least minclock +# servers are providing good consistent time. + +tos minclock 3 maxclock 6 # Set the number of tries to register with mdns. 0 means never -# -mdnstries 0 + +mdnstries 0 # New ntpd disables the ntpdc protocol by default, to re-enable uncomment # the following line -# enable mode7 + +#enable mode7 + +# Allow hasty ntpdate clients to avoid rate limiting / kod responses. +# The default is 2 seconds between packets from the client. + +#discard minimum 1 # Access control restrictions. # See /usr/share/doc/html/ntp/accopt.html for syntax. @@ -44,10 +62,13 @@ mdnstries 0 # # Some of the more common keywords are: # ignore Deny packets of all kinds. -# kod Send "kiss-o'-death" packets if clients exceed rate -# limits. -# nomodifyDeny attempts to modify the state of the server via -# ntpq or ntpdc queries. +# limited Deny time service if the packet violates the rate limits +# established by the discard command. Does not affect ntpq or +# ntpdc queries. +# kod Send "kiss-o'-death" packets if clients exceed rate limits. +# No affect without the limited flag. +# nomodifyDeny attempts to modify the state of the server via ntpq or +# ntpdc queries. # noquery Deny all ntpq and ntpdc queries. Does not affect time # synchronisation. # nopeer Prevent establishing new peer associations. @@ -61,22 +82,26 @@ mdnstries 0 # By default, allow client/server time exchange without prior # arrangement, but deny configuration changes, queries, and peer # associations that were not explicitly configured. -# -restrict default kod limited nopeer noquery + +restrict default limited kod nomodify notrap nopeer noquery + +# Restrictions used for associations (peer, server, pool). + +restrict source nomodify notrap noquery # Fewer restrictions for the local subnet. # (Uncomment and adjust as appropriate.) -# -#restrict 192.0.2.0 mask 255.255.255.0 kod limited nomodify notrap nopeer
CVS commit: [netbsd-9] src/etc
Module Name:src Committed By: martin Date: Thu Oct 8 16:53:57 UTC 2020 Modified Files: src/etc [netbsd-9]: ntp.conf Log Message: Pull up following revision(s) (requested by kim in ticket #1102): etc/ntp.conf: revision 1.21 etc/ntp.conf: revision 1.22 Use "pool" for the pool.ntp.org servers. Add some new hints. - Use the "pool" keyword for obtaining servers from ntp.pool.org. - Add "tos minclock" and "tos maxclock" to limit the number of servers. - Add "restrict source" to apply appropriate restrictions to servers. (Specifically "nopeer" cannot be applied to "pool" servers.) - A single "pool" entry suffices -- using "2.netbsd.pool.ntp.org" so that we get both IPv4 and IPv6 addresses. (No addresses are returned for just "netbsd.pool.ntp.org.") - Add a comment about "tinker panic 0" -- useful for VMs and laptops. - Add a comment about "discard minimum" -- useful for some SNTP clients. - Add an explanation for the "limited" restriction keyword. - Unify whitespace and comment formatting. Add iburst to peer and server. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.16.1 src/etc/ntp.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ntp.conf diff -u src/etc/ntp.conf:1.20 src/etc/ntp.conf:1.20.16.1 --- src/etc/ntp.conf:1.20 Mon Jan 9 20:05:29 2017 +++ src/etc/ntp.conf Thu Oct 8 16:53:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ntp.conf,v 1.20 2017/01/09 20:05:29 christos Exp $ +# $NetBSD: ntp.conf,v 1.20.16.1 2020/10/08 16:53:57 martin Exp $ # # NetBSD default Network Time Protocol (NTP) configuration file for ntpd @@ -8,34 +8,52 @@ # other guides, may be found on the official NTP web site, in particular # # http://www.ntp.org/documentation.html -# # Process ID file, so that the daemon can be signalled from scripts -pidfile /var/run/ntpd.pid +pidfile /var/run/ntpd.pid + +# Don't give up even if the reference time is hugely different. This can +# happen if the system was suspended and resumed. + +#tinker panic 0 # The correction calculated by ntpd(8) for the local system clock's # drift is stored here. -driftfile /var/db/ntp.drift +driftfile /var/db/ntp.drift # Suppress the syslog(3) message for each peer synchronization change. -logconfig -syncstatus +logconfig -syncstatus # Refuse to set the local clock if there are too few good peers or servers. # This may help minimize disruptions due to network congestion. Don't # do this if you configure only one server! -tos minsane 2 +tos minsane 2 + +# Set the target and limit for adding servers configured via pool statements +# or discovered dynamically via mechanisms such as broadcast and manycast. +# Ntpd automatically adds maxclock-1 servers from configured pools, and may +# add as many as maxclock*2 if necessary to ensure that at least minclock +# servers are providing good consistent time. + +tos minclock 3 maxclock 6 # Set the number of tries to register with mdns. 0 means never -# -mdnstries 0 + +mdnstries 0 # New ntpd disables the ntpdc protocol by default, to re-enable uncomment # the following line -# enable mode7 + +#enable mode7 + +# Allow hasty ntpdate clients to avoid rate limiting / kod responses. +# The default is 2 seconds between packets from the client. + +#discard minimum 1 # Access control restrictions. # See /usr/share/doc/html/ntp/accopt.html for syntax. @@ -44,10 +62,13 @@ mdnstries 0 # # Some of the more common keywords are: # ignore Deny packets of all kinds. -# kod Send "kiss-o'-death" packets if clients exceed rate -# limits. -# nomodifyDeny attempts to modify the state of the server via -# ntpq or ntpdc queries. +# limited Deny time service if the packet violates the rate limits +# established by the discard command. Does not affect ntpq or +# ntpdc queries. +# kod Send "kiss-o'-death" packets if clients exceed rate limits. +# No affect without the limited flag. +# nomodifyDeny attempts to modify the state of the server via ntpq or +# ntpdc queries. # noquery Deny all ntpq and ntpdc queries. Does not affect time # synchronisation. # nopeer Prevent establishing new peer associations. @@ -61,22 +82,26 @@ mdnstries 0 # By default, allow client/server time exchange without prior # arrangement, but deny configuration changes, queries, and peer # associations that were not explicitly configured. -# -restrict default kod limited nopeer noquery + +restrict default limited kod nomodify notrap nopeer noquery + +# Restrictions used for associations (peer, server, pool). + +restrict source nomodify notrap noquery # Fewer restrictions for the local subnet. # (Uncomment and adjust as appropriate.) -# -#restrict 192.0.2.0 mask 255.255.255.0 kod limited nomodify notrap nopeer
CVS commit: [netbsd-9] src/etc
Module Name:src Committed By: martin Date: Thu Oct 8 16:53:57 UTC 2020 Modified Files: src/etc [netbsd-9]: ntp.conf Log Message: Pull up following revision(s) (requested by kim in ticket #1102): etc/ntp.conf: revision 1.21 etc/ntp.conf: revision 1.22 Use "pool" for the pool.ntp.org servers. Add some new hints. - Use the "pool" keyword for obtaining servers from ntp.pool.org. - Add "tos minclock" and "tos maxclock" to limit the number of servers. - Add "restrict source" to apply appropriate restrictions to servers. (Specifically "nopeer" cannot be applied to "pool" servers.) - A single "pool" entry suffices -- using "2.netbsd.pool.ntp.org" so that we get both IPv4 and IPv6 addresses. (No addresses are returned for just "netbsd.pool.ntp.org.") - Add a comment about "tinker panic 0" -- useful for VMs and laptops. - Add a comment about "discard minimum" -- useful for some SNTP clients. - Add an explanation for the "limited" restriction keyword. - Unify whitespace and comment formatting. Add iburst to peer and server. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.16.1 src/etc/ntp.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/share/man/man8
Module Name:src
Committed By: martin
Date: Thu Oct 8 16:49:37 UTC 2020
Modified Files:
src/share/man/man8 [netbsd-9]: afterboot.8
Log Message:
Pull up following revision(s) (requested by nia in ticket #1101):
share/man/man8/afterboot.8: revision 1.74
ifconfig up before doing wifi stuff
To generate a diff of this commit:
cvs rdiff -u -r1.62.2.1 -r1.62.2.2 src/share/man/man8/afterboot.8
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/man8/afterboot.8
diff -u src/share/man/man8/afterboot.8:1.62.2.1 src/share/man/man8/afterboot.8:1.62.2.2
--- src/share/man/man8/afterboot.8:1.62.2.1 Thu Aug 27 09:12:52 2020
+++ src/share/man/man8/afterboot.8 Thu Oct 8 16:49:37 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: afterboot.8,v 1.62.2.1 2020/08/27 09:12:52 martin Exp $
+.\" $NetBSD: afterboot.8,v 1.62.2.2 2020/10/08 16:49:37 martin Exp $
.\" $OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $
.\"
.\" Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu
@@ -59,7 +59,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 August 24, 2020
+.Dd October 5, 2020
.Dt AFTERBOOT 8
.Os
.Sh NAME
@@ -450,8 +450,9 @@ network={
}
.Ed
.Pp
-Then start the necessary daemons:
+Then bring up the interface and start the necessary daemons:
.Bd -literal -offset indent
+.Ic ifconfig iwm0 up
.Ic service wpa_supplicant onestart
.Ic service dhcpcd onestart
.Ed
@@ -459,6 +460,7 @@ Then start the necessary daemons:
To automatically connect at boot, add the following to
.Pa /etc/rc.conf :
.Pp
+.Dl ifconfig_iwm0="up"
.Dl dhcpcd=YES
.Dl wpa_supplicant=YES
.Pp
CVS commit: [netbsd-9] src/share/man/man8
Module Name:src Committed By: martin Date: Thu Oct 8 16:49:37 UTC 2020 Modified Files: src/share/man/man8 [netbsd-9]: afterboot.8 Log Message: Pull up following revision(s) (requested by nia in ticket #1101): share/man/man8/afterboot.8: revision 1.74 ifconfig up before doing wifi stuff To generate a diff of this commit: cvs rdiff -u -r1.62.2.1 -r1.62.2.2 src/share/man/man8/afterboot.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Thu Oct 8 16:47:12 UTC 2020 Modified Files: src/share/man/man4 [netbsd-9]: pms.4 src/sys/dev/pckbport [netbsd-9]: synaptics.c Log Message: Pull up following revision(s) (requested by nia in ticket #1100): sys/dev/pckbport/synaptics.c: revision 1.69 sys/dev/pckbport/synaptics.c: revision 1.70 share/man/man4/pms.4: revision 1.38 erect a signpost for weary travellers synaptics: Emulate scrolling when the middle button is held with TrackPoints idea stolen from various other operating systems. this configurable with a sysctl in case somebody wants to hold the middle button, e.g. with old window managers that close menus when a button is released. To generate a diff of this commit: cvs rdiff -u -r1.32.2.1 -r1.32.2.2 src/share/man/man4/pms.4 cvs rdiff -u -r1.50.2.6 -r1.50.2.7 src/sys/dev/pckbport/synaptics.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Thu Oct 8 16:47:12 UTC 2020
Modified Files:
src/share/man/man4 [netbsd-9]: pms.4
src/sys/dev/pckbport [netbsd-9]: synaptics.c
Log Message:
Pull up following revision(s) (requested by nia in ticket #1100):
sys/dev/pckbport/synaptics.c: revision 1.69
sys/dev/pckbport/synaptics.c: revision 1.70
share/man/man4/pms.4: revision 1.38
erect a signpost for weary travellers
synaptics: Emulate scrolling when the middle button is held with TrackPoints
idea stolen from various other operating systems.
this configurable with a sysctl in case somebody wants to hold the middle
button, e.g. with old window managers that close menus when a button is
released.
To generate a diff of this commit:
cvs rdiff -u -r1.32.2.1 -r1.32.2.2 src/share/man/man4/pms.4
cvs rdiff -u -r1.50.2.6 -r1.50.2.7 src/sys/dev/pckbport/synaptics.c
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/pms.4
diff -u src/share/man/man4/pms.4:1.32.2.1 src/share/man/man4/pms.4:1.32.2.2
--- src/share/man/man4/pms.4:1.32.2.1 Mon Mar 30 18:45:16 2020
+++ src/share/man/man4/pms.4 Thu Oct 8 16:47:12 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: pms.4,v 1.32.2.1 2020/03/30 18:45:16 martin Exp $
+.\" $NetBSD: pms.4,v 1.32.2.2 2020/10/08 16:47:12 martin Exp $
.\"
.\" Copyright (c) 1993 Christopher G. Demetriou
.\" All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" <>
.\"
-.Dd March 30, 2020
+.Dd October 1, 2020
.Dt PMS 4
.Os
.Sh NAME
@@ -215,6 +215,10 @@ If this variable is set too high then mo
as Z-axis events after the two finger scoll has finished.
If the variable is set too low then there will be mouse movements observed
during the two finger scroll.
+.It Dv hw.synaptics.aux_mid_button_scroll
+This causes Y-axis movement on the "passthrough device" (e.g. the TrackPoint
+on ThinkPads) to result in scrolling events instead of Y-axis movement when
+the middle button is held.
.El
.Pp
The following
Index: src/sys/dev/pckbport/synaptics.c
diff -u src/sys/dev/pckbport/synaptics.c:1.50.2.6 src/sys/dev/pckbport/synaptics.c:1.50.2.7
--- src/sys/dev/pckbport/synaptics.c:1.50.2.6 Sat Jun 20 13:53:14 2020
+++ src/sys/dev/pckbport/synaptics.c Thu Oct 8 16:47:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.50.2.6 2020/06/20 13:53:14 martin Exp $ */
+/* $NetBSD: synaptics.c,v 1.50.2.7 2020/10/08 16:47:12 martin Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
#include "opt_pms.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.50.2.6 2020/06/20 13:53:14 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.50.2.7 2020/10/08 16:47:12 martin Exp $");
#include
#include
@@ -124,6 +124,7 @@ static int synaptics_fscroll_min = 13;
static int synaptics_fscroll_max = 14;
static int synaptics_dz_hold = 30;
static int synaptics_movement_enable = 1;
+static bool synaptics_aux_mid_button_scroll = TRUE;
/* Sysctl nodes. */
static int synaptics_button_boundary_nodenum;
@@ -152,6 +153,7 @@ static int synaptics_finger_scroll_min_n
static int synaptics_finger_scroll_max_nodenum;
static int synaptics_dz_hold_nodenum;
static int synaptics_movement_enable_nodenum;
+static int synaptics_aux_mid_button_scroll_nodenum;
static int
synaptics_poll_cmd(struct pms_softc *psc, ...)
@@ -830,6 +832,18 @@ pms_sysctl_synaptics(struct sysctllog **
goto err;
synaptics_dz_hold_nodenum = node->sysctl_num;
+
+ if ((rc = sysctl_createv(clog, 0, NULL, ,
+ CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
+ CTLTYPE_BOOL, "aux_mid_button_scroll",
+ SYSCTL_DESCR("Interpet Y-Axis movement with the middle button held as scrolling on the passthrough device (e.g. TrackPoint)"),
+ pms_sysctl_synaptics_verify, 0,
+ _aux_mid_button_scroll,
+ 0, CTL_HW, root_num, CTL_CREATE,
+ CTL_EOL)) != 0)
+ goto err;
+
+ synaptics_aux_mid_button_scroll_nodenum = node->sysctl_num;
return;
err:
@@ -923,6 +937,10 @@ pms_sysctl_synaptics_verify(SYSCTLFN_ARG
if (t < 0 || t > 1)
return (EINVAL);
} else
+ if (node.sysctl_num == synaptics_aux_mid_button_scroll_nodenum) {
+ if (t < 0 || t > 1)
+ return (EINVAL);
+ } else
return (EINVAL);
*(int *)rnode->sysctl_data = t;
@@ -1140,6 +1158,10 @@ pms_synaptics_parse(struct pms_softc *ps
pms_synaptics_process_packet(psc, );
}
+/*
+ * Passthrough is used for e.g. TrackPoints and additional pointing
+ * devices connected to a Synaptics touchpad.
+ */
static void
pms_synaptics_passthrough(struct pms_softc *psc)
{
@@ -1169,6 +1191,15 @@ pms_synaptics_passthrough(struct pms_sof
psc->buttons ^= changed;
if (dx || dy || dz || changed) {
+ /*
+ * If the middle button is held, interpret Y-axis
+ * movement as scrolling.
+ */
+ if (synaptics_aux_mid_button_scroll &&
+ dy && (psc->buttons & 0x2)) {
+ dz = -dy;
+ dx = dy = 0;
+ }
buttons = (psc->buttons &
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Thu Oct 8 16:04:07 UTC 2020
Modified Files:
src/distrib/sets/lists/xbase [netbsd-9]: mi
src/external/mit/ctwm [netbsd-9]: Makefile
src/external/mit/ctwm/bin/ctwm [netbsd-9]: Makefile
Added Files:
src/external/mit/ctwm/etc [netbsd-9]: Makefile system.ctwmrc
src/external/mit/ctwm/libexec [netbsd-9]: Makefile ctwm_app_menu
Log Message:
Pull up following revision(s) (requested by nia in ticket #1099):
external/mit/ctwm/libexec/Makefile: revision 1.1
external/mit/ctwm/bin/ctwm/Makefile: revision 1.6
external/mit/ctwm/bin/ctwm/Makefile: revision 1.7
external/mit/ctwm/bin/ctwm/Makefile: revision 1.8
external/mit/ctwm/libexec/ctwm_app_menu: revision 1.1
distrib/sets/lists/xbase/mi: revision 1.157
external/mit/ctwm/Makefile: revision 1.2
external/mit/ctwm/Makefile: revision 1.3
external/mit/ctwm/Makefile: revision 1.4
external/mit/ctwm/Makefile: revision 1.5
external/mit/ctwm/etc/system.ctwmrc: revision 1.1
external/mit/ctwm/etc/Makefile: revision 1.1
external/mit/ctwm/etc/Makefile: revision 1.2
add a script for dynamically generating a menu in the ctwm desktop
this parses the files in /usr/pkg/share/applications and provides a
submenu for launching applications.
TODO: make /usr/pkg configurable somehow?
move the new ctwmrc here so it doesn't conflict with the upstream one
revert; use system.ctwmrc from xsrc until I understand why the build fails
unbreak. bsd.files.mk needs to have an includes target, see also
share/wscons/fonts/Makefile
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.152.2.1 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.1 -r1.1.18.1 src/external/mit/ctwm/Makefile
cvs rdiff -u -r1.5 -r1.5.4.1 src/external/mit/ctwm/bin/ctwm/Makefile
cvs rdiff -u -r0 -r1.2.2.2 src/external/mit/ctwm/etc/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/external/mit/ctwm/etc/system.ctwmrc
cvs rdiff -u -r0 -r1.1.2.2 src/external/mit/ctwm/libexec/Makefile \
src/external/mit/ctwm/libexec/ctwm_app_menu
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/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.152 src/distrib/sets/lists/xbase/mi:1.152.2.1
--- src/distrib/sets/lists/xbase/mi:1.152 Thu Jun 20 12:09:28 2019
+++ src/distrib/sets/lists/xbase/mi Thu Oct 8 16:04:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.152 2019/06/20 12:09:28 uki Exp $
+# $NetBSD: mi,v 1.152.2.1 2020/10/08 16:04:07 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1260,6 +1260,7 @@
./usr/X11R7/lib/xorg/protocol.txt -unknown- xorg
./usr/X11R7/libexec base-x11-root xorg
./usr/X11R7/libexec/chooser-unknown- xorg
+./usr/X11R7/libexec/ctwm_app_menu -unknown- xorg
./usr/X11R7/man base-x11-root xorg
./usr/X11R7/man/cat1 base-x11-root xorg
./usr/X11R7/man/cat1/appres.0-unknown- .cat,xorg
Index: src/external/mit/ctwm/Makefile
diff -u src/external/mit/ctwm/Makefile:1.1 src/external/mit/ctwm/Makefile:1.1.18.1
--- src/external/mit/ctwm/Makefile:1.1 Thu Sep 3 22:24:02 2015
+++ src/external/mit/ctwm/Makefile Thu Oct 8 16:04:07 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2015/09/03 22:24:02 youri Exp $
+# $NetBSD: Makefile,v 1.1.18.1 2020/10/08 16:04:07 martin Exp $
# Top level Makefile to cross build xorg inside the NetBSD tree.
.include
-SUBDIR= bin
+SUBDIR= bin etc libexec
.if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
BUILDTARGETS+= cleandir
Index: src/external/mit/ctwm/bin/ctwm/Makefile
diff -u src/external/mit/ctwm/bin/ctwm/Makefile:1.5 src/external/mit/ctwm/bin/ctwm/Makefile:1.5.4.1
--- src/external/mit/ctwm/bin/ctwm/Makefile:1.5 Sun Mar 18 11:40:41 2018
+++ src/external/mit/ctwm/bin/ctwm/Makefile Thu Oct 8 16:04:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/03/18 11:40:41 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5.4.1 2020/10/08 16:04:07 martin Exp $
.include
@@ -44,10 +44,7 @@ FILES= 3D_Expand15.xpm 3D_Iconify15.xp
xedit.xpm xftp.xpm xgopher.xpm xgrab.xpm xhpcalc.xpm \
xirc.xpm xmail.xpm xman.xpm xmosaic.xpm xnomail.xpm \
xrn-compose.xpm xrn.goodnews.xpm xrn.nonews.xpm xrn.xpm \
- xterm.xpm system.ctwmrc
-
-FILESDIR_system.ctwmrc = ${CTWMCONFIGDIR}
-
+ xterm.xpm
LDADD+= -lXpm -lXmu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXPM} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
Added files:
Index: src/external/mit/ctwm/etc/Makefile
diff -u /dev/null src/external/mit/ctwm/etc/Makefile:1.2.2.2
--- /dev/null Thu Oct 8 16:04:07 2020
+++ src/external/mit/ctwm/etc/Makefile Thu Oct 8 16:04:07 2020
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.2.2.2 2020/10/08 16:04:07 martin Exp $
+
+FILESDIR= ${X11ETCDIR}/ctwm
+FILESMODE= 644
+FILES= system.ctwmrc
+
+realall: ${FILES}
+
+.include
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Thu Oct 8 16:04:07 UTC 2020 Modified Files: src/distrib/sets/lists/xbase [netbsd-9]: mi src/external/mit/ctwm [netbsd-9]: Makefile src/external/mit/ctwm/bin/ctwm [netbsd-9]: Makefile Added Files: src/external/mit/ctwm/etc [netbsd-9]: Makefile system.ctwmrc src/external/mit/ctwm/libexec [netbsd-9]: Makefile ctwm_app_menu Log Message: Pull up following revision(s) (requested by nia in ticket #1099): external/mit/ctwm/libexec/Makefile: revision 1.1 external/mit/ctwm/bin/ctwm/Makefile: revision 1.6 external/mit/ctwm/bin/ctwm/Makefile: revision 1.7 external/mit/ctwm/bin/ctwm/Makefile: revision 1.8 external/mit/ctwm/libexec/ctwm_app_menu: revision 1.1 distrib/sets/lists/xbase/mi: revision 1.157 external/mit/ctwm/Makefile: revision 1.2 external/mit/ctwm/Makefile: revision 1.3 external/mit/ctwm/Makefile: revision 1.4 external/mit/ctwm/Makefile: revision 1.5 external/mit/ctwm/etc/system.ctwmrc: revision 1.1 external/mit/ctwm/etc/Makefile: revision 1.1 external/mit/ctwm/etc/Makefile: revision 1.2 add a script for dynamically generating a menu in the ctwm desktop this parses the files in /usr/pkg/share/applications and provides a submenu for launching applications. TODO: make /usr/pkg configurable somehow? move the new ctwmrc here so it doesn't conflict with the upstream one revert; use system.ctwmrc from xsrc until I understand why the build fails unbreak. bsd.files.mk needs to have an includes target, see also share/wscons/fonts/Makefile To generate a diff of this commit: cvs rdiff -u -r1.152 -r1.152.2.1 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.1 -r1.1.18.1 src/external/mit/ctwm/Makefile cvs rdiff -u -r1.5 -r1.5.4.1 src/external/mit/ctwm/bin/ctwm/Makefile cvs rdiff -u -r0 -r1.2.2.2 src/external/mit/ctwm/etc/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/external/mit/ctwm/etc/system.ctwmrc cvs rdiff -u -r0 -r1.1.2.2 src/external/mit/ctwm/libexec/Makefile \ src/external/mit/ctwm/libexec/ctwm_app_menu Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssl/include/openssl
Module Name:src
Committed By: jakllsch
Date: Thu Oct 8 16:00:09 UTC 2020
Modified Files:
src/crypto/external/bsd/openssl/include/openssl: opensslconf.h
Log Message:
openssl: Define OPENSSL_NO_EC_NISTP_64_GCC_128 for Alpha too
The ecp_nistp521.c code depends on doing unaligned 64-bit accesses,
which the NetBSD/alpha kernel doesn't like to trap and emulate.
fixes PR lib/55701
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/include/openssl/opensslconf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/include/openssl/opensslconf.h
diff -u src/crypto/external/bsd/openssl/include/openssl/opensslconf.h:1.7 src/crypto/external/bsd/openssl/include/openssl/opensslconf.h:1.8
--- src/crypto/external/bsd/openssl/include/openssl/opensslconf.h:1.7 Sat Dec 8 17:07:27 2018
+++ src/crypto/external/bsd/openssl/include/openssl/opensslconf.h Thu Oct 8 16:00:09 2020
@@ -50,7 +50,7 @@ extern "C" {
# define OPENSSL_NO_DEVCRYPTOENG
# endif
#endif
-#if !defined(_LP64) || defined(__sparc64__)
+#if !defined(_LP64) || defined(__alpha__) || defined(__sparc64__)
# ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
# define OPENSSL_NO_EC_NISTP_64_GCC_128
# endif
CVS commit: src/crypto/external/bsd/openssl/include/openssl
Module Name:src Committed By: jakllsch Date: Thu Oct 8 16:00:09 UTC 2020 Modified Files: src/crypto/external/bsd/openssl/include/openssl: opensslconf.h Log Message: openssl: Define OPENSSL_NO_EC_NISTP_64_GCC_128 for Alpha too The ecp_nistp521.c code depends on doing unaligned 64-bit accesses, which the NetBSD/alpha kernel doesn't like to trap and emulate. fixes PR lib/55701 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/include/openssl/opensslconf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] xsrc/external/mit
Module Name:xsrc Committed By: martin Date: Thu Oct 8 15:52:11 UTC 2020 Modified Files: xsrc/external/mit/xdm/dist/config [netbsd-9]: Xsession.in xsrc/external/mit/xinit/dist [netbsd-9]: xinitrc.cpp xsrc/external/mit/xsm/dist [netbsd-9]: system.xsm Log Message: Pull up following revision(s) (requested by nia in ticket #1099-x.req): external/mit/xdm/dist/config/Xsession.in: revision 1.2 external/mit/xdm/dist/config/Xsession.in: revision 1.3 external/mit/xdm/dist/config/Xsession.in: revision 1.4 external/mit/xdm/dist/config/Xsession.in: revision 1.5 external/mit/xinit/dist/xinitrc.cpp: revision 1.5 external/mit/xinit/dist/xinitrc.cpp: revision 1.6 external/mit/xsm/dist/system.xsm: revision 1.2 external/mit/xinit/dist/xinitrc.cpp: revision 1.7 make the default xinitrc a bit nicer spawn only one xterm in unicode mode and use ctwm instead of twm ctwm is a backwards compatible fork of twm that includes some extra features like virtual desktops spawn ctwm in the default xdm Xsession turn off the ctwm "welcome" screen while this is nice for Branding(tm), it adds a slight delay to startup, which is slightly annoying, and a departure from how we've done things previously. update the default xsm session to ctwm/uxterm remove redundant $ Slightly nicer default colors for various X11 apps To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \ xsrc/external/mit/xdm/dist/config/Xsession.in cvs rdiff -u -r1.4 -r1.4.4.1 xsrc/external/mit/xinit/dist/xinitrc.cpp cvs rdiff -u -r1.1.1.1 -r1.1.1.1.26.1 xsrc/external/mit/xsm/dist/system.xsm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xdm/dist/config/Xsession.in diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.1.1.1 xsrc/external/mit/xdm/dist/config/Xsession.in:1.1.1.1.2.1 --- xsrc/external/mit/xdm/dist/config/Xsession.in:1.1.1.1 Tue Mar 5 08:26:49 2019 +++ xsrc/external/mit/xdm/dist/config/Xsession.in Thu Oct 8 15:52:11 2020 @@ -61,6 +61,15 @@ if [ -s "$startup" ]; then else if [ -r "$resources" ]; then BINDIR/xrdb -load "$resources" + else + BINDIR/xrdb -load - <
CVS commit: [netbsd-9] xsrc/external/mit
Module Name:xsrc Committed By: martin Date: Thu Oct 8 15:52:11 UTC 2020 Modified Files: xsrc/external/mit/xdm/dist/config [netbsd-9]: Xsession.in xsrc/external/mit/xinit/dist [netbsd-9]: xinitrc.cpp xsrc/external/mit/xsm/dist [netbsd-9]: system.xsm Log Message: Pull up following revision(s) (requested by nia in ticket #1099-x.req): external/mit/xdm/dist/config/Xsession.in: revision 1.2 external/mit/xdm/dist/config/Xsession.in: revision 1.3 external/mit/xdm/dist/config/Xsession.in: revision 1.4 external/mit/xdm/dist/config/Xsession.in: revision 1.5 external/mit/xinit/dist/xinitrc.cpp: revision 1.5 external/mit/xinit/dist/xinitrc.cpp: revision 1.6 external/mit/xsm/dist/system.xsm: revision 1.2 external/mit/xinit/dist/xinitrc.cpp: revision 1.7 make the default xinitrc a bit nicer spawn only one xterm in unicode mode and use ctwm instead of twm ctwm is a backwards compatible fork of twm that includes some extra features like virtual desktops spawn ctwm in the default xdm Xsession turn off the ctwm "welcome" screen while this is nice for Branding(tm), it adds a slight delay to startup, which is slightly annoying, and a departure from how we've done things previously. update the default xsm session to ctwm/uxterm remove redundant $ Slightly nicer default colors for various X11 apps To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \ xsrc/external/mit/xdm/dist/config/Xsession.in cvs rdiff -u -r1.4 -r1.4.4.1 xsrc/external/mit/xinit/dist/xinitrc.cpp cvs rdiff -u -r1.1.1.1 -r1.1.1.1.26.1 xsrc/external/mit/xsm/dist/system.xsm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/external/mit/xorg/bin/xeyes
Module Name:src Committed By: martin Date: Thu Oct 8 15:43:15 UTC 2020 Modified Files: src/external/mit/xorg/bin/xeyes [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by nia in ticket #1098): external/mit/xorg/bin/xeyes/Makefile: revision 1.3 xeyes: Enable anti-aliasing with XRENDER If you prefer the "classic" look, "xeyes +render" To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.4.1 src/external/mit/xorg/bin/xeyes/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/external/mit/xorg/bin/xeyes
Module Name:src
Committed By: martin
Date: Thu Oct 8 15:43:15 UTC 2020
Modified Files:
src/external/mit/xorg/bin/xeyes [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by nia in ticket #1098):
external/mit/xorg/bin/xeyes/Makefile: revision 1.3
xeyes: Enable anti-aliasing with XRENDER
If you prefer the "classic" look, "xeyes +render"
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.4.1 src/external/mit/xorg/bin/xeyes/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xeyes/Makefile
diff -u src/external/mit/xorg/bin/xeyes/Makefile:1.2 src/external/mit/xorg/bin/xeyes/Makefile:1.2.4.1
--- src/external/mit/xorg/bin/xeyes/Makefile:1.2 Sun Mar 11 08:21:24 2018
+++ src/external/mit/xorg/bin/xeyes/Makefile Thu Oct 8 15:43:15 2020
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2018/03/11 08:21:24 mrg Exp $
+# $NetBSD: Makefile,v 1.2.4.1 2020/10/08 15:43:15 martin Exp $
.include
+CPPFLAGS+=-DXRENDER
+
PROG= xeyes
SRCS= xeyes.c Eyes.c transform.c
-LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
+LDADD+= -lXmu -lXt -lSM -lICE -lXext -lXrender -lX11 -lm
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}}
CVS commit: [netbsd-9] src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: martin
Date: Thu Oct 8 15:40:52 UTC 2020
Modified Files:
src/external/mit/xorg/bin/xterm [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by nia in ticket #1097):
external/mit/xorg/bin/xterm/Makefile: revision 1.18
xterm: Enable SIXEL graphics support.
could also enable REGIS, it will require -lm and i suppose isn't
a default upstream yet(?)
test with "-ti vt340".
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.4.1 src/external/mit/xorg/bin/xterm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.17 src/external/mit/xorg/bin/xterm/Makefile:1.17.4.1
--- src/external/mit/xorg/bin/xterm/Makefile:1.17 Wed May 9 08:39:55 2018
+++ src/external/mit/xorg/bin/xterm/Makefile Thu Oct 8 15:40:52 2020
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.17 2018/05/09 08:39:55 mrg Exp $
+# $NetBSD: Makefile,v 1.17.4.1 2020/10/08 15:40:52 martin Exp $
.include
PROG= xterm
SRCS= button.c charproc.c charsets.c cursor.c data.c doublechr.c \
- fontutils.c input.c linedata.c menu.c misc.c print.c ptydata.c \
- screen.c scrollback.c scrollbar.c tabs.c util.c xstrings.c \
- TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c charclass.c precompose.c \
- wcwidth.c xutf8.c cachedGCs.c xtermcap.c version.c
-
-# graphics_regis.c graphics_sixel.c
-# xterm.appdata.xml
+ graphics.c graphics_sixel.c fontutils.c input.c linedata.c menu.c \
+ misc.c print.c ptydata.c screen.c scrollback.c scrollbar.c tabs.c \
+ util.c xstrings.c TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c \
+ charclass.c precompose.c wcwidth.c xutf8.c cachedGCs.c xtermcap.c \
+ version.c
CPPFLAGS+= -I. \
-I${X11SRCDIR.${PROG}} \
@@ -19,6 +17,8 @@ CPPFLAGS+= -I. \
-I${DESTDIR}${X11INCDIR}/freetype2/freetype \
-DPROJECTROOT=${X11ROOTDIR} \
-DHAVE_CONFIG_H \
+ -DOPT_GRAPHICS \
+ -DOPT_SIXEL_GRAPHICS \
-D_REENTRANT \
${X11FLAGS.VERSION}
Re: CVS commit: src/external/public-domain/tz/dist
Date:Thu, 08 Oct 2020 19:11:59 +1100 From:matthew green Message-ID: <22915.1602144...@splode.eterna.com.au> | at least pacificnew is referenced by the build still: Yes, sorry, the way that tzdata updates get done makes it essentially impossible to test what is going to happen until after it is done (I suspect that's true for most of the things we handle using cvs import). One of the things that cvs doesn't make easy. I fixed it when my test build failed because of it, and then Nick fixed the remaining build problem just about the same time my restarted build found that one (thanks). kre
CVS commit: [netbsd-9] src/external/mit/xorg/bin/xterm
Module Name:src Committed By: martin Date: Thu Oct 8 15:40:52 UTC 2020 Modified Files: src/external/mit/xorg/bin/xterm [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by nia in ticket #1097): external/mit/xorg/bin/xterm/Makefile: revision 1.18 xterm: Enable SIXEL graphics support. could also enable REGIS, it will require -lm and i suppose isn't a default upstream yet(?) test with "-ti vt340". To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.4.1 src/external/mit/xorg/bin/xterm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: skrll Date: Thu Oct 8 14:22:21 UTC 2020 Modified Files: src/distrib/sets/lists/base: mi Log Message: Mark US/Pacific-New obsolete To generate a diff of this commit: cvs rdiff -u -r1.1265 -r1.1266 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: skrll Date: Thu Oct 8 14:22:21 UTC 2020 Modified Files: src/distrib/sets/lists/base: mi Log Message: Mark US/Pacific-New obsolete To generate a diff of this commit: cvs rdiff -u -r1.1265 -r1.1266 src/distrib/sets/lists/base/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.1265 src/distrib/sets/lists/base/mi:1.1266 --- src/distrib/sets/lists/base/mi:1.1265 Sat Sep 26 17:49:49 2020 +++ src/distrib/sets/lists/base/mi Thu Oct 8 14:22:21 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1265 2020/09/26 17:49:49 jmcneill Exp $ +# $NetBSD: mi,v 1.1266 2020/10/08 14:22:21 skrll Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -6055,7 +6055,7 @@ ./usr/share/zoneinfo/US/Michigan base-sys-share share ./usr/share/zoneinfo/US/Mountain base-sys-share share ./usr/share/zoneinfo/US/Pacific base-sys-share share -./usr/share/zoneinfo/US/Pacific-New base-sys-share share +./usr/share/zoneinfo/US/Pacific-New base-obsolete obsolete ./usr/share/zoneinfo/US/Samoa base-sys-share share ./usr/share/zoneinfo/UTC base-sys-share share ./usr/share/zoneinfo/Universal base-sys-share share
CVS commit: src/sys/uvm/pmap
Module Name:src Committed By: skrll Date: Thu Oct 8 14:02:40 UTC 2020 Modified Files: src/sys/uvm/pmap: pmap.c pmap_segtab.c Log Message: %#jx vs %jx consistency in UVMHIST_LOG To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/uvm/pmap/pmap.c cvs rdiff -u -r1.25 -r1.26 src/sys/uvm/pmap/pmap_segtab.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm/pmap
Module Name:src
Committed By: skrll
Date: Thu Oct 8 14:02:40 UTC 2020
Modified Files:
src/sys/uvm/pmap: pmap.c pmap_segtab.c
Log Message:
%#jx vs %jx consistency in UVMHIST_LOG
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/uvm/pmap/pmap.c
cvs rdiff -u -r1.25 -r1.26 src/sys/uvm/pmap/pmap_segtab.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/pmap/pmap.c
diff -u src/sys/uvm/pmap/pmap.c:1.56 src/sys/uvm/pmap/pmap.c:1.57
--- src/sys/uvm/pmap/pmap.c:1.56 Thu Sep 24 06:45:58 2020
+++ src/sys/uvm/pmap/pmap.c Thu Oct 8 14:02:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.56 2020/09/24 06:45:58 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.57 2020/10/08 14:02:40 skrll Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.56 2020/09/24 06:45:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.57 2020/10/08 14:02:40 skrll Exp $");
/*
* Manages physical address maps.
@@ -407,13 +407,13 @@ pmap_page_syncicache(struct vm_page *pg)
VM_PAGEMD_PVLIST_READLOCK(mdpg);
pmap_pvlist_check(mdpg);
- UVMHIST_LOG(pmaphist, "pv %jx pv_pmap %jx", (uintptr_t)pv,
+ UVMHIST_LOG(pmaphist, "pv %#jx pv_pmap %#jx", (uintptr_t)pv,
(uintptr_t)pv->pv_pmap, 0, 0);
if (pv->pv_pmap != NULL) {
for (; pv != NULL; pv = pv->pv_next) {
#ifdef MULTIPROCESSOR
- UVMHIST_LOG(pmaphist, "pv %jx pv_pmap %jx",
+ UVMHIST_LOG(pmaphist, "pv %#jx pv_pmap %#jx",
(uintptr_t)pv, (uintptr_t)pv->pv_pmap, 0, 0);
kcpuset_merge(onproc, pv->pv_pmap->pm_onproc);
if (kcpuset_match(onproc, kcpuset_running)) {
@@ -779,7 +779,7 @@ pmap_page_remove(struct vm_page *pg)
npv = pv->pv_next;
#ifdef PMAP_VIRTUAL_CACHE_ALIASES
if (PV_ISKENTER_P(pv)) {
- UVMHIST_LOG(pmaphist, " pv %#jx pmap %#jx va %jx"
+ UVMHIST_LOG(pmaphist, " pv %#jx pmap %#jx va %#jx"
" skip", (uintptr_t)pv, (uintptr_t)pv->pv_pmap,
pv->pv_va, 0);
@@ -815,8 +815,8 @@ pmap_page_remove(struct vm_page *pg)
KASSERTMSG(ptep != NULL, "%#"PRIxVADDR " %#"PRIxVADDR, va,
pmap_limits.virtual_end);
pt_entry_t pte = *ptep;
- UVMHIST_LOG(pmaphist, " pv %#jx pmap %#jx va %jx"
- " pte %jx", (uintptr_t)pv, (uintptr_t)pmap, va,
+ UVMHIST_LOG(pmaphist, " pv %#jx pmap %#jx va %#jx"
+ " pte %#jx", (uintptr_t)pv, (uintptr_t)pmap, va,
pte_value(pte));
if (!pte_valid_p(pte))
continue;
@@ -918,7 +918,7 @@ pmap_update(struct pmap *pmap)
pmap_tlb_miss_lock_exit();
kpreempt_enable();
- UVMHIST_LOG(pmaphist, " <-- done (kernel=%#jx)",
+ UVMHIST_LOG(pmaphist, " <-- done (kernel=%jx)",
(pmap == pmap_kernel() ? 1 : 0), 0, 0, 0);
}
Index: src/sys/uvm/pmap/pmap_segtab.c
diff -u src/sys/uvm/pmap/pmap_segtab.c:1.25 src/sys/uvm/pmap/pmap_segtab.c:1.26
--- src/sys/uvm/pmap/pmap_segtab.c:1.25 Thu Sep 24 06:45:58 2020
+++ src/sys/uvm/pmap/pmap_segtab.c Thu Oct 8 14:02:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_segtab.c,v 1.25 2020/09/24 06:45:58 skrll Exp $ */
+/* $NetBSD: pmap_segtab.c,v 1.26 2020/10/08 14:02:40 skrll Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.25 2020/09/24 06:45:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.26 2020/10/08 14:02:40 skrll Exp $");
/*
* Manages physical address maps.
@@ -265,7 +265,7 @@ pmap_segtab_release(pmap_t pmap, pmap_se
UVMHIST_FUNC(__func__);
UVMHIST_CALLARGS(pmapsegtabhist, "pm=%#jx stpp=%#jx free=%jd",
(uintptr_t)pmap, (uintptr_t)stp_p, free_stp, 0);
- UVMHIST_LOG(pmapsegtabhist, " callback=%jx flags=%jx va=%jx vinc=%jx",
+ UVMHIST_LOG(pmapsegtabhist, " callback=%#jx flags=%jx va=%#jx vinc=%#jx",
(uintptr_t)callback, flags, (uintptr_t)va, (uintptr_t)vinc);
for (size_t i = (va / vinc) & (PMAP_SEGTABSIZE - 1);
i < PMAP_SEGTABSIZE;
@@ -574,7 +574,7 @@ pmap_pte_reserve(pmap_t pmap, vaddr_t va
*pte_p = pte;
#endif
KASSERT(pte == stp->seg_tab[(va >> SEGSHIFT) & (PMAP_SEGTABSIZE - 1)]);
- UVMHIST_CALLARGS(pmapsegtabhist, "pm=%#jx va=%#jx -> tab[%jd]=%jx",
+ UVMHIST_CALLARGS(pmapsegtabhist, "pm=%#jx va=%#jx -> tab[%jd]=%#jx",
(uintptr_t)pmap, (uintptr_t)va,
(va >> SEGSHIFT) & (PMAP_SEGTABSIZE - 1), (uintptr_t)pte);
CVS commit: src/external/public-domain/tz/share/zoneinfo
Module Name:src Committed By: kre Date: Thu Oct 8 13:44:36 UTC 2020 Modified Files: src/external/public-domain/tz/share/zoneinfo: Makefile Log Message: tzdata 2020b: the ancient systemv and pacificnew zone files are gone, as is the yearistype.sh script (2020b zic, if/when that gets included in NetBSD won't support it)., To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/public-domain/tz/share/zoneinfo/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/public-domain/tz/share/zoneinfo
Module Name:src
Committed By: kre
Date: Thu Oct 8 13:44:36 UTC 2020
Modified Files:
src/external/public-domain/tz/share/zoneinfo: Makefile
Log Message:
tzdata 2020b: the ancient systemv and pacificnew zone files are gone,
as is the yearistype.sh script (2020b zic, if/when that gets included
in NetBSD won't support it).,
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/public-domain/tz/share/zoneinfo/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/public-domain/tz/share/zoneinfo/Makefile
diff -u src/external/public-domain/tz/share/zoneinfo/Makefile:1.3 src/external/public-domain/tz/share/zoneinfo/Makefile:1.4
--- src/external/public-domain/tz/share/zoneinfo/Makefile:1.3 Thu Jun 16 15:17:56 2016
+++ src/external/public-domain/tz/share/zoneinfo/Makefile Thu Oct 8 13:44:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/06/16 15:17:56 agc Exp $
+# $NetBSD: Makefile,v 1.4 2020/10/08 13:44:36 kre Exp $
.include
.include "../../Makefile.inc"
@@ -46,17 +46,14 @@ TZDIR= /usr/share/zoneinfo
REDO= posix_only
-# Since "." may not be in PATH...
-YEARISTYPE= "${HOST_SH} ${TZDISTDIR}/yearistype.sh"
-
PRIMARY_YDATA= africa antarctica asia australasia \
europe northamerica southamerica
-YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward
-NDATA= systemv factory
+YDATA= $(PRIMARY_YDATA) etcetera backward
+NDATA= factory
TDATA= $(YDATA) $(NDATA)
ZONETABLES= zone1970.tab zone.tab
TABDATA= iso3166.tab leapseconds $(ZONETABLES)
-DATA= $(YDATA) $(NDATA) $(TABDATA) # yearistype.sh
+DATA= $(YDATA) $(NDATA) $(TABDATA)
TZBUILDDIR= ${.OBJDIR}/builddir
@@ -65,23 +62,23 @@ posix_only: ${TDATA}
${_MKTARGET_CREATE}
mkdir -p ${TZBUILDDIR}
cd ${TZDISTDIR} && \
- ${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR} -L /dev/null ${TDATA}
+ ${TOOL_ZIC} -d ${TZBUILDDIR} -L /dev/null ${TDATA}
.PHONY: right_only
right_only: leapseconds ${TDATA}
${_MKTARGET_CREATE}
mkdir -p ${TZBUILDDIR}
cd ${TZDISTDIR} && \
- ${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR} -L leapseconds ${TDATA}
+ ${TOOL_ZIC} -d ${TZBUILDDIR} -L leapseconds ${TDATA}
.PHONY: other_two
other_two: leapseconds ${TDATA}
${_MKTARGET_CREATE}
mkdir -p ${TZBUILDDIR}
cd ${TZDISTDIR} && \
- ${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR}/posix -L /dev/null ${TDATA}
+ ${TOOL_ZIC} -d ${TZBUILDDIR}/posix -L /dev/null ${TDATA}
cd ${TZDISTDIR} && \
- ${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR}/right -L leapseconds ${TDATA}
+ ${TOOL_ZIC} -d ${TZBUILDDIR}/right -L leapseconds ${TDATA}
.PHONY: posix_right
posix_right: posix_only other_two
@@ -100,7 +97,7 @@ afterinstall: ${DATA} ${REDO} ${TABDATA}
${_MKMSG_CREATE} ${POSIXRULES}
mkdir -p ${TZBUILDDIR}
cd ${TZDISTDIR} && \
- ${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR} -p ${POSIXRULES}
+ ${TOOL_ZIC} -d ${TZBUILDDIR} -p ${POSIXRULES}
cd ${TZBUILDDIR} && \
find . -type f -print | xargs ${TOOL_STAT} -qf '%d,%i %N' | sort \
| while read devino tzfile; do \
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: he Date: Thu Oct 8 12:49:06 UTC 2020 Modified Files: src/sys/arch/arm/include/arm32: vmparam.h Log Message: Bump MAXDSIZ from 1536 to 1836. 1836 is 2048-128(MAXTSIZ)-64(MAXSSIZ). Gives us a fighting chance to build rust natively. OK'ed by skrll@ To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/arm/include/arm32/vmparam.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/include/arm32/vmparam.h diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.55 src/sys/arch/arm/include/arm32/vmparam.h:1.56 --- src/sys/arch/arm/include/arm32/vmparam.h:1.55 Sat Aug 29 06:49:53 2020 +++ src/sys/arch/arm/include/arm32/vmparam.h Thu Oct 8 12:49:06 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.55 2020/08/29 06:49:53 skrll Exp $ */ +/* $NetBSD: vmparam.h,v 1.56 2020/10/08 12:49:06 he Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -70,7 +70,7 @@ #define DFLDSIZ (384*1024*1024) /* initial data size limit */ #endif #ifndef MAXDSIZ -#define MAXDSIZ (1536*1024*1024) /* max data size */ +#define MAXDSIZ (1856*1024*1024) /* max data size */ #endif #ifndef DFLSSIZ #define DFLSSIZ (4*1024*1024) /* initial stack size limit */
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: he Date: Thu Oct 8 12:49:06 UTC 2020 Modified Files: src/sys/arch/arm/include/arm32: vmparam.h Log Message: Bump MAXDSIZ from 1536 to 1836. 1836 is 2048-128(MAXTSIZ)-64(MAXSSIZ). Gives us a fighting chance to build rust natively. OK'ed by skrll@ To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/arm/include/arm32/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: nisimura Date: Thu Oct 8 11:29:05 UTC 2020 Modified Files: src/sys/dev/ic: dm9000reg.h Log Message: improve register descriptions To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/dm9000reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/dm9000reg.h diff -u src/sys/dev/ic/dm9000reg.h:1.4 src/sys/dev/ic/dm9000reg.h:1.5 --- src/sys/dev/ic/dm9000reg.h:1.4 Tue Mar 31 02:32:25 2020 +++ src/sys/dev/ic/dm9000reg.h Thu Oct 8 11:29:04 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: dm9000reg.h,v 1.4 2020/03/31 02:32:25 nisimura Exp $ */ +/* $NetBSD: dm9000reg.h,v 1.5 2020/10/08 11:29:04 nisimura Exp $ */ /* * Copyright (c) 2009 Paul Fleischer @@ -47,77 +47,92 @@ #define DM9000_IOSIZE 4 -#define DM9000_NCR 0x00 +#define DM9000_NCR 0x00 /* "network" control */ #define DM9000_NCR_RST (1<<0) /* reset chip, self clear */ -#define DM9000_NCR_LBK_MASK (0x06) +#define DM9000_NCR_LBK_MASK (0x06) /* loopback test selection */ #define DM9000_NCR_LBK_SHIFT (1) -#define DM9000_NCR_LBK_MAC_INTERNAL (1<1522) */ -#define DM9000_RCR_WTDIS (1<<6) /* disable Rx watchdog timer */ -#define DM9000_RSR 0x06 +#define DM9000_RCR_DIS_LONG (1<<5) /* drop too long frame >1522 */ +#define DM9000_RCR_WTDIS (1<<6) /* disable >2048 Rx detect timer */ +#define DM9000_RSR 0x06 /* Rx status */ #define DM9000_RSR_FOE (1<<0) /* Rx FIFO overflow detected */ -#define DM9000_RSR_CE (1<<1) -#define DM9000_RSR_AE (1<<2) -#define DM9000_RSR_PLE (1<<3) -#define DM9000_RSR_RWTO (1<<4) -#define DM9000_RSR_LCS (1<<5) +#define DM9000_RSR_CE (1<<1) /* CRC error found */ +#define DM9000_RSR_AE (1<<2) /* tail not ended in byte boundary */ +#define DM9000_RSR_PLE (1<<3) /* physical layer error */ +#define DM9000_RSR_RWTO (1<<4) /* >2048 condition detected */ +#define DM9000_RSR_LCS (1<<5) /* late colli. detected */ #define DM9000_RSR_MF (1<<6) /* mcast/bcast frame received */ -#define DM9000_RSR_RF (1<<7) /* runt frame received (<64 bytes) */ -#define DM9000_ROCR 0x07 -#define DM9000_BPTR 0x08 -#define DM9000_FCTR 0x09 -#define DM9000_FCR 0x0A +#define DM9000_RSR_RF (1<<7) /* damaged runt frame received <64 */ +#define DM9000_ROCR 0x07 /* receive overflow counter */ +/* 7: OVF detected, 6:0 statistic couner */ +#define DM9000_BPTR 0x08 /* back pressure threshold */ +/* 7:4 back pressure high watermark (3 def), 3:0 jam pattern time (7 def) */ +#define DM9000_FCTR 0x09 /* flow control threshold */ +/* 7:4 Rx FIFO high w.m. (3 def), low w.m. (8 def) */ +#define DM9000_FCR 0x0A /* Rx flow control */ #define DM9000_FCR_FLCE (1<<0) /* flow control enable */ #define DM9000_FCR_RXPCS (1<<1) /* Rx PAUSE current status */ -#define DM9000_FCR_RXPS (1<<2) /* Rx PAUSE status, read to clear */ -#define DM9000_FCR_BKPM (1<<3) -#define DM9000_FCR_BKPA (1<<4) -#define DM9000_FCR_TXPEN (1<<5) /* force PAUSE/unPAUSE */ -#define DM9000_FCR_TXPF (1<<6) /* Tx PAUSE packet (when full */ +#define DM9000_FCR_RXPS (1<<2) /* Rx PAUSE status, latched R2C */ +#define DM9000_FCR_BKPM (1<<3) /* HDX back pressure for my frames */ +#define DM9000_FCR_BKPA (1<<4) /* HDX back pressure for any frames */ +#define DM9000_FCR_TXPEN (1<<5) /* activate auto PAUSE operation */ +#define DM9000_FCR_TXPF (1<<6) /* Tx PAUSE packet (when full) */ #define DM9000_FCR_TXP0 (1<<7) /* Tx PAUSE packet (when empty) */ -#define DM9000_EPCR 0x0B +#define DM9000_EPCR 0x0B /* EEPROM / PHY control */ #define DM9000_EPCR_ERRE (1<<0) /* operation in progress, busy bit */ -#define DM9000_EPCR_ERPRW (1<<1) /* instruct to write */ -#define DM9000_EPCR_ERPRR (1<<2) /* instruct to read */ -#define DM9000_EPCR_EPOS_EEPROM (0<<3) /* 1: PHY op, 0: EEPROM op */ -#define DM9000_EPCR_EPOS_PHY(1<<3) -#define DM9000_EPCR_WEP (1<<4) -#define DM9000_EPCR_REEP (1<<5) -#define DM9000_EPAR 0x0C /* 7:6 (!!) PHY id, 5:0 reg num */ -#define DM9000_EPAR_EROA_MASK 0x3F /* bits 0-5 */ +#define DM9000_EPCR_ERPRW (1<<1) /* instruct to write, not SC */ +#define DM9000_EPCR_ERPRR (1<<2) /* instruct to read, not SC */ +#define DM9000_EPCR_EPOS_EEPROM (0<<3) /* EEPROM operation */ +#define DM9000_EPCR_EPOS_PHY(1<<3) /* PHY operation */ +#define DM9000_EPCR_WEP (1<<4) /* EEPROM write enable */ +#define DM9000_EPCR_REEP (1<<5) /* reload EEPROM contents, not SC */ +#define DM9000_EPAR 0x0C /* EEPROM / PHY address */ +#define DM9000_EPAR_EROA_MASK 0x3F /* 7:6 (!!) PHY id, 5:0 addr/reg */ #define DM9000_EPAR_INT_PHY 0x40 /* EPAR[7:6] = 01 for internal PHY */ -#define DM9000_EPDRL 0x0D /* data 7:0 */ -#define DM9000_EPDRH 0x0E /* data 15:8 */ -#define DM9000_WCR 0x0F +#define DM9000_EPDRL 0x0D /* EEPROM / PHY data 7:0 */ +#define DM9000_EPDRH 0x0E /* EEPROM / PHY data 15:8 */ +#define DM9000_WCR 0x0F /* wakeup control and status */ +#define DM9000_MAGIC (1<<0) /* magic
CVS commit: src/sys/dev/ic
Module Name:src Committed By: nisimura Date: Thu Oct 8 11:29:05 UTC 2020 Modified Files: src/sys/dev/ic: dm9000reg.h Log Message: improve register descriptions To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/dm9000reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: rin
Date: Thu Oct 8 09:16:13 UTC 2020
Modified Files:
src/sys/kern: kern_cpu.c
Log Message:
PR kern/45117
Work around regression introduced in rev 1.92:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/kern/kern_cpu.c#rev1.92
by which ``cpuctl offline n'' became broken on architectures without
__HAVE_INTR_CONTROL (i.e., everything other than alpha and x86);
cpu_setintr() always fails on these archs, and we had neglected
return value from that function until rev 1.91.
XXX
As martin pointed out in the PR, I'm not sure whether fix in rev 1.92
itself is correct or not. Insert XXX comment referring the PR there
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/kern/kern_cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_cpu.c
diff -u src/sys/kern/kern_cpu.c:1.92 src/sys/kern/kern_cpu.c:1.93
--- src/sys/kern/kern_cpu.c:1.92 Mon Jul 13 13:16:07 2020
+++ src/sys/kern/kern_cpu.c Thu Oct 8 09:16:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_cpu.c,v 1.92 2020/07/13 13:16:07 jruoho Exp $ */
+/* $NetBSD: kern_cpu.c,v 1.93 2020/10/08 09:16:13 rin Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012, 2019 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.92 2020/07/13 13:16:07 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.93 2020/10/08 09:16:13 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_cpu_ucode.h"
@@ -212,9 +212,7 @@ cpuctl_ioctl(dev_t dev, u_long cmd, void
error = ESRCH;
break;
}
- error = cpu_setintr(ci, cs->cs_intr);
- if (error)
- break;
+ cpu_setintr(ci, cs->cs_intr); /* XXX neglect errors */
error = cpu_setstate(ci, cs->cs_online);
break;
@@ -492,7 +490,7 @@ cpu_setintr(struct cpu_info *ci, bool in
return 0;
func = (xcfunc_t)cpu_xc_intr;
} else {
- if (CPU_IS_PRIMARY(ci))
+ if (CPU_IS_PRIMARY(ci)) /* XXX kern/45117 */
return EINVAL;
if ((spc->spc_flags & SPCF_NOINTR) != 0)
return 0;
CVS commit: src/sys/kern
Module Name:src Committed By: rin Date: Thu Oct 8 09:16:13 UTC 2020 Modified Files: src/sys/kern: kern_cpu.c Log Message: PR kern/45117 Work around regression introduced in rev 1.92: http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/kern/kern_cpu.c#rev1.92 by which ``cpuctl offline n'' became broken on architectures without __HAVE_INTR_CONTROL (i.e., everything other than alpha and x86); cpu_setintr() always fails on these archs, and we had neglected return value from that function until rev 1.91. XXX As martin pointed out in the PR, I'm not sure whether fix in rev 1.92 itself is correct or not. Insert XXX comment referring the PR there To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/sys/kern/kern_cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/lib/libgdb
Module Name:src
Committed By: rin
Date: Thu Oct 8 08:32:57 UTC 2020
Modified Files:
src/external/gpl3/gdb/lib/libgdb: Makefile
Log Message:
Apply hack for GDB 8.3 on arm to GDB 11.
XXX
Not tested as GDB 11 does not build for arm at the moment.
Note that dist/gdb/dwarf2foo.c was renamed to dist/gdb/dwarf2/foo.c.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/gpl3/gdb/lib/libgdb/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/gpl3/gdb/lib/libgdb/Makefile
diff -u src/external/gpl3/gdb/lib/libgdb/Makefile:1.27 src/external/gpl3/gdb/lib/libgdb/Makefile:1.28
--- src/external/gpl3/gdb/lib/libgdb/Makefile:1.27 Thu Sep 17 16:36:38 2020
+++ src/external/gpl3/gdb/lib/libgdb/Makefile Thu Oct 8 08:32:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/09/17 16:36:38 christos Exp $
+# $NetBSD: Makefile,v 1.28 2020/10/08 08:32:57 rin Exp $
NOCTF=
HOSTPROG_CXX= 1
@@ -59,12 +59,15 @@ CFLAGS:= ${CXXFLAGS} -std=gnu++11 -Wno-
ada-exp.c: ada-lex.c
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc"
-.if !empty(MACHINE_ARCH:Mearmv7hf*)
-# GCC 8.4 miscompiles this with -O2 or -O1 for earmv7hf{,eb}.
-# Neither earmv6hf{,eb} nor earmv7{,eb} are affected.
-COPTS.dwarf2expr.c+=-O0
-.endif
+.if ${MACHINE_CPU} == "arm"
+. if ${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8
+# XXX taken from GDB 8.3; not tested for GDB 11:
+# GCC 8.4/9.3 miscompile this with -O[21] for earmv7hf{,eb}.
+# GCC 9.3 miscompile this with -O2 for earmv5hf{,eb}.
+COPTS.expr.c+= -O0
+# GCC 9.3 miscompile this with -O2 for earmv5hf{,eb}.
+COPTS.loc.c+= -O0
+. endif
.endif
# These are generated by implicit rules and are not easy to generate
CVS commit: src/external/gpl3/gdb/lib/libgdb
Module Name:src Committed By: rin Date: Thu Oct 8 08:32:57 UTC 2020 Modified Files: src/external/gpl3/gdb/lib/libgdb: Makefile Log Message: Apply hack for GDB 8.3 on arm to GDB 11. XXX Not tested as GDB 11 does not build for arm at the moment. Note that dist/gdb/dwarf2foo.c was renamed to dist/gdb/dwarf2/foo.c. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/external/gpl3/gdb/lib/libgdb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rin
Date: Thu Oct 8 08:31:37 UTC 2020
Modified Files:
src/doc: HACKS
src/external/gpl3/gdb.old/lib/libgdb: Makefile
Log Message:
GCC 9.3 miscompiles dwarf2{expr,loc}.c with -O2 for earmv5hf{,eb}
(-O1 is fine). This is a new regression introduced in GCC9.
For everyone's safety, extend -O0 hack to dwarf2{expr,loc}.c for
all arm variants with GCC >= 8.
To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 src/doc/HACKS
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb.old/lib/libgdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rin
Date: Thu Oct 8 08:31:37 UTC 2020
Modified Files:
src/doc: HACKS
src/external/gpl3/gdb.old/lib/libgdb: Makefile
Log Message:
GCC 9.3 miscompiles dwarf2{expr,loc}.c with -O2 for earmv5hf{,eb}
(-O1 is fine). This is a new regression introduced in GCC9.
For everyone's safety, extend -O0 hack to dwarf2{expr,loc}.c for
all arm variants with GCC >= 8.
To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 src/doc/HACKS
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb.old/lib/libgdb/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/HACKS
diff -u src/doc/HACKS:1.213 src/doc/HACKS:1.214
--- src/doc/HACKS:1.213 Wed Oct 7 07:35:28 2020
+++ src/doc/HACKS Thu Oct 8 08:31:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.213 2020/10/07 07:35:28 rin Exp $
+# $NetBSD: HACKS,v 1.214 2020/10/08 08:31:37 rin Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -975,16 +975,17 @@ descr Disable optimization on tc.c, loge
function "__int64_t llvm::MachineFrameInfo::getObjectOffset(int) const"
kcah
-port earmv7hf*
-hack compile gdb/dwarf2expr.c with -O0 for GCC[89] (toolchain/54820, 54877)
+port arm
+hack compile gdb/dwarf2{expr,loc}.c with -O0 for GCC[89] (PR/54820, 54877)
cdate Wed Apr 29 11:04:58 UTC 2020
-mdate Mon Oct 5 22:30:00 JST 2020
+mdate Thu Oct 8 17:00:00 JST 2020
who rin
file src/external/gpl3/gdb/lib/libgdb/Makefile: 1.22
-descr GCC 8.4 and 9.3 miscompile dwarf2expr.c with -O[21], which results in
- crashes with 'gdb_exception_RETURN_MASK_ERROR'. Note that this occurs
- only for earmv7hf{,eb} as far as I can see. Neither earmv6hf{,eb} nor
- earmv7{,eb} (softfloat) are affected.
+descr For earmv7hf{,eb}, GCC 8.4 and 9.3 miscompile dwarf2expr.c with -O[21].
+ For earmv5hf{,eb}, GCC 9.3 miscompiles dwarf2{expr,loc}.c with -O2
+ (GCC9 -O1 and GCC8 -O2 work fine). These result in GDB crash with
+ ``gdb_exception_RETURN_MASK_ERROR''. For everyone's safety, compile
+ these files with -O0 for all arm variants with GCC >= 8.
kcah
port m68k
Index: src/external/gpl3/gdb.old/lib/libgdb/Makefile
diff -u src/external/gpl3/gdb.old/lib/libgdb/Makefile:1.10 src/external/gpl3/gdb.old/lib/libgdb/Makefile:1.11
--- src/external/gpl3/gdb.old/lib/libgdb/Makefile:1.10 Mon Sep 14 00:40:43 2020
+++ src/external/gpl3/gdb.old/lib/libgdb/Makefile Thu Oct 8 08:31:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/09/14 00:40:43 christos Exp $
+# $NetBSD: Makefile,v 1.11 2020/10/08 08:31:37 rin Exp $
NOCTF=
HOSTPROG_CXX= 1
@@ -54,12 +54,14 @@ CFLAGS:= ${CXXFLAGS} -std=gnu++11 -Wno-
ada-exp.c: ada-lex.c
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc"
-.if !empty(MACHINE_ARCH:Mearmv7hf*)
-# GCC 8.4 miscompiles this with -O2 or -O1 for earmv7hf{,eb}.
-# Neither earmv6hf{,eb} nor earmv7{,eb} are affected.
-COPTS.dwarf2expr.c+=-O0
-.endif
+.if ${MACHINE_CPU} == "arm"
+. if ${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8
+# GCC 8.4/9.3 miscompile this with -O[21] for earmv7hf{,eb}.
+# GCC 9.3 miscompile this with -O2 for earmv5hf{,eb}.
+COPTS.dwarf2expr.c+= -O0
+# GCC 9.3 miscompile this with -O2 for earmv5hf{,eb}.
+COPTS.dwarf2loc.c+= -O0
+. endif
.endif
# These are generated by implicit rules and are not easy to generate
re: CVS commit: src/external/public-domain/tz/dist
"Robert Elz" writes: > Module Name: src > Committed By: kre > Date: Thu Oct 8 04:28:00 UTC 2020 > > Modified Files: > src/external/public-domain/tz/dist: TZDATA_VERSION > Removed Files: > src/external/public-domain/tz/dist: pacificnew systemv yearistype.sh at least pacificnew is referenced by the build still: external/public-domain/tz/share/zoneinfo/Makefile:YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward can you have a look? thanks. .mrg.
