CVS commit: src/share/man/man4/man4.luna68k

2022-06-12 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Sun Jun 12 20:17:35 UTC 2022

Modified Files:
src/share/man/man4/man4.luna68k: autoconf.4 intro.4 mem.4

Log Message:
fix some minor issues


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/man4.luna68k/autoconf.4 \
src/share/man/man4/man4.luna68k/intro.4 \
src/share/man/man4/man4.luna68k/mem.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/man4.luna68k/autoconf.4
diff -u src/share/man/man4/man4.luna68k/autoconf.4:1.1 src/share/man/man4/man4.luna68k/autoconf.4:1.2
--- src/share/man/man4/man4.luna68k/autoconf.4:1.1	Sun Jun 12 03:51:13 2022
+++ src/share/man/man4/man4.luna68k/autoconf.4	Sun Jun 12 20:17:35 2022
@@ -1,4 +1,4 @@
-.\"	$NetBSD: autoconf.4,v 1.1 2022/06/12 03:51:13 tsutsui Exp $
+.\"	$NetBSD: autoconf.4,v 1.2 2022/06/12 20:17:35 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -41,7 +41,8 @@ When
 bootstraps it probes the innards of the machine
 on which it is running
 and locates controllers, drives, and other devices, printing out
-what it finds on the console.  This procedure is driven by a system
+what it finds on the console.
+This procedure is driven by a system
 configuration table which is processed by
 .Xr config 1
 and compiled into each kernel.
@@ -66,7 +67,6 @@ type which it doesn't
 (or at least this compiled version of
 .Nx
 doesn't) understand.
-.Pp
 .It %s%d at mainbus0
 .It %s%d: %s
 An on-board device controller was found.
Index: src/share/man/man4/man4.luna68k/intro.4
diff -u src/share/man/man4/man4.luna68k/intro.4:1.1 src/share/man/man4/man4.luna68k/intro.4:1.2
--- src/share/man/man4/man4.luna68k/intro.4:1.1	Sun Jun 12 03:51:13 2022
+++ src/share/man/man4/man4.luna68k/intro.4	Sun Jun 12 20:17:35 2022
@@ -1,4 +1,4 @@
-.\"	$NetBSD: intro.4,v 1.1 2022/06/12 03:51:13 tsutsui Exp $
+.\"	$NetBSD: intro.4,v 1.2 2022/06/12 20:17:35 wiz Exp $
 .\"	$OpenBSD: intro.4,v 1.10 2022/03/31 17:27:22 naddy Exp $
 .\"
 .\" Copyright (c) 1983, 1986, 1991 Regents of the University of California.
@@ -116,5 +116,5 @@ Fujitsu MB87030/MB89352 SCSI device
 HD647180X I/O processor
 .El
 .Sh SEE ALSO
-.Xr config 1
+.Xr config 1 ,
 .Xr luna68k/autoconf 4
Index: src/share/man/man4/man4.luna68k/mem.4
diff -u src/share/man/man4/man4.luna68k/mem.4:1.1 src/share/man/man4/man4.luna68k/mem.4:1.2
--- src/share/man/man4/man4.luna68k/mem.4:1.1	Sun Jun 12 03:51:13 2022
+++ src/share/man/man4/man4.luna68k/mem.4	Sun Jun 12 20:17:35 2022
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mem.4,v 1.1 2022/06/12 03:51:13 tsutsui Exp $
+.\"	$NetBSD: mem.4,v 1.2 2022/06/12 20:17:35 wiz Exp $
 .\"	$OpenBSD: mem.4,v 1.4 2018/01/12 04:36:44 deraadt Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -62,7 +62,6 @@ On the luna68k, physical memory is alway
 .Ad 0x ,
 and kernel virtual memory also begins at
 .Ad 0x .
-.Pp
 .Sh FILES
 .Bl -tag -width /dev/kmem -compact
 .It Pa /dev/mem



CVS commit: src/share/man/man4/man4.luna68k

2022-06-12 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Sun Jun 12 20:17:35 UTC 2022

Modified Files:
src/share/man/man4/man4.luna68k: autoconf.4 intro.4 mem.4

Log Message:
fix some minor issues


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/man4.luna68k/autoconf.4 \
src/share/man/man4/man4.luna68k/intro.4 \
src/share/man/man4/man4.luna68k/mem.4

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



CVS commit: src/external/bsd/blocklist/lib

2022-06-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Jun 12 17:54:15 UTC 2022

Modified Files:
src/external/bsd/blocklist/lib: bl.c

Log Message:
Handle 0 sized messages (Jose Luis Duran)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/blocklist/lib/bl.c

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

Modified files:

Index: src/external/bsd/blocklist/lib/bl.c
diff -u src/external/bsd/blocklist/lib/bl.c:1.1.1.1 src/external/bsd/blocklist/lib/bl.c:1.2
--- src/external/bsd/blocklist/lib/bl.c:1.1.1.1	Sun Jun 14 21:52:53 2020
+++ src/external/bsd/blocklist/lib/bl.c	Sun Jun 12 13:54:15 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: bl.c,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $	*/
+/*	$NetBSD: bl.c,v 1.2 2022/06/12 17:54:15 christos Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: bl.c,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $");
+__RCSID("$NetBSD: bl.c,v 1.2 2022/06/12 17:54:15 christos Exp $");
 
 #include 
 #include 
@@ -434,6 +434,7 @@ bl_recv(bl_t b)
 	} ub;
 	int got;
 	ssize_t rlen;
+	size_t rem;
 	bl_info_t *bi = >b_info;
 
 	got = 0;
@@ -503,10 +504,12 @@ bl_recv(bl_t b)
 		return NULL;
 	}
 
-	if ((size_t)rlen <= sizeof(ub.bl)) {
+	rem = (size_t)rlen;
+	if (rem < sizeof(ub.bl)) {
 		bl_log(b->b_fun, LOG_ERR, "message too short %zd", rlen);
 		return NULL;
 	}
+	rem -= sizeof(ub.bl);
 
 	if (ub.bl.bl_version != BL_VERSION) {
 		bl_log(b->b_fun, LOG_ERR, "bad version %d", ub.bl.bl_version);
@@ -520,7 +523,10 @@ bl_recv(bl_t b)
 	bi->bi_uid = -1;
 	bi->bi_gid = -1;
 #endif
-	strlcpy(bi->bi_msg, ub.bl.bl_data, MIN(sizeof(bi->bi_msg),
-	((size_t)rlen - sizeof(ub.bl) + 1)));
+	rem = MIN(sizeof(bi->bi_msg), rem);
+	if (rem == 0)
+		bi->bi_msg[0] = '\0';
+	else
+		strlcpy(bi->bi_msg, ub.bl.bl_data, rem);
 	return bi;
 }



CVS commit: src/external/bsd/blocklist/lib

2022-06-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Jun 12 17:54:15 UTC 2022

Modified Files:
src/external/bsd/blocklist/lib: bl.c

Log Message:
Handle 0 sized messages (Jose Luis Duran)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/blocklist/lib/bl.c

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



CVS commit: src/sys/arch

2022-06-12 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sun Jun 12 16:22:37 UTC 2022

Modified Files:
src/sys/arch/arm/sociox: if_scx.c
src/sys/arch/newsmips/dev: scsireg.h

Log Message:
fix few typos in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/arm/sociox/if_scx.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/newsmips/dev/scsireg.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/sociox/if_scx.c
diff -u src/sys/arch/arm/sociox/if_scx.c:1.36 src/sys/arch/arm/sociox/if_scx.c:1.37
--- src/sys/arch/arm/sociox/if_scx.c:1.36	Thu Jan 27 02:34:23 2022
+++ src/sys/arch/arm/sociox/if_scx.c	Sun Jun 12 16:22:37 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_scx.c,v 1.36 2022/01/27 02:34:23 nisimura Exp $	*/
+/*	$NetBSD: if_scx.c,v 1.37 2022/06/12 16:22:37 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
 #define NOT_MP_SAFE	0
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_scx.c,v 1.36 2022/01/27 02:34:23 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_scx.c,v 1.37 2022/06/12 16:22:37 andvar Exp $");
 
 #include 
 #include 
@@ -128,7 +128,7 @@ struct rdes {
 #define  MODENRM	(1U<<28)	/* change mode to normal */
 #define  ENJUMBO	(1U<<27)	/* allow jumbo frame */
 #define  RPTCSUMERR	(1U<<3)		/* log Rx checksum error */
-#define  RPTHDCOMP	(1U<<2)		/* log HD imcomplete condition */
+#define  RPTHDCOMP	(1U<<2)		/* log HD incomplete condition */
 #define  RPTHDERR	(1U<<1)		/* log HD error */
 #define  DROPNOMATCH	(1U<<0)		/* drop no match frames */
 #define xINTSR		0x200		/* aggregated interrupt status */
@@ -360,11 +360,11 @@ struct rdes {
 #define  DMAI_UNF	(1U<<5)		/* Tx underflow detected */
 #define  DMAI_OVF	(1U<<4)		/* receive buffer overflow detected */
 #define  DMAI_TJT	(1U<<3)		/* longer than 2048 frame sent */
-#define  DMAI_TU	(1U<<2)		/* Tx discriptor not available */
+#define  DMAI_TU	(1U<<2)		/* Tx descriptor not available */
 #define  DMAI_TPS	(1U<<1)		/* transmission is stopped */
 #define  DMAI_TI	(1U<<0)		/* frame Tx completed by T0_IC */
 #define GMACOMR		0x1018		/* DMA operation mode */
-#define  OMR_RSF	(1U<<25)	/* 1: Rx store, 0: immed. */
+#define  OMR_RSF	(1U<<25)	/* 1: Rx store, 0: immed. */
 #define  OMR_TSF	(1U<<21)	/* 1: Tx store, 0: immed. */
 #define  OMR_TTC	(14)		/* 16:14 Tx threshold */
 #define  OMR_ST		(1U<<13)	/* run Tx DMA engine, 0 to stop */

Index: src/sys/arch/newsmips/dev/scsireg.h
diff -u src/sys/arch/newsmips/dev/scsireg.h:1.13 src/sys/arch/newsmips/dev/scsireg.h:1.14
--- src/sys/arch/newsmips/dev/scsireg.h:1.13	Wed Jan  5 16:01:54 2022
+++ src/sys/arch/newsmips/dev/scsireg.h	Sun Jun 12 16:22:37 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsireg.h,v 1.13 2022/01/05 16:01:54 andvar Exp $	*/
+/*	$NetBSD: scsireg.h,v 1.14 2022/06/12 16:22:37 andvar Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -266,7 +266,7 @@ struct sc_softc {
 #define SC_DMAC_RD	1
 #define SC_DMAC_WR	2
 
-	struct sc_chan_stat *wbq_actf;		/* forword active pointer */
+	struct sc_chan_stat *wbq_actf;		/* forward active pointer */
 	struct sc_chan_stat *wbq_actl;		/* last active pointer */
 
 	uint8_t	*act_cmd_pointer;



CVS commit: src/sys/arch

2022-06-12 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sun Jun 12 16:22:37 UTC 2022

Modified Files:
src/sys/arch/arm/sociox: if_scx.c
src/sys/arch/newsmips/dev: scsireg.h

Log Message:
fix few typos in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/arm/sociox/if_scx.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/newsmips/dev/scsireg.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

2022-06-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Jun 12 16:09:21 UTC 2022

Modified Files:
src/usr.bin/make: for.c
src/usr.bin/make/unit-tests: directive-for-escape.exp
directive-for-escape.mk

Log Message:
make: document ExprLen, which is part of a .for loop

No binary change


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/usr.bin/make/for.c
cvs rdiff -u -r1.16 -r1.17 \
src/usr.bin/make/unit-tests/directive-for-escape.exp
cvs rdiff -u -r1.15 -r1.16 \
src/usr.bin/make/unit-tests/directive-for-escape.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/for.c
diff -u src/usr.bin/make/for.c:1.167 src/usr.bin/make/for.c:1.168
--- src/usr.bin/make/for.c:1.167	Fri Feb  4 23:22:19 2022
+++ src/usr.bin/make/for.c	Sun Jun 12 16:09:21 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: for.c,v 1.167 2022/02/04 23:22:19 rillig Exp $	*/
+/*	$NetBSD: for.c,v 1.168 2022/06/12 16:09:21 rillig Exp $	*/
 
 /*
  * Copyright (c) 1992, The Regents of the University of California.
@@ -58,7 +58,7 @@
 #include "make.h"
 
 /*	"@(#)for.c	8.1 (Berkeley) 6/6/93"	*/
-MAKE_RCSID("$NetBSD: for.c,v 1.167 2022/02/04 23:22:19 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.168 2022/06/12 16:09:21 rillig Exp $");
 
 
 typedef struct ForLoop {
@@ -269,7 +269,14 @@ For_Accum(const char *line, int *forLeve
 	return true;
 }
 
-
+/*
+ * When the body of a '.for i' loop is prepared for an iteration, each
+ * occurrence of $i in the body is replaced with ${:U...}, inserting the
+ * value of the item.  If this item contains a '$', it may be the start of a
+ * variable expression.  This expression is copied verbatim, its length is
+ * determined here, in a rather naive way, ignoring escape characters and
+ * funny delimiters in modifiers like ':S}from}to}'.
+ */
 static size_t
 ExprLen(const char *s, const char *e)
 {

Index: src/usr.bin/make/unit-tests/directive-for-escape.exp
diff -u src/usr.bin/make/unit-tests/directive-for-escape.exp:1.16 src/usr.bin/make/unit-tests/directive-for-escape.exp:1.17
--- src/usr.bin/make/unit-tests/directive-for-escape.exp:1.16	Thu Jan 27 20:15:14 2022
+++ src/usr.bin/make/unit-tests/directive-for-escape.exp	Sun Jun 12 16:09:21 2022
@@ -26,30 +26,37 @@ For: loop body:
 make: "directive-for-escape.mk" line 43: value-with-modifier
 For: end for 1
 For: loop body:
+# ${:U\${UNDEF\:U\\$\\$}
+For: loop body:
+# ${:U{{\}\}}
+For: loop body:
+# ${:Uend\}}
+For: end for 1
+For: loop body:
 .  info ${:U\${UNDEF\:U\\$\\$}
-make: "directive-for-escape.mk" line 72: ${UNDEF:U\backslash$
+make: "directive-for-escape.mk" line 92: ${UNDEF:U\backslash$
 For: loop body:
 .  info ${:U{{\}\}}
-make: "directive-for-escape.mk" line 72: {{}}
+make: "directive-for-escape.mk" line 92: {{}}
 For: loop body:
 .  info ${:Uend\}}
-make: "directive-for-escape.mk" line 72: end}
+make: "directive-for-escape.mk" line 92: end}
 For: end for 1
 For: loop body:
 .  info ${:Ubegin<${UNDEF:Ufallback:N{{{>end}
-make: "directive-for-escape.mk" line 84: beginend
+make: "directive-for-escape.mk" line 113: beginend
 For: end for 1
 For: loop body:
 .  info ${:U\$}
-make: "directive-for-escape.mk" line 92: $
+make: "directive-for-escape.mk" line 121: $
 For: end for 1
 For: loop body:
 .  info ${NUMBERS} ${:Ureplaced}
-make: "directive-for-escape.mk" line 100: one two three replaced
+make: "directive-for-escape.mk" line 129: one two three replaced
 For: end for 1
 For: loop body:
 .  info ${:Ureplaced}
-make: "directive-for-escape.mk" line 110: replaced
+make: "directive-for-escape.mk" line 139: replaced
 For: end for 1
 For: loop body:
 .  info .$$i: ${:Uinner}
@@ -62,46 +69,46 @@ For: loop body:
 .  info . $${i2}: ${i2}
 .  info . $${i,}: ${i,}
 .  info .  adjacent: ${:Uinner}${:Uinner}${:Uinner:M*}${:Uinner}
-make: "directive-for-escape.mk" line 118: .$i: inner
-make: "directive-for-escape.mk" line 119: .  ${i}: inner
-make: "directive-for-escape.mk" line 120: .   ${i:M*}: inner
-make: "directive-for-escape.mk" line 121: .  $(i): inner
-make: "directive-for-escape.mk" line 122: .   $(i:M*): inner
-make: "directive-for-escape.mk" line 123: . ${i${:U}}: outer
-make: "directive-for-escape.mk" line 124: .${i\}}: inner}
-make: "directive-for-escape.mk" line 125: . ${i2}: two
-make: "directive-for-escape.mk" line 126: . ${i,}: comma
-make: "directive-for-escape.mk" line 127: .  adjacent: innerinnerinnerinner
+make: "directive-for-escape.mk" line 147: .$i: inner
+make: "directive-for-escape.mk" line 148: .  ${i}: inner
+make: "directive-for-escape.mk" line 149: .   ${i:M*}: inner
+make: "directive-for-escape.mk" line 150: .  $(i): inner
+make: "directive-for-escape.mk" line 151: .   $(i:M*): inner
+make: "directive-for-escape.mk" line 152: . ${i${:U}}: outer
+make: "directive-for-escape.mk" line 153: .${i\}}: inner}
+make: 

CVS commit: src/usr.bin/make

2022-06-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Jun 12 16:09:21 UTC 2022

Modified Files:
src/usr.bin/make: for.c
src/usr.bin/make/unit-tests: directive-for-escape.exp
directive-for-escape.mk

Log Message:
make: document ExprLen, which is part of a .for loop

No binary change


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/usr.bin/make/for.c
cvs rdiff -u -r1.16 -r1.17 \
src/usr.bin/make/unit-tests/directive-for-escape.exp
cvs rdiff -u -r1.15 -r1.16 \
src/usr.bin/make/unit-tests/directive-for-escape.mk

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



CVS commit: src/tests/usr.bin

2022-06-12 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Jun 12 15:08:39 UTC 2022

Modified Files:
src/tests/usr.bin/c++: t_call_once.sh t_call_once2.sh t_cxxruntime.sh
t_hello.sh t_pthread_once.sh t_static_destructor.sh
src/tests/usr.bin/cc: t_hello.sh

Log Message:
Put the sprinkled -static in the right place, i.e. fix up previous.

Thanks to rillig for spotting my mistake.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/c++/t_call_once.sh \
src/tests/usr.bin/c++/t_call_once2.sh \
src/tests/usr.bin/c++/t_pthread_once.sh \
src/tests/usr.bin/c++/t_static_destructor.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/c++/t_cxxruntime.sh \
src/tests/usr.bin/c++/t_hello.sh
cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/cc/t_hello.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_call_once.sh
diff -u src/tests/usr.bin/c++/t_call_once.sh:1.5 src/tests/usr.bin/c++/t_call_once.sh:1.6
--- src/tests/usr.bin/c++/t_call_once.sh:1.5	Sun Jun 12 08:55:36 2022
+++ src/tests/usr.bin/c++/t_call_once.sh	Sun Jun 12 15:08:38 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: t_call_once.sh,v 1.5 2022/06/12 08:55:36 skrll Exp $
+#	$NetBSD: t_call_once.sh,v 1.6 2022/06/12 15:08:38 skrll Exp $
 #
 # Copyright (c) 2018 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -111,7 +111,7 @@ int main(void) {
 return 0;
 }
 EOF
-	atf_check -s exit:0 -static -o ignore -e ignore c++ -pg -o call_once test.cpp -pthread
+	atf_check -s exit:0 -o ignore -e ignore c++ -static -pg -o call_once test.cpp -pthread
 	atf_check -s exit:0 -o inline:"hello, world!\n" ./call_once
 }
 
@@ -138,7 +138,7 @@ int main(void) {
 return 0;
 }
 EOF
-	atf_check -s exit:0 -static -o ignore -e ignore c++ -m32 -pg -o call_once test.cpp -pthread
+	atf_check -s exit:0 -o ignore -e ignore c++ -static -m32 -pg -o call_once test.cpp -pthread
 	atf_check -s exit:0 -o inline:"hello, world!\n" ./call_once
 }
 
Index: src/tests/usr.bin/c++/t_call_once2.sh
diff -u src/tests/usr.bin/c++/t_call_once2.sh:1.5 src/tests/usr.bin/c++/t_call_once2.sh:1.6
--- src/tests/usr.bin/c++/t_call_once2.sh:1.5	Sun Jun 12 08:55:36 2022
+++ src/tests/usr.bin/c++/t_call_once2.sh	Sun Jun 12 15:08:38 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: t_call_once2.sh,v 1.5 2022/06/12 08:55:36 skrll Exp $
+#	$NetBSD: t_call_once2.sh,v 1.6 2022/06/12 15:08:38 skrll Exp $
 #
 # Copyright (c) 2018 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -154,7 +154,7 @@ int main(void) {
 return 0;
 }
 EOF
-	atf_check -s exit:0 -static -o ignore -e ignore c++ -pg -o call_once2 test.cpp -pthread
+	atf_check -s exit:0 -o ignore -e ignore c++ -static -pg -o call_once2 test.cpp -pthread
 	atf_check -s exit:0 -o inline:"hello, world!\n" ./call_once2
 }
 
@@ -198,7 +198,7 @@ int main(void) {
 return 0;
 }
 EOF
-	atf_check -s exit:0 -static -o ignore -e ignore c++ -m32 -pg -o call_once2 test.cpp -pthread
+	atf_check -s exit:0 -o ignore -e ignore c++ -static-m32 -pg -o call_once2 test.cpp -pthread
 	atf_check -s exit:0 -o inline:"hello, world!\n" ./call_once2
 	atf_expect_fail "The combination of 32-bit and profiling should be fail"
 }
Index: src/tests/usr.bin/c++/t_pthread_once.sh
diff -u src/tests/usr.bin/c++/t_pthread_once.sh:1.5 src/tests/usr.bin/c++/t_pthread_once.sh:1.6
--- src/tests/usr.bin/c++/t_pthread_once.sh:1.5	Sun Jun 12 08:55:36 2022
+++ src/tests/usr.bin/c++/t_pthread_once.sh	Sun Jun 12 15:08:38 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: t_pthread_once.sh,v 1.5 2022/06/12 08:55:36 skrll Exp $
+#	$NetBSD: t_pthread_once.sh,v 1.6 2022/06/12 15:08:38 skrll Exp $
 #
 # Copyright (c) 2018 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -109,7 +109,7 @@ int main(void) {
 return 0;
 }
 EOF
-	atf_check -s exit:0 -static -o ignore -e ignore c++ -pg -o pthread_once test.cpp -pthread
+	atf_check -s exit:0 -o ignore -e ignore c++ -static -pg -o pthread_once test.cpp -pthread
 	atf_check -s exit:0 -o inline:"hello, world!\n" ./pthread_once
 }
 
@@ -135,7 +135,7 @@ int main(void) {
 return 0;
 }
 EOF
-	atf_check -s exit:0 -static -o ignore -e ignore c++ -m32 -pg -o pthread_once test.cpp -pthread
+	atf_check -s exit:0 -o ignore -e ignore c++ -static -m32 -pg -o pthread_once test.cpp -pthread
 	atf_check -s exit:0 -o inline:"hello, world!\n" ./pthread_once
 }
 
Index: src/tests/usr.bin/c++/t_static_destructor.sh
diff -u src/tests/usr.bin/c++/t_static_destructor.sh:1.5 src/tests/usr.bin/c++/t_static_destructor.sh:1.6
--- src/tests/usr.bin/c++/t_static_destructor.sh:1.5	Sun Jun 12 08:55:36 2022
+++ src/tests/usr.bin/c++/t_static_destructor.sh	Sun Jun 12 15:08:38 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: t_static_destructor.sh,v 1.5 2022/06/12 08:55:36 skrll Exp $
+#	$NetBSD: t_static_destructor.sh,v 1.6 2022/06/12 15:08:38 skrll Exp $
 #
 # Copyright (c) 2017 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -122,7 +122,7 @@ 

CVS commit: src/tests/usr.bin

2022-06-12 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Jun 12 15:08:39 UTC 2022

Modified Files:
src/tests/usr.bin/c++: t_call_once.sh t_call_once2.sh t_cxxruntime.sh
t_hello.sh t_pthread_once.sh t_static_destructor.sh
src/tests/usr.bin/cc: t_hello.sh

Log Message:
Put the sprinkled -static in the right place, i.e. fix up previous.

Thanks to rillig for spotting my mistake.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/c++/t_call_once.sh \
src/tests/usr.bin/c++/t_call_once2.sh \
src/tests/usr.bin/c++/t_pthread_once.sh \
src/tests/usr.bin/c++/t_static_destructor.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/c++/t_cxxruntime.sh \
src/tests/usr.bin/c++/t_hello.sh
cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/cc/t_hello.sh

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

2022-06-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Jun 12 15:03:27 UTC 2022

Modified Files:
src/usr.bin/make/unit-tests: directive-for-null.mk

Log Message:
tests/make: make test for null bytes in .for loop more readable


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/directive-for-null.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

2022-06-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Jun 12 15:03:27 UTC 2022

Modified Files:
src/usr.bin/make/unit-tests: directive-for-null.mk

Log Message:
tests/make: make test for null bytes in .for loop more readable


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/directive-for-null.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-for-null.mk
diff -u src/usr.bin/make/unit-tests/directive-for-null.mk:1.2 src/usr.bin/make/unit-tests/directive-for-null.mk:1.3
--- src/usr.bin/make/unit-tests/directive-for-null.mk:1.2	Sun May  8 06:51:27 2022
+++ src/usr.bin/make/unit-tests/directive-for-null.mk	Sun Jun 12 15:03:27 2022
@@ -1,4 +1,4 @@
-# $NetBSD: directive-for-null.mk,v 1.2 2022/05/08 06:51:27 rillig Exp $
+# $NetBSD: directive-for-null.mk,v 1.3 2022/06/12 15:03:27 rillig Exp $
 #
 # Test for parsing a .for loop that accidentally contains a null byte.
 #
@@ -15,5 +15,9 @@
 # line that contains a null byte is line 2.
 
 all: .PHONY
-	@printf '%s\n' '.for i in 1 2 3' 'VAR=value' '.endfor' | tr 'l' '\0' \
+	@printf '%s\n' \
+	'.for i in 1 2 3' \
+	'VAR=value' \
+	'.endfor' \
+	| tr 'l' '\0' \
 	| ${MAKE} -f -



CVS commit: src/games/cgram

2022-06-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Jun 12 14:59:44 UTC 2022

Modified Files:
src/games/cgram: cgram.c

Log Message:
cgram: allow cursor navigation with KEY_BEG as well


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/games/cgram/cgram.c

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

Modified files:

Index: src/games/cgram/cgram.c
diff -u src/games/cgram/cgram.c:1.28 src/games/cgram/cgram.c:1.29
--- src/games/cgram/cgram.c:1.28	Sat May 14 14:20:10 2022
+++ src/games/cgram/cgram.c	Sun Jun 12 14:59:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cgram.c,v 1.28 2022/05/14 14:20:10 rillig Exp $ */
+/* $NetBSD: cgram.c,v 1.29 2022/06/12 14:59:44 rillig Exp $ */
 
 /*-
  * Copyright (c) 2013, 2021 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.c,v 1.28 2022/05/14 14:20:10 rillig Exp $");
+__RCSID("$NetBSD: cgram.c,v 1.29 2022/06/12 14:59:44 rillig Exp $");
 #endif
 
 #include 
@@ -490,6 +490,7 @@ handle_key(void)
 
 	switch (ch) {
 	case 1:			/* ^A */
+	case KEY_BEG:
 	case KEY_HOME:
 		cursor_x = 0;
 		break;



CVS commit: src/games/cgram

2022-06-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Jun 12 14:59:44 UTC 2022

Modified Files:
src/games/cgram: cgram.c

Log Message:
cgram: allow cursor navigation with KEY_BEG as well


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/games/cgram/cgram.c

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



CVS commit: src/usr.bin/make/unit-tests

2022-06-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Jun 12 14:27:06 UTC 2022

Modified Files:
src/usr.bin/make/unit-tests: opt-define.mk

Log Message:
tests/make: demonstrate what happens for 'make -DVAR=value'


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/opt-define.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-define.mk
diff -u src/usr.bin/make/unit-tests/opt-define.mk:1.3 src/usr.bin/make/unit-tests/opt-define.mk:1.4
--- src/usr.bin/make/unit-tests/opt-define.mk:1.3	Sun Jan 23 16:09:38 2022
+++ src/usr.bin/make/unit-tests/opt-define.mk	Sun Jun 12 14:27:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: opt-define.mk,v 1.3 2022/01/23 16:09:38 rillig Exp $
+# $NetBSD: opt-define.mk,v 1.4 2022/06/12 14:27:06 rillig Exp $
 #
 # Tests for the -D command line option, which defines global variables to the
 # value 1, like in the C preprocessor.
@@ -19,10 +19,22 @@ VAR=		overwritten
 .endif
 
 # The variable can be undefined.  If the variable had been defined in the
-# "Internal" scope instead, undefining it would have no effect.
+# "Internal" or in the "Command" scope instead, undefining it would have no
+# effect.
 .undef VAR
 .if defined(VAR)
 .  error
 .endif
 
+# The C preprocessor allows to define a macro with a specific value.  Make
+# behaves differently, it defines a variable with the name 'VAR=value' and the
+# value 1.
+.MAKEFLAGS: -DVAR=value
+.if defined(VAR)
+.  error
+.endif
+.if ${VAR=value} != "1"
+.  error
+.endif
+
 all: .PHONY



CVS commit: src/usr.bin/make/unit-tests

2022-06-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Jun 12 14:27:06 UTC 2022

Modified Files:
src/usr.bin/make/unit-tests: opt-define.mk

Log Message:
tests/make: demonstrate what happens for 'make -DVAR=value'


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/opt-define.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

2022-06-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Jun 12 13:37:32 UTC 2022

Modified Files:
src/usr.bin/make: make.h parse.c var.c

Log Message:
make: reorganize Parse_Error

Determining the location where the error occurred is now done by
ParseVErrorInternal.  This frees the remaining code from keeping the
filename and the line number together.  It also makes Parse_Error short
enough that it might be worth providing a separate function for each of
the 3 log levels.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 src/usr.bin/make/make.h
cvs rdiff -u -r1.679 -r1.680 src/usr.bin/make/parse.c
cvs rdiff -u -r1.1021 -r1.1022 src/usr.bin/make/var.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/make/make.h
diff -u src/usr.bin/make/make.h:1.302 src/usr.bin/make/make.h:1.303
--- src/usr.bin/make/make.h:1.302	Sat May  7 17:49:47 2022
+++ src/usr.bin/make/make.h	Sun Jun 12 13:37:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: make.h,v 1.302 2022/05/07 17:49:47 rillig Exp $	*/
+/*	$NetBSD: make.h,v 1.303 2022/06/12 13:37:32 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -852,7 +852,7 @@ bool GetBooleanExpr(const char *, bool);
 void Parse_Init(void);
 void Parse_End(void);
 
-void PrintLocation(FILE *, bool, const char *, unsigned);
+void PrintLocation(FILE *, bool, const GNode *);
 void PrintStackTrace(bool);
 void Parse_Error(ParseErrorLevel, const char *, ...) MAKE_ATTR_PRINTFLIKE(2, 3);
 bool Parse_VarAssign(const char *, bool, GNode *) MAKE_ATTR_USE;

Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.679 src/usr.bin/make/parse.c:1.680
--- src/usr.bin/make/parse.c:1.679	Sat Jun 11 17:58:15 2022
+++ src/usr.bin/make/parse.c	Sun Jun 12 13:37:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.679 2022/06/11 17:58:15 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.680 2022/06/12 13:37:32 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -105,7 +105,7 @@
 #include "pathnames.h"
 
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.679 2022/06/11 17:58:15 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.680 2022/06/12 13:37:32 rillig Exp $");
 
 /*
  * A file being read.
@@ -436,10 +436,22 @@ FindKeyword(const char *str)
 }
 
 void
-PrintLocation(FILE *f, bool useVars, const char *fname, unsigned lineno)
+PrintLocation(FILE *f, bool useVars, const GNode *gn)
 {
 	char dirbuf[MAXPATHLEN + 1];
 	FStr dir, base;
+	const char *fname;
+	unsigned lineno;
+
+	if (gn != NULL) {
+		fname = gn->fname;
+		lineno = gn->lineno;
+	} else if (includes.len > 0) {
+		IncludedFile *curFile = CurFile();
+		fname = curFile->name.str;
+		lineno = curFile->lineno;
+	} else
+		return;
 
 	if (!useVars || fname[0] == '/' || strcmp(fname, "(stdin)") == 0) {
 		(void)fprintf(f, "\"%s\" line %u: ", fname, lineno);
@@ -462,16 +474,15 @@ PrintLocation(FILE *f, bool useVars, con
 	FStr_Done();
 }
 
-static void MAKE_ATTR_PRINTFLIKE(6, 0)
-ParseVErrorInternal(FILE *f, bool useVars, const char *fname, unsigned lineno,
+static void MAKE_ATTR_PRINTFLIKE(5, 0)
+ParseVErrorInternal(FILE *f, bool useVars, const GNode *gn,
 		ParseErrorLevel level, const char *fmt, va_list ap)
 {
 	static bool fatal_warning_error_printed = false;
 
 	(void)fprintf(f, "%s: ", progname);
 
-	if (fname != NULL)
-		PrintLocation(f, useVars, fname, lineno);
+	PrintLocation(f, useVars, gn);
 	if (level == PARSE_WARNING)
 		(void)fprintf(f, "warning: ");
 	(void)vfprintf(f, fmt, ap);
@@ -492,20 +503,20 @@ ParseVErrorInternal(FILE *f, bool useVar
 		PrintStackTrace(false);
 }
 
-static void MAKE_ATTR_PRINTFLIKE(4, 5)
-ParseErrorInternal(const char *fname, unsigned lineno,
+static void MAKE_ATTR_PRINTFLIKE(3, 4)
+ParseErrorInternal(const GNode *gn,
 		   ParseErrorLevel level, const char *fmt, ...)
 {
 	va_list ap;
 
 	(void)fflush(stdout);
 	va_start(ap, fmt);
-	ParseVErrorInternal(stderr, false, fname, lineno, level, fmt, ap);
+	ParseVErrorInternal(stderr, false, gn, level, fmt, ap);
 	va_end(ap);
 
 	if (opts.debug_file != stdout && opts.debug_file != stderr) {
 		va_start(ap, fmt);
-		ParseVErrorInternal(opts.debug_file, false, fname, lineno,
+		ParseVErrorInternal(opts.debug_file, false, gn,
 		level, fmt, ap);
 		va_end(ap);
 	}
@@ -523,26 +534,15 @@ void
 Parse_Error(ParseErrorLevel level, const char *fmt, ...)
 {
 	va_list ap;
-	const char *fname;
-	unsigned lineno;
-
-	if (includes.len == 0) {
-		fname = NULL;
-		lineno = 0;
-	} else {
-		IncludedFile *curFile = CurFile();
-		fname = curFile->name.str;
-		lineno = curFile->lineno;
-	}
 
 	(void)fflush(stdout);
 	va_start(ap, fmt);
-	ParseVErrorInternal(stderr, true, fname, lineno, level, fmt, ap);
+	ParseVErrorInternal(stderr, true, NULL, level, fmt, ap);
 	va_end(ap);
 
 	if (opts.debug_file != stdout && opts.debug_file != stderr) {
 		va_start(ap, fmt);
-		ParseVErrorInternal(opts.debug_file, 

CVS commit: src/usr.bin/make

2022-06-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Jun 12 13:37:32 UTC 2022

Modified Files:
src/usr.bin/make: make.h parse.c var.c

Log Message:
make: reorganize Parse_Error

Determining the location where the error occurred is now done by
ParseVErrorInternal.  This frees the remaining code from keeping the
filename and the line number together.  It also makes Parse_Error short
enough that it might be worth providing a separate function for each of
the 3 log levels.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 src/usr.bin/make/make.h
cvs rdiff -u -r1.679 -r1.680 src/usr.bin/make/parse.c
cvs rdiff -u -r1.1021 -r1.1022 src/usr.bin/make/var.c

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



CVS commit: src/sys/arch

2022-06-12 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Sun Jun 12 11:36:43 UTC 2022

Modified Files:
src/sys/arch/amd64/amd64: genassym.cf locore.S
src/sys/arch/i386/i386: genassym.cf locore.S

Log Message:
XenPV: in cpu_switchto(), reset ci_xen_clockf_usermode/ci_xen_clockf_pc,
in case a clock interrupt is deffered while we're switching lwp.
Fix a (rare) panic:
panic: kernel diagnostic assertion "p != NULL" failed: file 
"/usr/src/sys/kern/kern_clock.c", line 438
seen when xen_timer_handler() is called from the splx() at the end of
mi_switch()


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.212 -r1.213 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -u -r1.188 -r1.189 src/sys/arch/i386/i386/locore.S

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/amd64/amd64/genassym.cf
diff -u src/sys/arch/amd64/amd64/genassym.cf:1.86 src/sys/arch/amd64/amd64/genassym.cf:1.87
--- src/sys/arch/amd64/amd64/genassym.cf:1.86	Tue May 24 15:55:19 2022
+++ src/sys/arch/amd64/amd64/genassym.cf	Sun Jun 12 11:36:42 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.86 2022/05/24 15:55:19 bouyer Exp $
+#	$NetBSD: genassym.cf,v 1.87 2022/06/12 11:36:42 bouyer Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -376,6 +376,8 @@ ifdef XENPV
 define XEN_PT_BASE		offsetof(struct start_info, pt_base)
 define XEN_NR_PT_FRAMES		offsetof(struct start_info, nr_pt_frames)
 define __HYPERVISOR_iret	__HYPERVISOR_iret
+define CPU_INFO_XEN_CLOCKF_USERMODE offsetof(struct cpu_info, ci_xen_clockf_usermode)
+define CPU_INFO_XEN_CLOCKF_PC	offsetof(struct cpu_info, ci_xen_clockf_pc)
 endif /* XENPV */
 endif /* XEN */
 

Index: src/sys/arch/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.212 src/sys/arch/amd64/amd64/locore.S:1.213
--- src/sys/arch/amd64/amd64/locore.S:1.212	Wed Nov 10 15:59:07 2021
+++ src/sys/arch/amd64/amd64/locore.S	Sun Jun 12 11:36:42 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.212 2021/11/10 15:59:07 msaitoh Exp $	*/
+/*	$NetBSD: locore.S,v 1.213 2022/06/12 11:36:42 bouyer Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -1183,6 +1183,16 @@ ENTRY(cpu_switchto)
 	movq	%r12,%rcx
 	xchgq	%rcx,CPUVAR(CURLWP)
 
+#ifdef XENPV
+	/* if we are there, we're obviously not in user context.
+	 * reset ci_xen_clockf_* in case the splx() at the end of mi_switch()
+	 * triggers a deffered call do xen_timer_handler()
+	 */
+	movb$0, CPUVAR(XEN_CLOCKF_USERMODE)
+	movq$_C_LABEL(cpu_switchto), CPUVAR(XEN_CLOCKF_PC)
+#endif
+
+
 	/* Skip the rest if returning to a pinned LWP. */
 	testb	%dl,%dl		/* returning = true ? */
 	jnz	.Lswitch_return

Index: src/sys/arch/i386/i386/genassym.cf
diff -u src/sys/arch/i386/i386/genassym.cf:1.123 src/sys/arch/i386/i386/genassym.cf:1.124
--- src/sys/arch/i386/i386/genassym.cf:1.123	Tue May 24 15:55:19 2022
+++ src/sys/arch/i386/i386/genassym.cf	Sun Jun 12 11:36:42 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.123 2022/05/24 15:55:19 bouyer Exp $
+#	$NetBSD: genassym.cf,v 1.124 2022/06/12 11:36:42 bouyer Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -392,3 +392,8 @@ define EVTCHN_UPCALL_MASK	offsetof(struc
 define HYPERVISOR_sched_op	__HYPERVISOR_sched_op
 define SCHEDOP_yield		SCHEDOP_yield
 endif /* XEN */
+
+ifdef XENPV
+define CPU_INFO_XEN_CLOCKF_USERMODE offsetof(struct cpu_info, ci_xen_clockf_usermode)
+define CPU_INFO_XEN_CLOCKF_PC	offsetof(struct cpu_info, ci_xen_clockf_pc)
+endif /* XENPV */

Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.188 src/sys/arch/i386/i386/locore.S:1.189
--- src/sys/arch/i386/i386/locore.S:1.188	Tue May 31 18:04:11 2022
+++ src/sys/arch/i386/i386/locore.S	Sun Jun 12 11:36:42 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.188 2022/05/31 18:04:11 bouyer Exp $	*/
+/*	$NetBSD: locore.S,v 1.189 2022/06/12 11:36:42 bouyer Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -128,7 +128,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.188 2022/05/31 18:04:11 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.189 2022/06/12 11:36:42 bouyer Exp $");
 
 #include "opt_copy_symtab.h"
 #include "opt_ddb.h"
@@ -1407,6 +1407,15 @@ ENTRY(cpu_switchto)
 	movl	%edi,%ecx
 	xchgl	%ecx,CPUVAR(CURLWP)
 
+#ifdef XENPV
+	/* if we are there, we're obviously not in user context.
+	 * reset ci_xen_clockf_* in case the splx() at the end of mi_switch()
+	 * triggers a deffered call do xen_timer_handler()
+	 */
+	movb	$0, CPUVAR(XEN_CLOCKF_USERMODE)
+	movl	$_C_LABEL(cpu_switchto), CPUVAR(XEN_CLOCKF_PC)
+#endif
+
 	/* Skip the rest if returning to a pinned LWP. */
 	testl	%edx,%edx
 	jnz	switch_return



CVS commit: src/sys/arch

2022-06-12 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Sun Jun 12 11:36:43 UTC 2022

Modified Files:
src/sys/arch/amd64/amd64: genassym.cf locore.S
src/sys/arch/i386/i386: genassym.cf locore.S

Log Message:
XenPV: in cpu_switchto(), reset ci_xen_clockf_usermode/ci_xen_clockf_pc,
in case a clock interrupt is deffered while we're switching lwp.
Fix a (rare) panic:
panic: kernel diagnostic assertion "p != NULL" failed: file 
"/usr/src/sys/kern/kern_clock.c", line 438
seen when xen_timer_handler() is called from the splx() at the end of
mi_switch()


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.212 -r1.213 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -u -r1.188 -r1.189 src/sys/arch/i386/i386/locore.S

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



Re: CVS commit: src/usr.sbin/sysinst/arch

2022-06-12 Thread Joerg Sonnenberger
On Sat, Jun 11, 2022 at 04:41:56PM +, Izumi Tsutsui wrote:
> Module Name:  src
> Committed By: tsutsui
> Date: Sat Jun 11 16:41:56 UTC 2022
> 
> Modified Files:
>   src/usr.sbin/sysinst/arch/atari: Makefile
>   src/usr.sbin/sysinst/arch/hp300: Makefile
>   src/usr.sbin/sysinst/arch/luna68k: Makefile
>   src/usr.sbin/sysinst/arch/news68k: Makefile
>   src/usr.sbin/sysinst/arch/newsmips: Makefile
>   src/usr.sbin/sysinst/arch/x68k: Makefile
> 
> Log Message:
> Pull SMALLPROG stuff to disable unnecessary partitioning methods etc.

I'm a bit concerned about the CHECK_ENTROPY part. This has a good chance
of resulting in a inferior user experience, so is that really worth
saving a few bytes?

Joerg


CVS commit: src/tests/usr.bin

2022-06-12 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Jun 12 08:55:36 UTC 2022

Modified Files:
src/tests/usr.bin/c++: asan_common.subr t_call_once.sh t_call_once2.sh
t_cxxruntime.sh t_fuzzer_oom.sh t_fuzzer_simple.sh
t_fuzzer_timeout.sh t_hello.sh t_msan_allocated_memory.sh
t_msan_check_mem.sh t_msan_free.sh t_msan_heap.sh
t_msan_partial_poison.sh t_msan_poison.sh t_msan_realloc.sh
t_msan_shadow.sh t_msan_stack.sh t_msan_unpoison.sh
t_pthread_once.sh t_static_destructor.sh 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 ubsan_common.subr
src/tests/usr.bin/cc: asan_common.subr t_fuzzer_oom.sh
t_fuzzer_simple.sh t_fuzzer_timeout.sh t_hello.sh
t_msan_allocated_memory.sh t_msan_check_mem.sh t_msan_free.sh
t_msan_heap.sh t_msan_partial_poison.sh t_msan_poison.sh
t_msan_realloc.sh t_msan_shadow.sh t_msan_stack.sh
t_msan_unpoison.sh 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 ubsan_common.subr

Log Message:
Sprinkle "-static" when using "-pg" as profiling only works with static and
the gcc specs are currently broken.

PR/56876: hppa: "cc -pg" fails with "undefined reference to `mprotect'"


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/c++/asan_common.subr \
src/tests/usr.bin/c++/t_fuzzer_oom.sh \
src/tests/usr.bin/c++/t_fuzzer_simple.sh \
src/tests/usr.bin/c++/t_fuzzer_timeout.sh \
src/tests/usr.bin/c++/t_msan_allocated_memory.sh \
src/tests/usr.bin/c++/t_msan_check_mem.sh \
src/tests/usr.bin/c++/t_msan_free.sh src/tests/usr.bin/c++/t_msan_heap.sh \
src/tests/usr.bin/c++/t_msan_partial_poison.sh \
src/tests/usr.bin/c++/t_msan_poison.sh \
src/tests/usr.bin/c++/t_msan_realloc.sh \
src/tests/usr.bin/c++/t_msan_shadow.sh \
src/tests/usr.bin/c++/t_msan_stack.sh \
src/tests/usr.bin/c++/t_msan_unpoison.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/c++/t_call_once.sh \
src/tests/usr.bin/c++/t_call_once2.sh \
src/tests/usr.bin/c++/t_pthread_once.sh \
src/tests/usr.bin/c++/t_static_destructor.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/c++/t_cxxruntime.sh \
src/tests/usr.bin/c++/t_hello.sh
cvs rdiff -u -r1.6 -r1.7 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 \
src/tests/usr.bin/c++/t_tsan_thread_leak.sh \
src/tests/usr.bin/c++/t_tsan_vptr_race.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/c++/ubsan_common.subr
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/cc/asan_common.subr
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/cc/t_fuzzer_oom.sh \
src/tests/usr.bin/cc/t_fuzzer_simple.sh \
src/tests/usr.bin/cc/t_fuzzer_timeout.sh \
src/tests/usr.bin/cc/t_msan_allocated_memory.sh \
src/tests/usr.bin/cc/t_msan_check_mem.sh \
src/tests/usr.bin/cc/t_msan_free.sh src/tests/usr.bin/cc/t_msan_heap.sh \
src/tests/usr.bin/cc/t_msan_partial_poison.sh \
src/tests/usr.bin/cc/t_msan_poison.sh \
src/tests/usr.bin/cc/t_msan_realloc.sh \
src/tests/usr.bin/cc/t_msan_shadow.sh \
src/tests/usr.bin/cc/t_msan_stack.sh \
src/tests/usr.bin/cc/t_msan_unpoison.sh
cvs rdiff -u -r1.10 -r1.11 src/tests/usr.bin/cc/t_hello.sh
cvs rdiff -u -r1.6 -r1.7 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
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/cc/ubsan_common.subr

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



CVS commit: src/tests/usr.bin

2022-06-12 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Jun 12 08:55:36 UTC 2022

Modified Files:
src/tests/usr.bin/c++: asan_common.subr t_call_once.sh t_call_once2.sh
t_cxxruntime.sh t_fuzzer_oom.sh t_fuzzer_simple.sh
t_fuzzer_timeout.sh t_hello.sh t_msan_allocated_memory.sh
t_msan_check_mem.sh t_msan_free.sh t_msan_heap.sh
t_msan_partial_poison.sh t_msan_poison.sh t_msan_realloc.sh
t_msan_shadow.sh t_msan_stack.sh t_msan_unpoison.sh
t_pthread_once.sh t_static_destructor.sh 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 ubsan_common.subr
src/tests/usr.bin/cc: asan_common.subr t_fuzzer_oom.sh
t_fuzzer_simple.sh t_fuzzer_timeout.sh t_hello.sh
t_msan_allocated_memory.sh t_msan_check_mem.sh t_msan_free.sh
t_msan_heap.sh t_msan_partial_poison.sh t_msan_poison.sh
t_msan_realloc.sh t_msan_shadow.sh t_msan_stack.sh
t_msan_unpoison.sh 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 ubsan_common.subr

Log Message:
Sprinkle "-static" when using "-pg" as profiling only works with static and
the gcc specs are currently broken.

PR/56876: hppa: "cc -pg" fails with "undefined reference to `mprotect'"


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/c++/asan_common.subr \
src/tests/usr.bin/c++/t_fuzzer_oom.sh \
src/tests/usr.bin/c++/t_fuzzer_simple.sh \
src/tests/usr.bin/c++/t_fuzzer_timeout.sh \
src/tests/usr.bin/c++/t_msan_allocated_memory.sh \
src/tests/usr.bin/c++/t_msan_check_mem.sh \
src/tests/usr.bin/c++/t_msan_free.sh src/tests/usr.bin/c++/t_msan_heap.sh \
src/tests/usr.bin/c++/t_msan_partial_poison.sh \
src/tests/usr.bin/c++/t_msan_poison.sh \
src/tests/usr.bin/c++/t_msan_realloc.sh \
src/tests/usr.bin/c++/t_msan_shadow.sh \
src/tests/usr.bin/c++/t_msan_stack.sh \
src/tests/usr.bin/c++/t_msan_unpoison.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/c++/t_call_once.sh \
src/tests/usr.bin/c++/t_call_once2.sh \
src/tests/usr.bin/c++/t_pthread_once.sh \
src/tests/usr.bin/c++/t_static_destructor.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/c++/t_cxxruntime.sh \
src/tests/usr.bin/c++/t_hello.sh
cvs rdiff -u -r1.6 -r1.7 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 \
src/tests/usr.bin/c++/t_tsan_thread_leak.sh \
src/tests/usr.bin/c++/t_tsan_vptr_race.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/c++/ubsan_common.subr
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/cc/asan_common.subr
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/cc/t_fuzzer_oom.sh \
src/tests/usr.bin/cc/t_fuzzer_simple.sh \
src/tests/usr.bin/cc/t_fuzzer_timeout.sh \
src/tests/usr.bin/cc/t_msan_allocated_memory.sh \
src/tests/usr.bin/cc/t_msan_check_mem.sh \
src/tests/usr.bin/cc/t_msan_free.sh src/tests/usr.bin/cc/t_msan_heap.sh \
src/tests/usr.bin/cc/t_msan_partial_poison.sh \
src/tests/usr.bin/cc/t_msan_poison.sh \
src/tests/usr.bin/cc/t_msan_realloc.sh \
src/tests/usr.bin/cc/t_msan_shadow.sh \
src/tests/usr.bin/cc/t_msan_stack.sh \
src/tests/usr.bin/cc/t_msan_unpoison.sh
cvs rdiff -u -r1.10 -r1.11 src/tests/usr.bin/cc/t_hello.sh
cvs rdiff -u -r1.6 -r1.7 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
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/cc/ubsan_common.subr

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++/asan_common.subr
diff -u src/tests/usr.bin/c++/asan_common.subr:1.3 src/tests/usr.bin/c++/asan_common.subr:1.4
--- src/tests/usr.bin/c++/asan_common.subr:1.3	Tue Oct 12 18:40:01 2021
+++ src/tests/usr.bin/c++/asan_common.subr	Sun Jun 12 08:55:36 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: asan_common.subr,v 1.3 2021/10/12 18:40:01 skrll Exp $
+#	$NetBSD: asan_common.subr,v 1.4 2022/06/12 08:55:36 skrll Exp $
 #
 # Copyright (c) 2018, 2019 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -93,7 +93,7 @@ asan_test_case() {
 
 	$1_profile_body() {
 		echo \"\$ASAN_CODE\" > test.cpp
-		c++ -fsanitize=address -o test -pg test.cpp
+		c++ -fsanitize=address -static -o test -pg 

CVS commit: src/sys/dev/fdt

2022-06-12 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Jun 12 08:04:07 UTC 2022

Modified Files:
src/sys/dev/fdt: dwc3_fdt.c

Log Message:
Attach when dr_mode is "otg" and the controller has the "usb-role-switch" and
"role-switch-default-mode" as seen in the Apple M1 dts.

This assumes the controller is properly setup for host mode already.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/fdt/dwc3_fdt.c

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

Modified files:

Index: src/sys/dev/fdt/dwc3_fdt.c
diff -u src/sys/dev/fdt/dwc3_fdt.c:1.19 src/sys/dev/fdt/dwc3_fdt.c:1.20
--- src/sys/dev/fdt/dwc3_fdt.c:1.19	Sun Nov  7 17:14:20 2021
+++ src/sys/dev/fdt/dwc3_fdt.c	Sun Jun 12 08:04:07 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc3_fdt.c,v 1.19 2021/11/07 17:14:20 jmcneill Exp $ */
+/* $NetBSD: dwc3_fdt.c,v 1.20 2022/06/12 08:04:07 skrll Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dwc3_fdt.c,v 1.19 2021/11/07 17:14:20 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc3_fdt.c,v 1.20 2022/06/12 08:04:07 skrll Exp $");
 
 #include 
 #include 
@@ -256,9 +256,30 @@ dwc3_fdt_attach(device_t parent, device_
 		return;
 	}
 
-	/* Only host mode is supported */
+	/*
+	 * Only host mode is supported, but this includes otg devices
+	 * that have 'usb-role-switch' and 'role-switch-default-mode' of
+	 * 'host'
+	 */
 	const char *dr_mode = fdtbus_get_string(dwc3_phandle, "dr_mode");
-	if (dr_mode == NULL || strcmp(dr_mode, "host") != 0) {
+	if (dr_mode == NULL || strcmp(dr_mode, "otg") == 0) {
+		bool ok = false;
+		if (of_hasprop(dwc3_phandle, "usb-role-switch")) {
+			const char *rsdm = fdtbus_get_string(dwc3_phandle,
+			"role-switch-default-mode");
+			if (rsdm != NULL && strcmp(rsdm, "host") == 0)
+ok = true;
+
+			if (!ok) {
+aprint_error(": host is not default mode\n");
+return;
+			}
+		}
+		if (!ok) {
+			aprint_error(": cannot switch 'otg' mode to host\n");
+			return;
+		}
+	} else if (strcmp(dr_mode, "host") != 0) {
 		aprint_error(": '%s' not supported\n", dr_mode);
 		return;
 	}



CVS commit: src/sys/dev/fdt

2022-06-12 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Jun 12 08:04:07 UTC 2022

Modified Files:
src/sys/dev/fdt: dwc3_fdt.c

Log Message:
Attach when dr_mode is "otg" and the controller has the "usb-role-switch" and
"role-switch-default-mode" as seen in the Apple M1 dts.

This assumes the controller is properly setup for host mode already.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/fdt/dwc3_fdt.c

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



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

2022-06-12 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Jun 12 06:57:07 UTC 2022

Modified Files:
src/sys/arch/atari/conf: ATARITT FALCON HADES MILAN-ISAIDE MILAN-PCIIDE
SMALL030

Log Message:
Regen from GENERIC.in rev 1.122.

> Specify -fno-unwind-tables to shrink binaries.


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/atari/conf/ATARITT
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/atari/conf/FALCON
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/atari/conf/HADES
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/atari/conf/MILAN-ISAIDE
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/atari/conf/MILAN-PCIIDE
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/atari/conf/SMALL030

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

Modified files:

Index: src/sys/arch/atari/conf/ATARITT
diff -u src/sys/arch/atari/conf/ATARITT:1.122 src/sys/arch/atari/conf/ATARITT:1.123
--- src/sys/arch/atari/conf/ATARITT:1.122	Tue Jan 26 10:51:27 2021
+++ src/sys/arch/atari/conf/ATARITT	Sun Jun 12 06:57:07 2022
@@ -1,14 +1,14 @@
 #
-# $NetBSD: ATARITT,v 1.122 2021/01/26 10:51:27 rin Exp $
+# $NetBSD: ATARITT,v 1.123 2022/06/12 06:57:07 tsutsui Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: GENERIC.in,v 1.121 2021/01/21 06:51:54 nia Exp $
+#		NetBSD: GENERIC.in,v 1.122 2022/06/12 06:54:32 tsutsui Exp $
 include "arch/atari/conf/std.atari"
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-makeoptions COPTS="-O2 -fno-reorder-blocks -fno-omit-frame-pointer" # See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for backtraces in DDB.
+makeoptions COPTS="-O2 -fno-reorder-blocks -fno-unwind-tables -fno-omit-frame-pointer" # See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for backtraces in DDB.
 maxusers 16
 options HZ=64 # Set the clock-rate (48/64/96)
 options INSECURE # disable kernel security levels

Index: src/sys/arch/atari/conf/FALCON
diff -u src/sys/arch/atari/conf/FALCON:1.119 src/sys/arch/atari/conf/FALCON:1.120
--- src/sys/arch/atari/conf/FALCON:1.119	Tue Jan 26 10:51:27 2021
+++ src/sys/arch/atari/conf/FALCON	Sun Jun 12 06:57:07 2022
@@ -1,14 +1,14 @@
 #
-# $NetBSD: FALCON,v 1.119 2021/01/26 10:51:27 rin Exp $
+# $NetBSD: FALCON,v 1.120 2022/06/12 06:57:07 tsutsui Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: GENERIC.in,v 1.121 2021/01/21 06:51:54 nia Exp $
+#		NetBSD: GENERIC.in,v 1.122 2022/06/12 06:54:32 tsutsui Exp $
 include "arch/atari/conf/std.atari"
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-makeoptions COPTS="-O2 -fno-reorder-blocks -fno-omit-frame-pointer" # See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for backtraces in DDB.
+makeoptions COPTS="-O2 -fno-reorder-blocks -fno-unwind-tables -fno-omit-frame-pointer" # See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for backtraces in DDB.
 maxusers 16
 options HZ=64 # Set the clock-rate (48/64/96)
 options INSECURE # disable kernel security levels

Index: src/sys/arch/atari/conf/HADES
diff -u src/sys/arch/atari/conf/HADES:1.117 src/sys/arch/atari/conf/HADES:1.118
--- src/sys/arch/atari/conf/HADES:1.117	Tue Jan 26 10:51:27 2021
+++ src/sys/arch/atari/conf/HADES	Sun Jun 12 06:57:07 2022
@@ -1,15 +1,15 @@
 #
-# $NetBSD: HADES,v 1.117 2021/01/26 10:51:27 rin Exp $
+# $NetBSD: HADES,v 1.118 2022/06/12 06:57:07 tsutsui Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
 #		NetBSD: HADES.in,v 1.16 2018/03/31 04:19:41 tsutsui Exp $
-#		NetBSD: GENERIC.in,v 1.121 2021/01/21 06:51:54 nia Exp $
+#		NetBSD: GENERIC.in,v 1.122 2022/06/12 06:54:32 tsutsui Exp $
 include "arch/atari/conf/std.hades"
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-makeoptions COPTS="-O2 -fno-reorder-blocks -fno-omit-frame-pointer" # See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for backtraces in DDB.
+makeoptions COPTS="-O2 -fno-reorder-blocks -fno-unwind-tables -fno-omit-frame-pointer" # See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for backtraces in DDB.
 maxusers 16
 options HZ=64 # Set the clock-rate (48/64/96)
 options INSECURE # disable kernel security levels

Index: src/sys/arch/atari/conf/MILAN-ISAIDE
diff -u src/sys/arch/atari/conf/MILAN-ISAIDE:1.95 src/sys/arch/atari/conf/MILAN-ISAIDE:1.96
--- src/sys/arch/atari/conf/MILAN-ISAIDE:1.95	Tue Jan 26 10:51:27 2021
+++ src/sys/arch/atari/conf/MILAN-ISAIDE	Sun Jun 12 06:57:07 2022
@@ -1,15 +1,15 @@
 #
-# $NetBSD: MILAN-ISAIDE,v 1.95 2021/01/26 10:51:27 rin Exp $
+# $NetBSD: MILAN-ISAIDE,v 1.96 2022/06/12 06:57:07 tsutsui Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
 #		NetBSD: 

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

2022-06-12 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Jun 12 06:57:07 UTC 2022

Modified Files:
src/sys/arch/atari/conf: ATARITT FALCON HADES MILAN-ISAIDE MILAN-PCIIDE
SMALL030

Log Message:
Regen from GENERIC.in rev 1.122.

> Specify -fno-unwind-tables to shrink binaries.


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/atari/conf/ATARITT
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/atari/conf/FALCON
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/atari/conf/HADES
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/atari/conf/MILAN-ISAIDE
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/atari/conf/MILAN-PCIIDE
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/atari/conf/SMALL030

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



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

2022-06-12 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Jun 12 06:54:32 UTC 2022

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

Log Message:
Specify -fno-unwind-tables to shrink binaries.


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/atari/conf/GENERIC.in

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

Modified files:

Index: src/sys/arch/atari/conf/GENERIC.in
diff -u src/sys/arch/atari/conf/GENERIC.in:1.121 src/sys/arch/atari/conf/GENERIC.in:1.122
--- src/sys/arch/atari/conf/GENERIC.in:1.121	Thu Jan 21 06:51:54 2021
+++ src/sys/arch/atari/conf/GENERIC.in	Sun Jun 12 06:54:32 2022
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.in,v 1.121 2021/01/21 06:51:54 nia Exp $
+#	$NetBSD: GENERIC.in,v 1.122 2022/06/12 06:54:32 tsutsui Exp $
 #
 # Generic atari
 #
@@ -20,11 +20,11 @@ options 	INCLUDE_CONFIG_FILE	# embed con
 #endif /* !SMALL030_KERNEL */
 
 #if !defined(SMALL030_KERNEL)
-makeoptions	COPTS="-O2 -fno-reorder-blocks -fno-omit-frame-pointer" \
+makeoptions	COPTS="-O2 -fno-reorder-blocks -fno-unwind-tables -fno-omit-frame-pointer" \
 # See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for backtraces \
 in DDB.
 #else
-makeoptions	COPTS="-Os"			# optimize for space
+makeoptions	COPTS="-Os -fno-unwind-tables"	# optimize for space
 #endif /* !SMALL030_KERNEL */
 
 #if defined(SMALL030_KERNEL) || \



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

2022-06-12 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Jun 12 06:54:32 UTC 2022

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

Log Message:
Specify -fno-unwind-tables to shrink binaries.


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/atari/conf/GENERIC.in

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