CVS commit: src/sys/sys
Module Name:src Committed By: skrll Date: Wed Nov 18 07:42:46 UTC 2020 Modified Files: src/sys/sys: bus_proto.h Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/sys/bus_proto.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/bus_proto.h diff -u src/sys/sys/bus_proto.h:1.11 src/sys/sys/bus_proto.h:1.12 --- src/sys/sys/bus_proto.h:1.11 Thu Nov 14 16:23:53 2019 +++ src/sys/sys/bus_proto.h Wed Nov 18 07:42:46 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_proto.h,v 1.11 2019/11/14 16:23:53 maxv Exp $ */ +/* $NetBSD: bus_proto.h,v 1.12 2020/11/18 07:42:46 skrll Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2001, 2007 The NetBSD Foundation, Inc. @@ -427,7 +427,7 @@ bool bus_space_handle_is_equal(bus_space #define BUS_DMA_READ 0x100 /* mapping is device -> memory only */ #define BUS_DMA_WRITE 0x200 /* mapping is memory -> device only */ #define BUS_DMA_NOCACHE 0x400 /* hint: map non-cached memory */ -#define BUS_DMA_PREFETCHABLE 0x800 /* hint: map non-cached but allow +#define BUS_DMA_PREFETCHABLE 0x800 /* hint: map non-cached but allow * things like write combining */ /* Operations performed by bus_dmamap_sync(). */
CVS commit: src/sys/external/bsd/acpica/dist
Module Name:src
Committed By: rin
Date: Wed Nov 18 06:49:14 UTC 2020
Modified Files:
src/sys/external/bsd/acpica/dist/compiler: aslcompiler.h
src/sys/external/bsd/acpica/dist/debugger: dbinput.c
src/sys/external/bsd/acpica/dist/include: aclocal.h
src/sys/external/bsd/acpica/dist/namespace: nsxfeval.c
src/sys/external/bsd/acpica/dist/resources: rsxface.c
src/sys/external/bsd/acpica/dist/tables: tbxface.c
src/sys/external/bsd/acpica/dist/utilities: utcache.c utosi.c utprint.c
Log Message:
Adjust blank line & white space to slightly reduce diff from upstream.
No binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/acpica/dist/debugger/dbinput.c
cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/acpica/dist/include/aclocal.h
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/resources/rsxface.c
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/dist/tables/tbxface.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/utilities/utcache.c \
src/sys/external/bsd/acpica/dist/utilities/utosi.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/utilities/utprint.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h
diff -u src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.16 src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.17
--- src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.16 Sat Mar 28 19:49:26 2020
+++ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h Wed Nov 18 06:49:13 2020
@@ -1170,7 +1170,6 @@ UtEndEvent (
UINT8 Event);
void
-
UtDisplaySummary (
UINT32 FileId);
Index: src/sys/external/bsd/acpica/dist/debugger/dbinput.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.21 src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.22
--- src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.21 Sat Mar 28 19:49:26 2020
+++ src/sys/external/bsd/acpica/dist/debugger/dbinput.c Wed Nov 18 06:49:13 2020
@@ -1028,6 +1028,7 @@ AcpiDbCommandDispatch (
break;
case CMD_METHODS:
+
Status = AcpiDbDisplayObjects (__UNCONST("METHOD"), AcpiGbl_DbArgs[1]);
break;
Index: src/sys/external/bsd/acpica/dist/include/aclocal.h
diff -u src/sys/external/bsd/acpica/dist/include/aclocal.h:1.21 src/sys/external/bsd/acpica/dist/include/aclocal.h:1.22
--- src/sys/external/bsd/acpica/dist/include/aclocal.h:1.21 Sat Mar 28 19:49:27 2020
+++ src/sys/external/bsd/acpica/dist/include/aclocal.h Wed Nov 18 06:49:13 2020
@@ -91,6 +91,7 @@ union acpi_parse_object;
#define ACPI_MAX_MUTEX 5
#define ACPI_NUM_MUTEX (ACPI_MAX_MUTEX+1)
+
/* Lock structure for reader/writer interfaces */
typedef struct acpi_rw_lock
Index: src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c:1.14 src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c:1.15
--- src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c:1.14 Sat Mar 28 19:49:27 2020
+++ src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c Wed Nov 18 06:49:14 2020
@@ -94,6 +94,7 @@ AcpiEvaluateObjectTyped (
ACPI_HANDLE TargetHandle;
char*FullPathname;
+
ACPI_FUNCTION_TRACE (AcpiEvaluateObjectTyped);
Index: src/sys/external/bsd/acpica/dist/resources/rsxface.c
diff -u src/sys/external/bsd/acpica/dist/resources/rsxface.c:1.13 src/sys/external/bsd/acpica/dist/resources/rsxface.c:1.14
--- src/sys/external/bsd/acpica/dist/resources/rsxface.c:1.13 Sat Mar 28 19:49:28 2020
+++ src/sys/external/bsd/acpica/dist/resources/rsxface.c Wed Nov 18 06:49:14 2020
@@ -612,6 +612,7 @@ AcpiWalkResourceBuffer (
ACPI_RESOURCE *Resource;
ACPI_RESOURCE *ResourceEnd;
+
ACPI_FUNCTION_TRACE (AcpiWalkResourceBuffer);
Index: src/sys/external/bsd/acpica/dist/tables/tbxface.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbxface.c:1.15 src/sys/external/bsd/acpica/dist/tables/tbxface.c:1.16
--- src/sys/external/bsd/acpica/dist/tables/tbxface.c:1.15 Sat Mar 28 19:49:28 2020
+++ src/sys/external/bsd/acpica/dist/tables/tbxface.c Wed Nov 18 06:49:14 2020
@@ -281,6 +281,7 @@ AcpiGetTableHeader (
UINT32 j;
ACPI_TABLE_HEADER *Header;
+
/* Parameter validation */
if (!Signature || !OutTableHeader)
@@ -372,6 +373,7 @@ AcpiGetTable (
ACPI_STATUS Status = AE_NOT_FOUND;
ACPI_TABLE_DESC *TableDesc;
+
/* Parameter validation */
if (!Signature || !OutTable)
In
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: sjg
Date: Wed Nov 18 04:10:34 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile
Log Message:
Cleanup - colliding fixes for same issue
To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.207 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.206 src/usr.bin/make/unit-tests/Makefile:1.207
--- src/usr.bin/make/unit-tests/Makefile:1.206 Wed Nov 18 01:12:00 2020
+++ src/usr.bin/make/unit-tests/Makefile Wed Nov 18 04:10:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.206 2020/11/18 01:12:00 sjg Exp $
+# $NetBSD: Makefile,v 1.207 2020/11/18 04:10:34 sjg Exp $
#
# Unit tests for make(1)
#
@@ -428,7 +428,7 @@ FLAGS.varname-empty= -dv '$${:U}=cmdline
# Some tests need extra postprocessing.
SED_CMDS.export= \
- -e '/^[^=_A-Za-z0-9]*=/d'
+ -e '/^[^=_A-Za-z0-9]*=/d'
# these all share the same requirement
.for t in export-all export-env
SED_CMDS.$t= ${SED_CMDS.export}
@@ -459,11 +459,10 @@ SED_CMDS.opt-debug-jobs+= -e 's,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.var-op-shell+= -e 's,^${.SHELL:T}: [ 0-9:]*,,'
-SED_CMDS.var-op-shell+= -e '/command/{ s,^[1-9]: ,,;s,No such.*,not found,; }'
-SED_CMDS.vardebug= \
- ${:D canonicalize .SHELL } \
- -e 's,${.SHELL},/bin/sh,'
+SED_CMDS.var-op-shell+= \
+ -e 's,^${.SHELL:T}: [ 0-9:]*,,' \
+ -e 's,^${.SHELL:T}: ,,' \
+ -e '/command/s,No such.*,not found,'
SED_CMDS.vardebug+= -e 's,${.SHELL},,'
SED_CMDS.varmod-subst-regex+= \
-e 's,\(Regex compilation error:\).*,\1 (details omitted),'
CVS commit: src/sys/arch/bebox/bebox
Module Name:src
Committed By: thorpej
Date: Wed Nov 18 03:46:25 UTC 2020
Modified Files:
src/sys/arch/bebox/bebox: mainbus.c pic_bebox.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/bebox/bebox/mainbus.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/bebox/bebox/pic_bebox.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/bebox/bebox/mainbus.c
diff -u src/sys/arch/bebox/bebox/mainbus.c:1.32 src/sys/arch/bebox/bebox/mainbus.c:1.33
--- src/sys/arch/bebox/bebox/mainbus.c:1.32 Tue Jul 7 03:38:46 2020
+++ src/sys/arch/bebox/bebox/mainbus.c Wed Nov 18 03:46:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.32 2020/07/07 03:38:46 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.33 2020/11/18 03:46:25 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,12 +31,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.32 2020/07/07 03:38:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.33 2020/11/18 03:46:25 thorpej Exp $");
#include
#include
#include
-#include
+#include
#include
#include
@@ -123,12 +123,10 @@ mainbus_attach(device_t parent, device_t
*/
#if NPCI > 0
- genppc_pct = malloc(sizeof(struct genppc_pci_chipset), M_DEVBUF,
- M_WAITOK);
+ genppc_pct = kmem_alloc(sizeof(struct genppc_pci_chipset), KM_SLEEP);
bebox_pci_get_chipset_tag(genppc_pct);
- pbi = malloc(sizeof(struct genppc_pci_chipset_businfo),
- M_DEVBUF, M_WAITOK);
+ pbi = kmem_alloc(sizeof(struct genppc_pci_chipset_businfo), KM_SLEEP);
pbi->pbi_properties = prop_dictionary_create();
KASSERT(pbi->pbi_properties != NULL);
Index: src/sys/arch/bebox/bebox/pic_bebox.c
diff -u src/sys/arch/bebox/bebox/pic_bebox.c:1.11 src/sys/arch/bebox/bebox/pic_bebox.c:1.12
--- src/sys/arch/bebox/bebox/pic_bebox.c:1.11 Sun Nov 10 21:16:25 2019
+++ src/sys/arch/bebox/bebox/pic_bebox.c Wed Nov 18 03:46:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_bebox.c,v 1.11 2019/11/10 21:16:25 chs Exp $ */
+/* $NetBSD: pic_bebox.c,v 1.12 2020/11/18 03:46:25 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,12 +30,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pic_bebox.c,v 1.11 2019/11/10 21:16:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_bebox.c,v 1.12 2020/11/18 03:46:25 thorpej Exp $");
#include "opt_multiprocessor.h"
#include
-#include
+#include
#include
#include
@@ -57,7 +57,7 @@ setup_bebox_intr(void)
{
struct pic_ops *pic;
- pic = malloc(sizeof(struct pic_ops), M_DEVBUF, M_WAITOK);
+ pic = kmem_alloc(sizeof(struct pic_ops), KM_SLEEP);
pic->pic_numintrs = 32;
pic->pic_cookie = (void *)BEBOX_REG;
pic->pic_enable_irq = bebox_enable_irq;
CVS commit: src/sys/arch/cesfic
Module Name:src
Committed By: thorpej
Date: Wed Nov 18 03:40:50 UTC 2020
Modified Files:
src/sys/arch/cesfic/cesfic: isr.c
src/sys/arch/cesfic/dev: zs.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/cesfic/cesfic/isr.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/cesfic/dev/zs.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/cesfic/cesfic/isr.c
diff -u src/sys/arch/cesfic/cesfic/isr.c:1.17 src/sys/arch/cesfic/cesfic/isr.c:1.18
--- src/sys/arch/cesfic/cesfic/isr.c:1.17 Sun Nov 10 21:16:25 2019
+++ src/sys/arch/cesfic/cesfic/isr.c Wed Nov 18 03:40:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: isr.c,v 1.17 2019/11/10 21:16:25 chs Exp $ */
+/* $NetBSD: isr.c,v 1.18 2020/11/18 03:40:50 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.17 2019/11/10 21:16:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.18 2020/11/18 03:40:50 thorpej Exp $");
#include
#include
#include
-#include
+#include
#include
#include
@@ -76,7 +76,7 @@ isrlink(int (*func)(void *), void *arg,
if ((ipl < 0) || (ipl >= NISR))
panic("isrlink: bad ipl %d", ipl);
- newisr = malloc(sizeof(struct isr), M_DEVBUF, M_WAITOK);
+ newisr = kmem_alloc(sizeof(*newisr), KM_SLEEP);
newisr->isr_func = func;
newisr->isr_arg = arg;
newisr->isr_ipl = ipl;
@@ -144,7 +144,7 @@ isrunlink(void *arg)
struct isr *isr = arg;
LIST_REMOVE(isr, isr_link);
- free(isr, M_DEVBUF);
+ kmem_free(isr, sizeof(*isr));
}
#endif
Index: src/sys/arch/cesfic/dev/zs.c
diff -u src/sys/arch/cesfic/dev/zs.c:1.20 src/sys/arch/cesfic/dev/zs.c:1.21
--- src/sys/arch/cesfic/dev/zs.c:1.20 Sun Nov 10 21:16:25 2019
+++ src/sys/arch/cesfic/dev/zs.c Wed Nov 18 03:40:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.20 2019/11/10 21:16:25 chs Exp $ */
+/* $NetBSD: zs.c,v 1.21 2020/11/18 03:40:50 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.20 2019/11/10 21:16:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.21 2020/11/18 03:40:50 thorpej Exp $");
#include "opt_ddb.h"
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.20
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -123,8 +123,7 @@ zs_config(struct zsc_softc *zsc, char *b
if (zsc_args.hwflags & ZS_HWFLAG_CONSOLE) {
cs = &zs_conschan_store;
} else {
- cs = malloc(sizeof(struct zs_chanstate),
-M_DEVBUF, M_WAITOK | M_ZERO);
+ cs = kmem_zalloc(sizeof(*cs), KM_SLEEP);
if(channel==0){
cs->cs_reg_csr = base + 7;
cs->cs_reg_data = base + 15;
CVS commit: src/sys/arch/hp300
Module Name:src
Committed By: thorpej
Date: Wed Nov 18 02:22:17 UTC 2020
Modified Files:
src/sys/arch/hp300/dev: hpib.c ppi.c
src/sys/arch/hp300/hp300: autoconf.c intr.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/hp300/dev/hpib.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/hp300/dev/ppi.c
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/hp300/hp300/autoconf.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/hp300/hp300/intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/dev/hpib.c
diff -u src/sys/arch/hp300/dev/hpib.c:1.40 src/sys/arch/hp300/dev/hpib.c:1.41
--- src/sys/arch/hp300/dev/hpib.c:1.40 Sun Nov 10 21:16:27 2019
+++ src/sys/arch/hp300/dev/hpib.c Wed Nov 18 02:22:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hpib.c,v 1.40 2019/11/10 21:16:27 chs Exp $ */
+/* $NetBSD: hpib.c,v 1.41 2020/11/18 02:22:16 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -65,12 +65,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.40 2019/11/10 21:16:27 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.41 2020/11/18 02:22:16 thorpej Exp $");
#include
#include
#include
-#include
+#include
#include
#include
@@ -161,7 +161,7 @@ hpibbusattach(device_t parent, device_t
/*
* Initialize the DMA queue entry.
*/
- sc->sc_dq = malloc(sizeof(struct dmaqueue), M_DEVBUF, M_WAITOK);
+ sc->sc_dq = kmem_alloc(sizeof(struct dmaqueue), KM_SLEEP);
sc->sc_dq->dq_softc = sc;
sc->sc_dq->dq_start = hpibstart;
sc->sc_dq->dq_done = hpibdone;
Index: src/sys/arch/hp300/dev/ppi.c
diff -u src/sys/arch/hp300/dev/ppi.c:1.47 src/sys/arch/hp300/dev/ppi.c:1.48
--- src/sys/arch/hp300/dev/ppi.c:1.47 Mon Sep 3 16:29:24 2018
+++ src/sys/arch/hp300/dev/ppi.c Wed Nov 18 02:22:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ppi.c,v 1.47 2018/09/03 16:29:24 riastradh Exp $ */
+/* $NetBSD: ppi.c,v 1.48 2020/11/18 02:22:16 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.47 2018/09/03 16:29:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.48 2020/11/18 02:22:16 thorpej Exp $");
#include
#include
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.47
#include
#include
#include
-#include
+#include
#include
#include
@@ -299,7 +299,7 @@ ppirw(dev_t dev, struct uio *uio)
int s, s2, len, cnt;
char *cp;
int error = 0, gotdata = 0;
- int buflen, ctlr, slave;
+ int ctlr, slave;
char *buf;
if (uio->uio_resid == 0)
@@ -314,8 +314,8 @@ ppirw(dev_t dev, struct uio *uio)
dev, uio, uio->uio_rw == UIO_READ ? 'R' : 'W',
sc->sc_burst, sc->sc_timo, uio->uio_resid);
#endif
- buflen = uimin(sc->sc_burst, uio->uio_resid);
- buf = (char *)malloc(buflen, M_DEVBUF, M_WAITOK);
+ const int buflen = uimin(sc->sc_burst, uio->uio_resid);
+ buf = kmem_alloc(buflen, KM_SLEEP);
sc->sc_flags |= PPIF_UIO;
if (sc->sc_timo > 0) {
sc->sc_flags |= PPIF_TIMO;
@@ -442,7 +442,7 @@ again:
len-cnt);
#endif
}
- free(buf, M_DEVBUF);
+ kmem_free(buf, buflen);
#ifdef DEBUG
if (ppidebug & (PDB_FOLLOW|PDB_IO))
printf("ppirw: return %d, resid %d\n", error, uio->uio_resid);
Index: src/sys/arch/hp300/hp300/autoconf.c
diff -u src/sys/arch/hp300/hp300/autoconf.c:1.107 src/sys/arch/hp300/hp300/autoconf.c:1.108
--- src/sys/arch/hp300/hp300/autoconf.c:1.107 Sun Nov 10 21:16:27 2019
+++ src/sys/arch/hp300/hp300/autoconf.c Wed Nov 18 02:22:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.107 2019/11/10 21:16:27 chs Exp $ */
+/* $NetBSD: autoconf.c,v 1.108 2020/11/18 02:22:16 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997, 2002 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.107 2019/11/10 21:16:27 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.108 2020/11/18 02:22:16 thorpej Exp $");
#include "dvbox.h"
#include "gbox.h"
@@ -108,7 +108,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -395,7 +395,7 @@ device_register(device_t dev, void *aux)
* we can mount as root.
*/
- dd = malloc(sizeof(struct dev_data), M_DEVBUF, M_WAITOK | M_ZERO);
+ dd = kmem_zalloc(sizeof(*dd), KM_SLEEP);
dd->dd_dev = dev;
/*
@@ -439,7 +439,7 @@ device_register(device_t dev, void *aux)
/*
* Didn't need the dev_data.
*/
- free(dd, M_DEVBUF);
+ kmem_free(dd, sizeof(*dd));
return;
linkup:
@@ -677,7 +677,7 @@ setbootdev(void)
for (dd = LIST_FIRST(&dev_data_list); dd != NULL; ) {
cdd = dd;
dd = LIST_NEXT(dd, dd_list);
- free(cdd, M_DEVBUF);
+ kmem_free(cdd, sizeof(*cdd));
}
}
Index: src/sys/arch/hp300/hp300/intr.c
diff -u src/sys/arch/hp300/hp300/intr.c:1.43 src/sys/arch/hp300/hp300/intr.c:1.44
CVS commit: src/sys/arch/arc
Module Name:src
Committed By: thorpej
Date: Wed Nov 18 02:14:13 UTC 2020
Modified Files:
src/sys/arch/arc/arc: bus_dma.c p_dti_arcstation.c
src/sys/arch/arc/isa: isabus.c isadma_bounce.c
src/sys/arch/arc/jazz: bus_dma_jazz.c pckbc_jazzio.c
src/sys/arch/arc/pci: necpb.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arc/arc/bus_dma.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arc/arc/p_dti_arcstation.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/arc/isa/isabus.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arc/isa/isadma_bounce.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arc/jazz/bus_dma_jazz.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arc/jazz/pckbc_jazzio.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/arc/pci/necpb.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/arc/arc/bus_dma.c
diff -u src/sys/arch/arc/arc/bus_dma.c:1.34 src/sys/arch/arc/arc/bus_dma.c:1.35
--- src/sys/arch/arc/arc/bus_dma.c:1.34 Thu Jun 11 08:22:08 2015
+++ src/sys/arch/arc/arc/bus_dma.c Wed Nov 18 02:14:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.34 2015/06/11 08:22:08 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.35 2020/11/18 02:14:13 thorpej Exp $ */
/* NetBSD: bus_dma.c,v 1.20 2000/01/10 03:24:36 simonb Exp */
/*-
@@ -32,13 +32,14 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.34 2015/06/11 08:22:08 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.35 2020/11/18 02:14:13 thorpej Exp $");
#include
#include
#include
#include
#include
+#include
#include
@@ -74,6 +75,14 @@ _bus_dma_tag_init(bus_dma_tag_t t)
t->_dmamem_mmap = _bus_dmamem_mmap;
}
+static size_t
+_bus_dmamap_mapsize(int const nsegments)
+{
+ KASSERT(nsegments > 0);
+ return sizeof(struct arc_bus_dmamap) +
+ (sizeof(bus_dma_segment_t) * (nsegments - 1));
+}
+
/*
* Common function for DMA map creation. May be called by bus-specific
* DMA map creation functions.
@@ -84,7 +93,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
{
struct arc_bus_dmamap *map;
void *mapstore;
- size_t mapsize;
/*
* Allocate and initialize the DMA map. The end of the map
@@ -98,10 +106,8 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
* The bus_dmamap_t includes one bus_dma_segment_t, hence
* the (nsegments - 1).
*/
- mapsize = sizeof(struct arc_bus_dmamap) +
- (sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DMAMAP,
- ((flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK) | M_ZERO)) == NULL)
+ if ((mapstore = kmem_zalloc(_bus_dmamap_mapsize(nsegments),
+ (flags & BUS_DMA_NOWAIT) ? KM_NOSLEEP : KM_SLEEP)) == NULL)
return ENOMEM;
map = (struct arc_bus_dmamap *)mapstore;
@@ -127,7 +133,7 @@ void
_bus_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t map)
{
- free(map, M_DMAMAP);
+ kmem_free(map, _bus_dmamap_mapsize(map->_dm_segcnt));
}
/*
Index: src/sys/arch/arc/arc/p_dti_arcstation.c
diff -u src/sys/arch/arc/arc/p_dti_arcstation.c:1.19 src/sys/arch/arc/arc/p_dti_arcstation.c:1.20
--- src/sys/arch/arc/arc/p_dti_arcstation.c:1.19 Sat Jun 13 20:01:27 2020
+++ src/sys/arch/arc/arc/p_dti_arcstation.c Wed Nov 18 02:14:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: p_dti_arcstation.c,v 1.19 2020/06/13 20:01:27 ad Exp $ */
+/* $NetBSD: p_dti_arcstation.c,v 1.20 2020/11/18 02:14:13 thorpej Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: p_dti_arcstation.c,v 1.19 2020/06/13 20:01:27 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p_dti_arcstation.c,v 1.20 2020/11/18 02:14:13 thorpej Exp $");
#define __INTR_PRIVATE
#include
@@ -165,7 +165,7 @@ btl_dti_arcstation_bouncemem(u_int *base
*sizep = TYNE_S_BOUNCE; /* Good enough? XXX */
#if 0
- *basep = (u_int) malloc(*sizep, M_DEVBUF, M_WAITOK);
+ *basep = (u_int) kmem_alloc(*sizep, KM_SLEEP);
#else
*basep = (u_int) rpc44_buffer | 0xa000;
#endif
Index: src/sys/arch/arc/isa/isabus.c
diff -u src/sys/arch/arc/isa/isabus.c:1.50 src/sys/arch/arc/isa/isabus.c:1.51
--- src/sys/arch/arc/isa/isabus.c:1.50 Sun Nov 10 21:16:22 2019
+++ src/sys/arch/arc/isa/isabus.c Wed Nov 18 02:14:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: isabus.c,v 1.50 2019/11/10 21:16:22 chs Exp $ */
+/* $NetBSD: isabus.c,v 1.51 2020/11/18 02:14:13 thorpej Exp $ */
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
@@ -120,7 +120,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.50 2019/11/10 21:16:22 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.51 2020/11/18 02:14:13 thorpej Exp $");
#include
#include
@@ -129,7 +129,7 @@ __KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1
#include
#include
#include
-#include
+#include
#include
#include
@@ -340,7
CVS commit: src/sys/arch/alpha
Module Name:src
Committed By: thorpej
Date: Wed Nov 18 02:04:30 UTC 2020
Modified Files:
src/sys/arch/alpha/common: bus_dma.c
src/sys/arch/alpha/eisa: eisa_machdep.c
src/sys/arch/alpha/isa: isadma_bounce.c
src/sys/arch/alpha/jensenio: pckbc_jensenio.c
src/sys/arch/alpha/pci: dwlpx_dma.c mcpcia.c sio.c
src/sys/arch/alpha/sableio: pckbc_sableio.c
src/sys/arch/alpha/tc: ioasic.c tc_3000_300.c tc_3000_500.c
tc_dma_3000_500.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/alpha/common/bus_dma.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/alpha/eisa/eisa_machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/alpha/isa/isadma_bounce.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/alpha/jensenio/pckbc_jensenio.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/alpha/pci/dwlpx_dma.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/alpha/pci/mcpcia.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/alpha/pci/sio.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/alpha/sableio/pckbc_sableio.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/alpha/tc/ioasic.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/alpha/tc/tc_3000_300.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/alpha/tc/tc_3000_500.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/alpha/tc/tc_dma_3000_500.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/alpha/common/bus_dma.c
diff -u src/sys/arch/alpha/common/bus_dma.c:1.70 src/sys/arch/alpha/common/bus_dma.c:1.71
--- src/sys/arch/alpha/common/bus_dma.c:1.70 Sun Oct 11 00:33:30 2020
+++ src/sys/arch/alpha/common/bus_dma.c Wed Nov 18 02:04:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.70 2020/10/11 00:33:30 thorpej Exp $ */
+/* $NetBSD: bus_dma.c,v 1.71 2020/11/18 02:04:29 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,13 +32,13 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.70 2020/10/11 00:33:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.71 2020/11/18 02:04:29 thorpej Exp $");
#include
#include
#include
#include
-#include
+#include
#include
#include
@@ -59,6 +59,14 @@ extern paddr_t avail_start, avail_end; /
#define DMA_COUNT_DECL(cnt) _DMA_COUNT_DECL(dma_direct, cnt)
#define DMA_COUNT(cnt) _DMA_COUNT(dma_direct, cnt)
+static size_t
+_bus_dmamap_mapsize(int const nsegments)
+{
+ KASSERT(nsegments > 0);
+ return sizeof(struct alpha_bus_dmamap) +
+ (sizeof(bus_dma_segment_t) * (nsegments - 1));
+}
+
/*
* Common function for DMA map creation. May be called by bus-specific
* DMA map creation functions.
@@ -69,7 +77,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
{
struct alpha_bus_dmamap *map;
void *mapstore;
- size_t mapsize;
/*
* Allocate and initialize the DMA map. The end of the map
@@ -83,13 +90,10 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
* The bus_dmamap_t includes one bus_dma_segment_t, hence
* the (nsegments - 1).
*/
- mapsize = sizeof(struct alpha_bus_dmamap) +
- (sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DMAMAP,
- (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL)
+ if ((mapstore = kmem_zalloc(_bus_dmamap_mapsize(nsegments),
+ (flags & BUS_DMA_NOWAIT) ? KM_NOSLEEP : KM_SLEEP)) == NULL)
return (ENOMEM);
- memset(mapstore, 0, mapsize);
map = (struct alpha_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
@@ -116,7 +120,7 @@ void
_bus_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t map)
{
- free(map, M_DMAMAP);
+ kmem_free(map, _bus_dmamap_mapsize(map->_dm_segcnt));
}
/*
Index: src/sys/arch/alpha/eisa/eisa_machdep.c
diff -u src/sys/arch/alpha/eisa/eisa_machdep.c:1.12 src/sys/arch/alpha/eisa/eisa_machdep.c:1.13
--- src/sys/arch/alpha/eisa/eisa_machdep.c:1.12 Sat Mar 29 19:28:25 2014
+++ src/sys/arch/alpha/eisa/eisa_machdep.c Wed Nov 18 02:04:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: eisa_machdep.c,v 1.12 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: eisa_machdep.c,v 1.13 2020/11/18 02:04:29 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,12 +31,12 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.12 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.13 2020/11/18 02:04:29 thorpej Exp $");
#include
#include
#include
-#include
+#include
#include
#include
@@ -157,10 +157,7 @@ eisa_parse_mem(struct ecu_func *ecuf, ui
int i;
for (i = 0; i < ECUF_MEM_ENTRY_CNT; i++) {
- ecum = malloc(sizeof(*ecum), M_DEVBUF, M_ZERO|M_WAITOK);
- if (ecum == NULL)
- panic("%s: can't allocate memory for ecum", __func__);
-
+ ecum = kmem_zalloc(sizeof(*ecum), KM_SLEEP);
ecum->ecum_mem.ecm_isram = dp[0] & 0x1;
ecum->ecum_mem.ecm_unitsize = dp[1] & 0x3;
ecum->ecum_mem.ecm_decod
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: sjg
Date: Wed Nov 18 01:12:00 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile
Log Message:
Some tests need help with dash
To generate a diff of this commit:
cvs rdiff -u -r1.205 -r1.206 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.205 src/usr.bin/make/unit-tests/Makefile:1.206
--- src/usr.bin/make/unit-tests/Makefile:1.205 Tue Nov 17 20:27:35 2020
+++ src/usr.bin/make/unit-tests/Makefile Wed Nov 18 01:12:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.205 2020/11/17 20:27:35 rillig Exp $
+# $NetBSD: Makefile,v 1.206 2020/11/18 01:12:00 sjg Exp $
#
# Unit tests for make(1)
#
@@ -427,6 +427,15 @@ FLAGS.doterror= # none, especially not
FLAGS.varname-empty= -dv '$${:U}=cmdline-u' '=cmdline-plain'
# Some tests need extra postprocessing.
+SED_CMDS.export= \
+ -e '/^[^=_A-Za-z0-9]*=/d'
+# these all share the same requirement
+.for t in export-all export-env
+SED_CMDS.$t= ${SED_CMDS.export}
+.endfor
+SED_CMDS.directive-export-gmake= \
+ ${:D dash is a pain } \
+ -e /non-zero/d
SED_CMDS.job-output-long-lines= \
${:D Job separators on their own line are ok. } \
-e '/^--- job-[ab] ---$$/d' \
@@ -451,7 +460,10 @@ SED_CMDS.opt-debug-jobs+= -e 's,JobFinis
# 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.var-op-shell+= -e 's,^${.SHELL:T}: [ 0-9:]*,,'
-SED_CMDS.var-op-shell+= -e '/command/s,No such.*,not found,'
+SED_CMDS.var-op-shell+= -e '/command/{ s,^[1-9]: ,,;s,No such.*,not found,; }'
+SED_CMDS.vardebug= \
+ ${:D canonicalize .SHELL } \
+ -e 's,${.SHELL},/bin/sh,'
SED_CMDS.vardebug+= -e 's,${.SHELL},,'
SED_CMDS.varmod-subst-regex+= \
-e 's,\(Regex compilation error:\).*,\1 (details omitted),'
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: sjg
Date: Wed Nov 18 01:06:59 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: opt.exp opt.mk
Log Message:
Always use -r -f /dev/null when not intending to read a makefile
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/opt.exp
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/opt.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/opt.exp
diff -u src/usr.bin/make/unit-tests/opt.exp:1.6 src/usr.bin/make/unit-tests/opt.exp:1.7
--- src/usr.bin/make/unit-tests/opt.exp:1.6 Sun Nov 15 06:19:34 2020
+++ src/usr.bin/make/unit-tests/opt.exp Wed Nov 18 01:06:59 2020
@@ -1,4 +1,4 @@
-make -V MAKEFLAGS
+make -r -f /dev/null -V MAKEFLAGS
-r -k -d 0
make -:
Index: src/usr.bin/make/unit-tests/opt.mk
diff -u src/usr.bin/make/unit-tests/opt.mk:1.5 src/usr.bin/make/unit-tests/opt.mk:1.6
--- src/usr.bin/make/unit-tests/opt.mk:1.5 Sun Nov 15 06:19:34 2020
+++ src/usr.bin/make/unit-tests/opt.mk Wed Nov 18 01:06:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: opt.mk,v 1.5 2020/11/15 06:19:34 rillig Exp $
+# $NetBSD: opt.mk,v 1.6 2020/11/18 01:06:59 sjg Exp $
#
# Tests for the command line options.
@@ -8,7 +8,7 @@ all: .IGNORE
# The options from the top-level make are passed to the sub-makes via
# the environment variable MAKEFLAGS. This is where the " -r -k -d 0"
# comes from. See MainParseArg.
- ${MAKE} -V MAKEFLAGS
+ ${MAKE} -r -f /dev/null -V MAKEFLAGS
@echo
# Just to see how the custom argument parsing code reacts to a syntax
CVS commit: src/usr.bin/patch
Module Name:src
Committed By: rhialto
Date: Tue Nov 17 20:49:12 UTC 2020
Modified Files:
src/usr.bin/patch: pch.c util.c
Log Message:
Remove heuristic for dealing with trailing newlines being truncated by mailers.
Patch and explanation taken from bsdimp:
https://bsdimp.blogspot.com/2020/08/a-35-year-old-bug-in-patch-found-in.html
https://svnweb.freebsd.org/base?view=revision&revision=364291
Every version of patch since the first one posted to mod.sources in 1985 have
included a heuristic for coping with the state of email messaging at the
time. This heuristic would add up to 4 blank lines to a patch if it thought it
needed it. The trouble is, though this causes at least one bug.
The bug in my case is that if you have a context diff whose last hunk only
deletes 3 or fewer lines, then if you try to reverse apply it with -R, it will
fail. The reason for this is the heuristic builds an internal representation
that includes those blank lines. However, it should really replicate the lines
from the pattern lines line it would any other time, not assume they are blank
lines. Removing this heuristic will prevent patch from misapplying the lines
removed after applying a 'fuzz' factor to the previous blank line in the file. I
believe this will only affect 'new-style' 4.3BSD context diffs and not the
older-style 4.2BSD diffs and plain, non-context diffs. It won't affect any of
the newer formats, since they don't use the 'omitted' construct in the same way.
Since this heuristic was put into patch at a time when email / etc ate trailing
white space on a regular basis, and since it's clear that this heuristic is the
wrong thing to do at least some of the time, it's better to remove it
entirely. It's not been needed for maybe 20 years since patch files are not
usually corrupted. If there are a small number of patch files that would benefit
from this corruption fixing, those already-currupt patches can be fixed by the
addition of blank lines. I'd wager that no one will ever come to me with an
example of a once-working patch file that breaks with this change. However, I
have 2 patches from the first 195 patches to 2.11BSD that are affected by this
bug, suggesting that the relative frequency of the issue has changed
signficantly since the original heuristic was put into place.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/patch/pch.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/patch/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/patch/pch.c
diff -u src/usr.bin/patch/pch.c:1.30 src/usr.bin/patch/pch.c:1.31
--- src/usr.bin/patch/pch.c:1.30 Mon Jun 18 18:33:31 2018
+++ src/usr.bin/patch/pch.c Tue Nov 17 20:49:12 2020
@@ -1,7 +1,7 @@
/*
* $OpenBSD: pch.c,v 1.37 2007/09/02 15:19:33 deraadt Exp $
* $DragonFly: src/usr.bin/patch/pch.c,v 1.6 2008/08/10 23:35:40 joerg Exp $
- * $NetBSD: pch.c,v 1.30 2018/06/18 18:33:31 christos Exp $
+ * $NetBSD: pch.c,v 1.31 2020/11/17 20:49:12 rhialto Exp $
*/
/*
@@ -31,7 +31,7 @@
*/
#include
-__RCSID("$NetBSD: pch.c,v 1.30 2018/06/18 18:33:31 christos Exp $");
+__RCSID("$NetBSD: pch.c,v 1.31 2020/11/17 20:49:12 rhialto Exp $");
#include
#include
@@ -556,16 +556,11 @@ another_hunk(void)
ret = pgets(buf, buf_len, pfp);
p_input_line++;
if (ret == NULL) {
-if (p_max - p_end < 4) {
- /* assume blank lines got chopped */
- strlcpy(buf, " \n", buf_len);
-} else {
- if (repl_beginning && repl_could_be_missing) {
- repl_missing = true;
- goto hunk_done;
- }
- fatal("unexpected end of file in patch\n");
+if (repl_beginning && repl_could_be_missing) {
+ repl_missing = true;
+ goto hunk_done;
}
+fatal("unexpected end of file in patch\n");
}
p_end++;
if (p_end >= hunkmax)
Index: src/usr.bin/patch/util.c
diff -u src/usr.bin/patch/util.c:1.28 src/usr.bin/patch/util.c:1.29
--- src/usr.bin/patch/util.c:1.28 Mon Jun 18 18:33:31 2018
+++ src/usr.bin/patch/util.c Tue Nov 17 20:49:12 2020
@@ -1,7 +1,7 @@
/*
* $OpenBSD: util.c,v 1.32 2006/03/11 19:41:30 otto Exp $
* $DragonFly: src/usr.bin/patch/util.c,v 1.9 2007/09/29 23:11:10 swildner Exp $
- * $NetBSD: util.c,v 1.28 2018/06/18 18:33:31 christos Exp $
+ * $NetBSD: util.c,v 1.29 2020/11/17 20:49:12 rhialto Exp $
*/
/*
@@ -31,7 +31,7 @@
*/
#include
-__RCSID("$NetBSD: util.c,v 1.28 2018/06/18 18:33:31 christos Exp $");
+__RCSID("$NetBSD: util.c,v 1.29 2020/11/17 20:49:12 rhialto Exp $");
#include
#include
@@ -417,7 +417,7 @@ checked_in(char *file)
void
version(void)
{
- printf("Patch version 2.0-12u8-NetBSD\n");
+ printf("Patch version 2.0-12u9-NetBSD\n");
my_exit(EXIT_SUCCESS);
}
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Tue Nov 17 20:27:35 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile vardebug.exp
Log Message:
make(1): make test vardebug independent from the shell
To generate a diff of this commit:
cvs rdiff -u -r1.204 -r1.205 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/vardebug.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.204 src/usr.bin/make/unit-tests/Makefile:1.205
--- src/usr.bin/make/unit-tests/Makefile:1.204 Tue Nov 17 20:19:24 2020
+++ src/usr.bin/make/unit-tests/Makefile Tue Nov 17 20:27:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.204 2020/11/17 20:19:24 rillig Exp $
+# $NetBSD: Makefile,v 1.205 2020/11/17 20:27:35 rillig Exp $
#
# Unit tests for make(1)
#
@@ -452,6 +452,7 @@ SED_CMDS.opt-debug-jobs+= -e 's,JobFinis
SED_CMDS.opt-debug-jobs+= -e 's,^\(.Command: sh\) -q,\1,'
SED_CMDS.var-op-shell+= -e 's,^${.SHELL:T}: [ 0-9:]*,,'
SED_CMDS.var-op-shell+= -e '/command/s,No such.*,not found,'
+SED_CMDS.vardebug+= -e 's,${.SHELL},,'
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/vardebug.exp
diff -u src/usr.bin/make/unit-tests/vardebug.exp:1.12 src/usr.bin/make/unit-tests/vardebug.exp:1.13
--- src/usr.bin/make/unit-tests/vardebug.exp:1.12 Sat Oct 31 18:14:59 2020
+++ src/usr.bin/make/unit-tests/vardebug.exp Tue Nov 17 20:27:35 2020
@@ -77,7 +77,7 @@ make: "vardebug.mk" line 44: Malformed c
Var_Parse: ${UNDEFINED} with VARE_UNDEFERR|VARE_WANTRES
make: "vardebug.mk" line 53: Malformed conditional (${UNDEFINED})
Global:delete .SHELL (not found)
-Command:.SHELL = /bin/sh
+Command:.SHELL =
Command:.SHELL = overwritten ignored (read-only)
Global:.MAKEFLAGS = -r -k -d v -d
Global:.MAKEFLAGS = -r -k -d v -d 0
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Tue Nov 17 20:19:24 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile
Log Message:
make(1): fix test output of var-op-shell for dash
Dash is helpful and outputs the line number in case of an error. The
other shells don't do this. Accept both variants.
To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 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.203 src/usr.bin/make/unit-tests/Makefile:1.204
--- src/usr.bin/make/unit-tests/Makefile:1.203 Mon Nov 16 15:12:16 2020
+++ src/usr.bin/make/unit-tests/Makefile Tue Nov 17 20:19:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.203 2020/11/16 15:12:16 rillig Exp $
+# $NetBSD: Makefile,v 1.204 2020/11/17 20:19:24 rillig Exp $
#
# Unit tests for make(1)
#
@@ -450,7 +450,7 @@ SED_CMDS.opt-debug-jobs+= -e 's,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.var-op-shell+= -e 's,^${.SHELL:T}: ,,'
+SED_CMDS.var-op-shell+= -e 's,^${.SHELL:T}: [ 0-9:]*,,'
SED_CMDS.var-op-shell+= -e '/command/s,No such.*,not found,'
SED_CMDS.varmod-subst-regex+= \
-e 's,\(Regex compilation error:\).*,\1 (details omitted),'
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Tue Nov 17 20:16:44 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: directive-export-gmake.mk
Log Message:
make(1): fix test directive-export-gmake for dash
Dash only accepts environment variables whose names follow the usual
naming conventions. (I didn't look up the exact details.) In
particular, it rejects environment variables whose names start or end
with spaces.
This would result in an empty output from grep, in which case the exit
status from the shell command is non-zero, thus make prints an error
about this. This error message should not appear in the test output, to
keep the test output the same for all platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/usr.bin/make/unit-tests/directive-export-gmake.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/directive-export-gmake.mk
diff -u src/usr.bin/make/unit-tests/directive-export-gmake.mk:1.2 src/usr.bin/make/unit-tests/directive-export-gmake.mk:1.3
--- src/usr.bin/make/unit-tests/directive-export-gmake.mk:1.2 Mon Oct 19 18:59:53 2020
+++ src/usr.bin/make/unit-tests/directive-export-gmake.mk Tue Nov 17 20:16:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: directive-export-gmake.mk,v 1.2 2020/10/19 18:59:53 rillig Exp $
+# $NetBSD: directive-export-gmake.mk,v 1.3 2020/11/17 20:16:44 rillig Exp $
#
# Tests for the export directive (without leading dot), as in GNU make.
@@ -39,8 +39,8 @@ export VAR= leading spaces
# may be silently discarded. One such shell is dash, which is the default
# shell on Ubuntu and Debian.
export VAR =trailing space in varname
-.if ${:!env | grep trailing!} != "VAR =trailing space in varname"
-. if ${:!env | grep trailing!} != "" # for dash
+.if ${:!env | grep trailing || true!} != "VAR =trailing space in varname"
+. if ${:!env | grep trailing || true!} != "" # for dash
.error
. endif
.endif
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Tue Nov 17 20:11:02 UTC 2020
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: varmod-shell.exp varmod-shell.mk
Log Message:
make(1): fix error message of failed :!cmd! modifier (since 2000-04-29)
To generate a diff of this commit:
cvs rdiff -u -r1.688 -r1.689 src/usr.bin/make/var.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/varmod-shell.exp
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varmod-shell.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/var.c
diff -u src/usr.bin/make/var.c:1.688 src/usr.bin/make/var.c:1.689
--- src/usr.bin/make/var.c:1.688 Mon Nov 16 21:39:22 2020
+++ src/usr.bin/make/var.c Tue Nov 17 20:11:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.688 2020/11/16 21:39:22 rillig Exp $ */
+/* $NetBSD: var.c,v 1.689 2020/11/17 20:11:02 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.688 2020/11/16 21:39:22 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.689 2020/11/17 20:11:02 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -2308,10 +2308,9 @@ ApplyModifier_ShellCommand(const char **
st->newVal = Cmd_Exec(cmd, &errfmt);
else
st->newVal = bmake_strdup("");
-free(cmd);
-
if (errfmt != NULL)
- Error(errfmt, st->val); /* XXX: why still return AMR_OK? */
+ Error(errfmt, cmd); /* XXX: why still return AMR_OK? */
+free(cmd);
ApplyModifiersState_Define(st);
return AMR_OK;
Index: src/usr.bin/make/unit-tests/varmod-shell.exp
diff -u src/usr.bin/make/unit-tests/varmod-shell.exp:1.2 src/usr.bin/make/unit-tests/varmod-shell.exp:1.3
--- src/usr.bin/make/unit-tests/varmod-shell.exp:1.2 Tue Nov 17 20:08:09 2020
+++ src/usr.bin/make/unit-tests/varmod-shell.exp Tue Nov 17 20:11:02 2020
@@ -1,3 +1,3 @@
-make: "" returned non-zero status
-make: "previous value" returned non-zero status
+make: "echo word; false" returned non-zero status
+make: "echo word; false" returned non-zero status
exit status 0
Index: src/usr.bin/make/unit-tests/varmod-shell.mk
diff -u src/usr.bin/make/unit-tests/varmod-shell.mk:1.4 src/usr.bin/make/unit-tests/varmod-shell.mk:1.5
--- src/usr.bin/make/unit-tests/varmod-shell.mk:1.4 Tue Nov 17 20:08:09 2020
+++ src/usr.bin/make/unit-tests/varmod-shell.mk Tue Nov 17 20:11:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-shell.mk,v 1.4 2020/11/17 20:08:09 rillig Exp $
+# $NetBSD: varmod-shell.mk,v 1.5 2020/11/17 20:11:02 rillig Exp $
#
# Tests for the :sh variable modifier, which runs the shell command
# given by the variable value and returns its output.
@@ -20,7 +20,7 @@
# If the command exits with non-zero, an error message is printed.
# XXX: Processing continues as usual though.
#
-# Since 2000-04-29, the error message mentions the previous
+# Between 2000-04-29 and 2020-11-17, the error message mentioned the previous
# value of the expression (which is usually an empty string) instead of the
# command that was executed. It's strange that such a simple bug could
# survive such a long time.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Tue Nov 17 20:08:09 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: varmod-shell.exp varmod-shell.mk
Log Message:
make(1): document 20-year-old bug in the :!cmd! modifier
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/varmod-shell.exp
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varmod-shell.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/varmod-shell.exp
diff -u src/usr.bin/make/unit-tests/varmod-shell.exp:1.1 src/usr.bin/make/unit-tests/varmod-shell.exp:1.2
--- src/usr.bin/make/unit-tests/varmod-shell.exp:1.1 Sun Aug 16 12:07:51 2020
+++ src/usr.bin/make/unit-tests/varmod-shell.exp Tue Nov 17 20:08:09 2020
@@ -1 +1,3 @@
+make: "" returned non-zero status
+make: "previous value" returned non-zero status
exit status 0
Index: src/usr.bin/make/unit-tests/varmod-shell.mk
diff -u src/usr.bin/make/unit-tests/varmod-shell.mk:1.3 src/usr.bin/make/unit-tests/varmod-shell.mk:1.4
--- src/usr.bin/make/unit-tests/varmod-shell.mk:1.3 Sun Nov 15 20:20:58 2020
+++ src/usr.bin/make/unit-tests/varmod-shell.mk Tue Nov 17 20:08:09 2020
@@ -1,11 +1,35 @@
-# $NetBSD: varmod-shell.mk,v 1.3 2020/11/15 20:20:58 rillig Exp $
+# $NetBSD: varmod-shell.mk,v 1.4 2020/11/17 20:08:09 rillig Exp $
#
# Tests for the :sh variable modifier, which runs the shell command
# given by the variable value and returns its output.
#
-# TODO: Since when is this modifier available?
+# This modifier has been added on 2000-04-29.
+#
+# See also:
+# ApplyModifier_ShellCommand
# TODO: Implementation
+# The command to be run is enclosed between exclamation marks.
+# The previous value of the expression is irrelevant for this modifier.
+# The :!cmd! modifier turns an undefined expression into a defined one.
+.if ${:!echo word!} != "word"
+. error
+.endif
+
+# If the command exits with non-zero, an error message is printed.
+# XXX: Processing continues as usual though.
+#
+# Since 2000-04-29, the error message mentions the previous
+# value of the expression (which is usually an empty string) instead of the
+# command that was executed. It's strange that such a simple bug could
+# survive such a long time.
+.if ${:!echo word; false!} != "word"
+. error
+.endif
+.if ${:Uprevious value:!echo word; false!} != "word"
+. error
+.endif
+
all:
@:;
CVS commit: src/share/misc
Module Name:src Committed By: maya Date: Tue Nov 17 19:56:42 UTC 2020 Modified Files: src/share/misc: acronyms.comp Log Message: Add "AOT" Ahead Of Time To generate a diff of this commit: cvs rdiff -u -r1.315 -r1.316 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.315 src/share/misc/acronyms.comp:1.316 --- src/share/misc/acronyms.comp:1.315 Thu Nov 5 18:05:06 2020 +++ src/share/misc/acronyms.comp Tue Nov 17 19:56:42 2020 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.315 2020/11/05 18:05:06 dholland Exp $ +$NetBSD: acronyms.comp,v 1.316 2020/11/17 19:56:42 maya Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -62,6 +62,7 @@ AO analog output AOC add-on card AOL Alert-on-LAN AOS add or subtract +AOT ahead of time AP access point AP application processor APFS Apple file system
CVS commit: src/sys/arch/arm/rockchip
Module Name:src
Committed By: ryo
Date: Tue Nov 17 18:01:09 UTC 2020
Modified Files:
src/sys/arch/arm/rockchip: rk3399_pcie_phy.c
Log Message:
don't expose 'compatible[]'
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/rockchip/rk3399_pcie_phy.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_phy.c
diff -u src/sys/arch/arm/rockchip/rk3399_pcie_phy.c:1.2 src/sys/arch/arm/rockchip/rk3399_pcie_phy.c:1.3
--- src/sys/arch/arm/rockchip/rk3399_pcie_phy.c:1.2 Wed Jun 17 06:51:08 2020
+++ src/sys/arch/arm/rockchip/rk3399_pcie_phy.c Tue Nov 17 18:01:09 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3399_pcie_phy.c,v 1.2 2020/06/17 06:51:08 thorpej Exp $ */
+/* $NetBSD: rk3399_pcie_phy.c,v 1.3 2020/11/17 18:01:09 ryo Exp $ */
/* $OpenBSD: rkpcie.c,v 1.6 2018/08/28 09:33:18 jsg Exp $ */
/*
* Copyright (c) 2018 Mark Kettenis
@@ -18,7 +18,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie_phy.c,v 1.2 2020/06/17 06:51:08 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie_phy.c,v 1.3 2020/11/17 18:01:09 ryo Exp $");
#include
#include
@@ -47,7 +47,7 @@ static void rkpciephy_attach(device_t, d
CFATTACH_DECL_NEW(rkpciephy, sizeof(struct rkpciephy_softc),
rkpciephy_match, rkpciephy_attach, NULL, NULL);
-const char * const compatible[] = {
+static const char * const compatible[] = {
"rockchip,rk3399-pcie-phy",
NULL
};
CVS commit: src/sys/dev/vmt
Module Name:src Committed By: ryo Date: Tue Nov 17 17:59:31 UTC 2020 Modified Files: src/sys/dev/vmt: vmt_subr.c Log Message: use aprint_verbose_dev() To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/vmt/vmt_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/vmt/vmt_subr.c diff -u src/sys/dev/vmt/vmt_subr.c:1.1 src/sys/dev/vmt/vmt_subr.c:1.2 --- src/sys/dev/vmt/vmt_subr.c:1.1 Tue Oct 27 08:57:11 2020 +++ src/sys/dev/vmt/vmt_subr.c Tue Nov 17 17:59:31 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vmt_subr.c,v 1.1 2020/10/27 08:57:11 ryo Exp $ */ +/* $NetBSD: vmt_subr.c,v 1.2 2020/11/17 17:59:31 ryo Exp $ */ /* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */ /* @@ -165,7 +165,7 @@ vmt_common_attach(struct vmt_softc *sc) uuid.node[5] = u; uuid_snprintf(sc->sc_uuid, sizeof(sc->sc_uuid), &uuid); - device_printf(sc->sc_dev, "UUID: %s\n", sc->sc_uuid); + aprint_verbose_dev(sc->sc_dev, "UUID: %s\n", sc->sc_uuid); } callout_init(&sc->sc_tick, 0);
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Tue Nov 17 10:49:41 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Set USE_XZ_SETS to yes by default for aarch64eb in the same manner as aarch64.
To generate a diff of this commit:
cvs rdiff -u -r1.1233 -r1.1234 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.1233 src/share/mk/bsd.own.mk:1.1234
--- src/share/mk/bsd.own.mk:1.1233 Tue Nov 10 21:47:49 2020
+++ src/share/mk/bsd.own.mk Tue Nov 17 10:49:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1233 2020/11/10 21:47:49 kamil Exp $
+# $NetBSD: bsd.own.mk,v 1.1234 2020/11/17 10:49:41 rin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1495,7 +1495,7 @@ ${var}?= no
.if ${USE_PIGZGZIP} == "no" && \
(${MACHINE} == "amd64" || \
${MACHINE} == "sparc64" || \
- ${MACHINE_ARCH} == "aarch64")
+ ${MACHINE_CPU} == "aarch64")
USE_XZ_SETS?= yes
.else
USE_XZ_SETS?= no
CVS commit: src/usr.sbin/tprof
Module Name:src
Committed By: rin
Date: Tue Nov 17 10:47:17 UTC 2020
Modified Files:
src/usr.sbin/tprof: Makefile
Log Message:
Support aarch64eb; just works fine.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/tprof/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.sbin/tprof/Makefile
diff -u src/usr.sbin/tprof/Makefile:1.9 src/usr.sbin/tprof/Makefile:1.10
--- src/usr.sbin/tprof/Makefile:1.9 Sun Jan 27 05:12:30 2019
+++ src/usr.sbin/tprof/Makefile Tue Nov 17 10:47:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/01/27 05:12:30 kre Exp $
+# $NetBSD: Makefile,v 1.10 2020/11/17 10:47:17 rin Exp $
.PATH: ${.CURDIR}/arch
@@ -10,7 +10,7 @@ SRCS= tprof.c tprof_analyze.c
SRCS+= tprof_x86.c
.elif !empty(MACHINE_ARCH:M*armv7*)
SRCS+= tprof_armv7.c
-.elif ${MACHINE_ARCH} == "aarch64"
+.elif !empty(MACHINE_ARCH:Maarch64*)
SRCS+= tprof_armv8.c
.else
SRCS+= tprof_noarch.c
CVS commit: src
Module Name:src Committed By: rin Date: Tue Nov 17 10:35:16 UTC 2020 Modified Files: src/crypto/external/bsd/heimdal/dist: config.guess src/crypto/external/bsd/netpgp/dist/buildaux: config.guess src/crypto/external/cpl/tpm-tools/dist: config.guess src/crypto/external/cpl/trousers/dist: config.guess src/external/bsd/am-utils/dist: config.guess src/external/bsd/byacc/dist: config.guess src/external/bsd/file/dist: config.guess src/external/bsd/flex/dist/build-aux: config.guess src/external/bsd/iscsi/dist/buildaux: config.guess src/external/bsd/jemalloc/dist/build-aux: config.guess src/external/bsd/libbind/dist: config.guess src/external/bsd/libevent/dist: config.guess src/external/bsd/libpcap/dist: config.guess src/external/bsd/nsd/dist: config.guess src/external/bsd/ntp/dist/sntp/libevent/build-aux: config.guess src/external/bsd/openldap/dist/build: config.guess src/external/bsd/openldap/dist/contrib/ldapc++: config.guess src/external/bsd/openpam/dist: config.guess src/external/bsd/pcc/dist/pcc: config.guess src/external/bsd/tcpdump/dist: config.guess src/external/bsd/tmux/dist/etc: config.guess src/external/bsd/top/dist: config.guess src/external/bsd/unbound/dist: config.guess src/external/gpl2/diffutils/dist/config: config.guess src/external/gpl2/gettext/dist/build-aux: config.guess src/external/gpl2/gettext/dist/gettext-tools/examples/hello-c++-kde/admin: config.guess src/external/gpl2/gmake/dist/config: config.guess src/external/gpl2/grep/dist: config.guess src/external/gpl2/lvm2/dist/autoconf: config.guess src/external/gpl2/texinfo/dist: config.guess src/external/gpl2/xcvs/dist/build-aux: config.guess src/external/gpl3/autoconf/dist/build-aux: config.guess src/external/gpl3/binutils.old/dist: config.guess src/external/gpl3/binutils/dist: config.guess src/external/gpl3/gcc.old/dist: config.guess src/external/gpl3/gcc/dist: config.guess src/external/gpl3/gdb.old/dist: config.guess src/external/gpl3/gdb.old/dist/readline/support: config.guess src/external/gpl3/gdb/dist: config.guess src/external/gpl3/gdb/dist/readline/readline/support: config.guess src/external/lgpl3/gmp/dist: config.guess src/external/lgpl3/mpc/dist: config.guess src/external/lgpl3/mpc/dist/build-aux: config.guess src/external/lgpl3/mpfr/dist: config.guess src/external/mit/expat/dist/conftools: config.guess src/external/mpl/bind/dist: config.guess src/external/mpl/dhcp/dist: config.guess src/external/public-domain/xz/dist/build-aux: config.guess src/lib/librumpuser/build-aux: config.guess src/sys/external/isc/libsodium/dist: config.guess src/sys/external/isc/libsodium/dist/build-aux: config.guess Log Message: Support aarch64eb in */config.guess. Cherry-picked from upstream: https://git.savannah.gnu.org/gitweb/?p=config.git;a=commit;h=1c4398015583eb77bc043234f5734be055e64bea Everything except external/apache2/llvm/dist/llvm/cmake/config.guess is patched, which is under vendor tag and cannot be modified. I expect that this file is not actually used as we use hand-crafted version of configure script instead of cmake for building LLVM. Note that external/apache2/llvm/autoconf/autoconf/config.guess has already been committed on Oct. 20, but commit message disappeared as cvs aborted due to "permission denied" when trying to modify the file mentioned above. Sorry for confusing you. Also note that GMP uses its own config.guess Patch for external/lgpl3/gmp/dist/config.guess is provided by ryo@. Thanks! To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/heimdal/dist/config.guess cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/netpgp/dist/buildaux/config.guess cvs rdiff -u -r1.2 -r1.3 src/crypto/external/cpl/tpm-tools/dist/config.guess cvs rdiff -u -r1.2 -r1.3 src/crypto/external/cpl/trousers/dist/config.guess cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/config.guess cvs rdiff -u -r1.5 -r1.6 src/external/bsd/byacc/dist/config.guess cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/config.guess cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/build-aux/config.guess cvs rdiff -u -r1.2 -r1.3 src/external/bsd/iscsi/dist/buildaux/config.guess cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/jemalloc/dist/build-aux/config.guess cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libbind/dist/config.guess cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libevent/dist/config.guess cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/dist/config.guess cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/dist/config.guess cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/ntp/dist/s
CVS commit: src/tests/usr.bin
Module Name:src
Committed By: gson
Date: Tue Nov 17 08:25:57 UTC 2020
Modified Files:
src/tests/usr.bin/c++: t_tsan_data_race.sh
t_tsan_heap_use_after_free.sh t_tsan_lock_order_inversion.sh
t_tsan_locked_mutex_destroy.sh t_tsan_signal_errno.sh
t_tsan_thread_leak.sh t_tsan_vptr_race.sh
src/tests/usr.bin/cc: t_tsan_data_race.sh t_tsan_heap_use_after_free.sh
t_tsan_lock_order_inversion.sh t_tsan_locked_mutex_destroy.sh
t_tsan_signal_errno.sh t_tsan_thread_leak.sh
Log Message:
Mark t_tsan_*:*profile test cases as expected failures as discussed in
PR toolchain/55760.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/c++/t_tsan_data_race.sh \
src/tests/usr.bin/c++/t_tsan_heap_use_after_free.sh \
src/tests/usr.bin/c++/t_tsan_lock_order_inversion.sh \
src/tests/usr.bin/c++/t_tsan_locked_mutex_destroy.sh \
src/tests/usr.bin/c++/t_tsan_signal_errno.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/c++/t_tsan_thread_leak.sh \
src/tests/usr.bin/c++/t_tsan_vptr_race.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/cc/t_tsan_data_race.sh \
src/tests/usr.bin/cc/t_tsan_heap_use_after_free.sh \
src/tests/usr.bin/cc/t_tsan_lock_order_inversion.sh \
src/tests/usr.bin/cc/t_tsan_locked_mutex_destroy.sh \
src/tests/usr.bin/cc/t_tsan_signal_errno.sh \
src/tests/usr.bin/cc/t_tsan_thread_leak.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/c++/t_tsan_data_race.sh
diff -u src/tests/usr.bin/c++/t_tsan_data_race.sh:1.4 src/tests/usr.bin/c++/t_tsan_data_race.sh:1.5
--- src/tests/usr.bin/c++/t_tsan_data_race.sh:1.4 Tue Sep 15 09:33:12 2020
+++ src/tests/usr.bin/c++/t_tsan_data_race.sh Tue Nov 17 08:25:57 2020
@@ -79,6 +79,7 @@ EOF
}
data_race_profile_body(){
+ atf_expect_fail "PR toolchain/55760"
cat > test.cc << EOF
#include
int GlobalData; pthread_barrier_t barrier;
Index: src/tests/usr.bin/c++/t_tsan_heap_use_after_free.sh
diff -u src/tests/usr.bin/c++/t_tsan_heap_use_after_free.sh:1.4 src/tests/usr.bin/c++/t_tsan_heap_use_after_free.sh:1.5
--- src/tests/usr.bin/c++/t_tsan_heap_use_after_free.sh:1.4 Tue Sep 15 09:33:12 2020
+++ src/tests/usr.bin/c++/t_tsan_heap_use_after_free.sh Tue Nov 17 08:25:57 2020
@@ -105,6 +105,7 @@ EOF
}
heap_use_after_free_profile_body(){
+ atf_expect_fail "PR toolchain/55760"
cat > test.cc << EOF
#include
#include
Index: src/tests/usr.bin/c++/t_tsan_lock_order_inversion.sh
diff -u src/tests/usr.bin/c++/t_tsan_lock_order_inversion.sh:1.4 src/tests/usr.bin/c++/t_tsan_lock_order_inversion.sh:1.5
--- src/tests/usr.bin/c++/t_tsan_lock_order_inversion.sh:1.4 Tue Sep 15 09:33:12 2020
+++ src/tests/usr.bin/c++/t_tsan_lock_order_inversion.sh Tue Nov 17 08:25:57 2020
@@ -85,6 +85,7 @@ EOF
}
lock_order_inversion_profile_body(){
+ atf_expect_fail "PR toolchain/55760"
cat > test.cc << EOF
#include
Index: src/tests/usr.bin/c++/t_tsan_locked_mutex_destroy.sh
diff -u src/tests/usr.bin/c++/t_tsan_locked_mutex_destroy.sh:1.4 src/tests/usr.bin/c++/t_tsan_locked_mutex_destroy.sh:1.5
--- src/tests/usr.bin/c++/t_tsan_locked_mutex_destroy.sh:1.4 Tue Sep 15 09:33:12 2020
+++ src/tests/usr.bin/c++/t_tsan_locked_mutex_destroy.sh Tue Nov 17 08:25:57 2020
@@ -89,6 +89,7 @@ EOF
}
locked_mutex_destroy_profile_body(){
+ atf_expect_fail "PR toolchain/55760"
cat > test.cc << EOF
#include
#include
Index: src/tests/usr.bin/c++/t_tsan_signal_errno.sh
diff -u src/tests/usr.bin/c++/t_tsan_signal_errno.sh:1.4 src/tests/usr.bin/c++/t_tsan_signal_errno.sh:1.5
--- src/tests/usr.bin/c++/t_tsan_signal_errno.sh:1.4 Tue Sep 15 09:33:12 2020
+++ src/tests/usr.bin/c++/t_tsan_signal_errno.sh Tue Nov 17 08:25:57 2020
@@ -85,6 +85,7 @@ EOF
}
signal_errno_profile_body(){
+ atf_expect_fail "PR toolchain/55760"
cat > test.cc << EOF
#include
#include
Index: src/tests/usr.bin/c++/t_tsan_thread_leak.sh
diff -u src/tests/usr.bin/c++/t_tsan_thread_leak.sh:1.3 src/tests/usr.bin/c++/t_tsan_thread_leak.sh:1.4
--- src/tests/usr.bin/c++/t_tsan_thread_leak.sh:1.3 Mon Sep 14 15:17:53 2020
+++ src/tests/usr.bin/c++/t_tsan_thread_leak.sh Tue Nov 17 08:25:57 2020
@@ -93,6 +93,7 @@ EOF
}
thread_leak_profile_body(){
+ atf_expect_fail "PR toolchain/55760"
cat > test.cc << EOF
#include
#include
Index: src/tests/usr.bin/c++/t_tsan_vptr_race.sh
diff -u src/tests/usr.bin/c++/t_tsan_vptr_race.sh:1.3 src/tests/usr.bin/c++/t_tsan_vptr_race.sh:1.4
--- src/tests/usr.bin/c++/t_tsan_vptr_race.sh:1.3 Mon Sep 14 15:17:53 2020
+++ src/tests/usr.bin/c++/t_tsan_vptr_race.sh Tue Nov 17 08:25:57 2020
@@ -99,6 +99,7 @@ EOF
}
vptr_race_profile_body(){
+ atf_expect_fail "PR toolchain/55760"
cat > test.cc << EOF
#include
pthread_barrier_t barrier;
Index: src/tests/usr.bin/cc/t_tsan_data_race.sh
diff -u src/tests/usr.bin/cc/t_tsan_data_race.sh:1.4 src/tests/usr.bin/cc/
