date:20230603

CVS commit: src

2023-06-03 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sun Jun  4 01:24:58 UTC 2023

Modified Files:
src/libexec/ld.elf_so: README.TLS map_object.c rtld.h tls.c
src/libexec/ld.elf_so/arch/aarch64: mdreloc.c
src/libexec/ld.elf_so/arch/alpha: alpha_reloc.c
src/libexec/ld.elf_so/arch/arm: mdreloc.c
src/libexec/ld.elf_so/arch/hppa: hppa_reloc.c
src/libexec/ld.elf_so/arch/i386: mdreloc.c
src/libexec/ld.elf_so/arch/m68k: mdreloc.c
src/libexec/ld.elf_so/arch/mips: mips_reloc.c
src/libexec/ld.elf_so/arch/or1k: mdreloc.c
src/libexec/ld.elf_so/arch/powerpc: ppc_reloc.c
src/libexec/ld.elf_so/arch/riscv: mdreloc.c
src/libexec/ld.elf_so/arch/sh3: mdreloc.c
src/libexec/ld.elf_so/arch/sparc: mdreloc.c
src/libexec/ld.elf_so/arch/sparc64: mdreloc.c
src/libexec/ld.elf_so/arch/x86_64: mdreloc.c
src/tests/libexec/ld.elf_so: t_tls_extern.c

Log Message:
Fix interactions of initial-exec TLS model and dlopen

(1) If an initial-exec relocation was used for a non-local symbol
(i.e. the definition of the symbol is in a different DSO), the
computation of the static TLS offset used the wrong DSO.
This would effectively mean the wrong address was computed
(PR toolchain/50277, PR pkg/57445).

Fix this by forcing the computation of the correct DSO (the one defining
the symbol).

This code uses __UNCONST to avoid the vast interface changes for this
special case.

(2) If symbols from a DSO loaded via dlopen are used with both
global-dynamic/local-dynamic and initial-exec relocations AND
a initial-exec relocation was resolved first in a thread, a split brain
situation could exist where the dynamic relocations would use one memory
block (separate allocation) and the initial-exec relocations the static
per-thread TLS space.

(3) If the initial-exec relocation in (2) is seen after any thread has
already used a GD/LD allocation, bail out. Since IE relocations are used
only in the GOT, this will prevent the dlopen. This is a bit more
aggressive than necessary, but a full blown reference counting doesn't
seem to be justified.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/libexec/ld.elf_so/README.TLS
cvs rdiff -u -r1.66 -r1.67 src/libexec/ld.elf_so/map_object.c
cvs rdiff -u -r1.145 -r1.146 src/libexec/ld.elf_so/rtld.h
cvs rdiff -u -r1.17 -r1.18 src/libexec/ld.elf_so/tls.c
cvs rdiff -u -r1.17 -r1.18 src/libexec/ld.elf_so/arch/aarch64/mdreloc.c
cvs rdiff -u -r1.43 -r1.44 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c
cvs rdiff -u -r1.45 -r1.46 src/libexec/ld.elf_so/arch/arm/mdreloc.c
cvs rdiff -u -r1.49 -r1.50 src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c
cvs rdiff -u -r1.41 -r1.42 src/libexec/ld.elf_so/arch/i386/mdreloc.c
cvs rdiff -u -r1.33 -r1.34 src/libexec/ld.elf_so/arch/m68k/mdreloc.c
cvs rdiff -u -r1.74 -r1.75 src/libexec/ld.elf_so/arch/mips/mips_reloc.c
cvs rdiff -u -r1.3 -r1.4 src/libexec/ld.elf_so/arch/or1k/mdreloc.c
cvs rdiff -u -r1.62 -r1.63 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
cvs rdiff -u -r1.8 -r1.9 src/libexec/ld.elf_so/arch/riscv/mdreloc.c
cvs rdiff -u -r1.35 -r1.36 src/libexec/ld.elf_so/arch/sh3/mdreloc.c
cvs rdiff -u -r1.56 -r1.57 src/libexec/ld.elf_so/arch/sparc/mdreloc.c
cvs rdiff -u -r1.69 -r1.70 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c
cvs rdiff -u -r1.47 -r1.48 src/libexec/ld.elf_so/arch/x86_64/mdreloc.c
cvs rdiff -u -r1.11 -r1.12 src/tests/libexec/ld.elf_so/t_tls_extern.c

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

Modified files:

Index: src/libexec/ld.elf_so/README.TLS
diff -u src/libexec/ld.elf_so/README.TLS:1.5 src/libexec/ld.elf_so/README.TLS:1.6
--- src/libexec/ld.elf_so/README.TLS:1.5	Sat Dec  1 13:01:57 2018
+++ src/libexec/ld.elf_so/README.TLS	Sun Jun  4 01:24:56 2023
@@ -43,9 +43,10 @@ This is normally def->st_value + rela->r
 
 (c) R_TYPE(TLS_TPOFF): Static TLS offset.  The code has to check whether
 the static TLS offset for this module has been allocated
-(defobj->tls_done) and otherwise call _rtld_tls_offset_allocate().  This
+(defobj->tls_static) and otherwise call _rtld_tls_offset_allocate().  This
 may fail if no static space is available and the object has been pulled
-in via dlopen(3).
+in via dlopen(3). It can also fail if the TLS area has already been used
+via a global-dynamic allocation.
 
 For TLS Variant I, this is typically:
 

Index: src/libexec/ld.elf_so/map_object.c
diff -u src/libexec/ld.elf_so/map_object.c:1.66 src/libexec/ld.elf_so/map_object.c:1.67
--- src/libexec/ld.elf_so/map_object.c:1.66	Wed May 31 18:44:39 2023
+++ src/libexec/ld.elf_so/map_object.c	Sun Jun  4 01:24:56 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: map_object.c,v 1.66 2023/05/31 18:44:39 riastradh Exp $	 */
+/*	$NetBSD: map_object.c,v 1.67 2023/06/04 01:24:56 joerg Exp $	 */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -34,7 +34,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: map_object.c,v 1.66

CVS commit: src

2023-06-03 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sun Jun  4 01:24:58 UTC 2023

Modified Files:
src/libexec/ld.elf_so: README.TLS map_object.c rtld.h tls.c
src/libexec/ld.elf_so/arch/aarch64: mdreloc.c
src/libexec/ld.elf_so/arch/alpha: alpha_reloc.c
src/libexec/ld.elf_so/arch/arm: mdreloc.c
src/libexec/ld.elf_so/arch/hppa: hppa_reloc.c
src/libexec/ld.elf_so/arch/i386: mdreloc.c
src/libexec/ld.elf_so/arch/m68k: mdreloc.c
src/libexec/ld.elf_so/arch/mips: mips_reloc.c
src/libexec/ld.elf_so/arch/or1k: mdreloc.c
src/libexec/ld.elf_so/arch/powerpc: ppc_reloc.c
src/libexec/ld.elf_so/arch/riscv: mdreloc.c
src/libexec/ld.elf_so/arch/sh3: mdreloc.c
src/libexec/ld.elf_so/arch/sparc: mdreloc.c
src/libexec/ld.elf_so/arch/sparc64: mdreloc.c
src/libexec/ld.elf_so/arch/x86_64: mdreloc.c
src/tests/libexec/ld.elf_so: t_tls_extern.c

Log Message:
Fix interactions of initial-exec TLS model and dlopen

(1) If an initial-exec relocation was used for a non-local symbol
(i.e. the definition of the symbol is in a different DSO), the
computation of the static TLS offset used the wrong DSO.
This would effectively mean the wrong address was computed
(PR toolchain/50277, PR pkg/57445).

Fix this by forcing the computation of the correct DSO (the one defining
the symbol).

This code uses __UNCONST to avoid the vast interface changes for this
special case.

(2) If symbols from a DSO loaded via dlopen are used with both
global-dynamic/local-dynamic and initial-exec relocations AND
a initial-exec relocation was resolved first in a thread, a split brain
situation could exist where the dynamic relocations would use one memory
block (separate allocation) and the initial-exec relocations the static
per-thread TLS space.

(3) If the initial-exec relocation in (2) is seen after any thread has
already used a GD/LD allocation, bail out. Since IE relocations are used
only in the GOT, this will prevent the dlopen. This is a bit more
aggressive than necessary, but a full blown reference counting doesn't
seem to be justified.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/libexec/ld.elf_so/README.TLS
cvs rdiff -u -r1.66 -r1.67 src/libexec/ld.elf_so/map_object.c
cvs rdiff -u -r1.145 -r1.146 src/libexec/ld.elf_so/rtld.h
cvs rdiff -u -r1.17 -r1.18 src/libexec/ld.elf_so/tls.c
cvs rdiff -u -r1.17 -r1.18 src/libexec/ld.elf_so/arch/aarch64/mdreloc.c
cvs rdiff -u -r1.43 -r1.44 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c
cvs rdiff -u -r1.45 -r1.46 src/libexec/ld.elf_so/arch/arm/mdreloc.c
cvs rdiff -u -r1.49 -r1.50 src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c
cvs rdiff -u -r1.41 -r1.42 src/libexec/ld.elf_so/arch/i386/mdreloc.c
cvs rdiff -u -r1.33 -r1.34 src/libexec/ld.elf_so/arch/m68k/mdreloc.c
cvs rdiff -u -r1.74 -r1.75 src/libexec/ld.elf_so/arch/mips/mips_reloc.c
cvs rdiff -u -r1.3 -r1.4 src/libexec/ld.elf_so/arch/or1k/mdreloc.c
cvs rdiff -u -r1.62 -r1.63 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
cvs rdiff -u -r1.8 -r1.9 src/libexec/ld.elf_so/arch/riscv/mdreloc.c
cvs rdiff -u -r1.35 -r1.36 src/libexec/ld.elf_so/arch/sh3/mdreloc.c
cvs rdiff -u -r1.56 -r1.57 src/libexec/ld.elf_so/arch/sparc/mdreloc.c
cvs rdiff -u -r1.69 -r1.70 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c
cvs rdiff -u -r1.47 -r1.48 src/libexec/ld.elf_so/arch/x86_64/mdreloc.c
cvs rdiff -u -r1.11 -r1.12 src/tests/libexec/ld.elf_so/t_tls_extern.c

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

CVS commit: src

2023-06-03 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Sat Jun  3 21:44:08 UTC 2023

Modified Files:
src/tests/usr.bin/indent: indent_off_on.c lsym_lbrace.c lsym_rbrace.c
src/usr.bin/indent: indent.c

Log Message:
indent: fix indentation of adjacent '{'


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/usr.bin/indent/indent_off_on.c
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/indent/lsym_lbrace.c
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/indent/lsym_rbrace.c
cvs rdiff -u -r1.316 -r1.317 src/usr.bin/indent/indent.c

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

CVS commit: src

2023-06-03 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Sat Jun  3 21:44:08 UTC 2023

Modified Files:
src/tests/usr.bin/indent: indent_off_on.c lsym_lbrace.c lsym_rbrace.c
src/usr.bin/indent: indent.c

Log Message:
indent: fix indentation of adjacent '{'


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/usr.bin/indent/indent_off_on.c
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/indent/lsym_lbrace.c
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/indent/lsym_rbrace.c
cvs rdiff -u -r1.316 -r1.317 src/usr.bin/indent/indent.c

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

Modified files:

Index: src/tests/usr.bin/indent/indent_off_on.c
diff -u src/tests/usr.bin/indent/indent_off_on.c:1.13 src/tests/usr.bin/indent/indent_off_on.c:1.14
--- src/tests/usr.bin/indent/indent_off_on.c:1.13	Sun May 21 10:18:44 2023
+++ src/tests/usr.bin/indent/indent_off_on.c	Sat Jun  3 21:44:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: indent_off_on.c,v 1.13 2023/05/21 10:18:44 rillig Exp $ */
+/* $NetBSD: indent_off_on.c,v 1.14 2023/06/03 21:44:08 rillig Exp $ */
 
 /*
  * Tests for the comments 'INDENT OFF' and 'INDENT ON', which temporarily
@@ -134,8 +134,8 @@ int format( void ) {{{
 /* No formatting takes place here. */
 int format( void ) {{{
 /*INDENT ON*/
-}
-}
+		}
+	}
 }
 //indent end
 

Index: src/tests/usr.bin/indent/lsym_lbrace.c
diff -u src/tests/usr.bin/indent/lsym_lbrace.c:1.6 src/tests/usr.bin/indent/lsym_lbrace.c:1.7
--- src/tests/usr.bin/indent/lsym_lbrace.c:1.6	Sun Apr 24 09:04:12 2022
+++ src/tests/usr.bin/indent/lsym_lbrace.c	Sat Jun  3 21:44:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lsym_lbrace.c,v 1.6 2022/04/24 09:04:12 rillig Exp $ */
+/* $NetBSD: lsym_lbrace.c,v 1.7 2023/06/03 21:44:08 rillig Exp $ */
 
 /*
  * Tests for the token lsym_lbrace, which represents a '{' in these contexts:
@@ -40,11 +40,12 @@ void function(void) {{{ body(); }}}
 //indent run
 void
 function(void)
-/* $ FIXME: Each '{' must be properly indented. */
-{{{
+{
+	{
+		{
 			body();
-}
-}
+		}
+	}
 }
 //indent end
 

Index: src/tests/usr.bin/indent/lsym_rbrace.c
diff -u src/tests/usr.bin/indent/lsym_rbrace.c:1.4 src/tests/usr.bin/indent/lsym_rbrace.c:1.5
--- src/tests/usr.bin/indent/lsym_rbrace.c:1.4	Sun Apr 24 09:04:12 2022
+++ src/tests/usr.bin/indent/lsym_rbrace.c	Sat Jun  3 21:44:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lsym_rbrace.c,v 1.4 2022/04/24 09:04:12 rillig Exp $ */
+/* $NetBSD: lsym_rbrace.c,v 1.5 2023/06/03 21:44:08 rillig Exp $ */
 
 /*
  * Tests for the token lsym_rbrace, which represents a '}' in these contexts:
@@ -43,11 +43,12 @@ void function(void) {{{ body(); }}}
 //indent run
 void
 function(void)
-/* $ FIXME: Each '{' must be properly indented. */
-{{{
+{
+	{
+		{
 			body();
-}
-}
+		}
+	}
 }
 //indent end
 

Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.316 src/usr.bin/indent/indent.c:1.317
--- src/usr.bin/indent/indent.c:1.316	Sat Jun  3 21:24:26 2023
+++ src/usr.bin/indent/indent.c	Sat Jun  3 21:44:08 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: indent.c,v 1.316 2023/06/03 21:24:26 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.317 2023/06/03 21:44:08 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: indent.c,v 1.316 2023/06/03 21:24:26 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.317 2023/06/03 21:44:08 rillig Exp $");
 
 #include 
 #include 
@@ -425,7 +425,8 @@ maybe_break_line(lexer_symbol lsym)
 		return;
 	if (lsym == lsym_semicolon)
 		return;
-	if (lsym == lsym_lbrace && opt.brace_same_line)
+	if (lsym == lsym_lbrace && opt.brace_same_line
+	&& ps.prev_token != lsym_lbrace)
 		return;
 
 	if (opt.verbose)

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

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:33:25 UTC 2023

Modified Files:
src/usr.sbin/sysinst/arch/mac68k: Makefile

Log Message:
adapt to ${CC_WNO_STRINGOP_TRUNCATION}


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/mac68k/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/sysinst/arch/mac68k/Makefile
diff -u src/usr.sbin/sysinst/arch/mac68k/Makefile:1.3 src/usr.sbin/sysinst/arch/mac68k/Makefile:1.4
--- src/usr.sbin/sysinst/arch/mac68k/Makefile:1.3	Mon Aug 10 06:54:45 2020
+++ src/usr.sbin/sysinst/arch/mac68k/Makefile	Sat Jun  3 21:33:25 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2020/08/10 06:54:45 rin Exp $
+#	$NetBSD: Makefile,v 1.4 2023/06/03 21:33:25 lukem Exp $
 #
 # Makefile for mac68k
 #
@@ -13,7 +13,6 @@ NO_GPT=		yes
 NO_MBR=		yes
 .endif
 
-# XXX
-COPTS.md.c=	-Wno-stringop-truncation
+COPTS.md.c=	${CC_WNO_STRINGOP_TRUNCATION}
 
 .include "../../Makefile.inc"

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

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:33:25 UTC 2023

Modified Files:
src/usr.sbin/sysinst/arch/mac68k: Makefile

Log Message:
adapt to ${CC_WNO_STRINGOP_TRUNCATION}


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/mac68k/Makefile

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

CVS commit: src/external

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:33:02 UTC 2023

Modified Files:
src/external/apache2/llvm: Makefile.inc
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64:
Makefile
src/external/bsd/openldap/lib/slapd/back-mdb: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libGL.old: Makefile
src/external/mpl/dhcp/bin/server: Makefile

Log Message:
adapt to ${CC_WNO_STRINGOP_OVERFLOW}

Use ${CC_WNO_STRINGOP_OVERFLOW} instead of
the older style more complex expressions.

Remove workarounds if they were only for gcc < 10.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/apache2/llvm/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 \

src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/openldap/lib/slapd/back-mdb/Makefile
cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libGL.old/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/dhcp/bin/server/Makefile

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

Modified files:

Index: src/external/apache2/llvm/Makefile.inc
diff -u src/external/apache2/llvm/Makefile.inc:1.6 src/external/apache2/llvm/Makefile.inc:1.7
--- src/external/apache2/llvm/Makefile.inc:1.6	Mon Feb 28 16:30:10 2022
+++ src/external/apache2/llvm/Makefile.inc	Sat Jun  3 21:33:01 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.6 2022/02/28 16:30:10 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.7 2023/06/03 21:33:01 lukem Exp $
 
 .if !defined(LLVM_TOPLEVEL_MK)
 LLVM_TOPLEVEL_MK=
@@ -19,9 +19,6 @@ CONFIG_DIR:=	${.PARSEDIR}/autoconf
 
 CPPFLAGS+=	-I. -I${CLANG_SRCDIR}/include -I${LLVM_SRCDIR}/include
 
-# Bogus warning with -O2 in GCC 7 and 8.
-CWARNFLAGS.gcc+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} < 9:? -Wno-stringop-overflow :}
-
 MODULES_CXXFLAGS=	-fmodules -fcxx-modules -Werror=incomplete-umbrella \
 			-fmodules-validate-system-headers \
 			-Xclang -fmodules-local-submodule-visibility \

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile:1.3 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile:1.4
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile:1.3	Fri Sep 17 02:18:05 2021
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile	Sat Jun  3 21:33:02 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2021/09/17 02:18:05 christos Exp $
+#	$NetBSD: Makefile,v 1.4 2023/06/03 21:33:02 lukem Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
@@ -25,7 +25,7 @@ CPPFLAGS+=	-I${TOPDIR}/lib
 CPPFLAGS+=	-I${TOPDIR}/include
 
 CWARNFLAGS.clang+=	-Wno-error=cast-qual-unrelated
-CWARNFLAGS.gcc+=	-Wno-error=stringop-overflow
+CWARNFLAGS.gcc+=	${CC_WNO_STRINGOP_OVERFLOW}
 
 COPTS+=		-fPIC
 

Index: src/external/bsd/openldap/lib/slapd/back-mdb/Makefile
diff -u src/external/bsd/openldap/lib/slapd/back-mdb/Makefile:1.1 src/external/bsd/openldap/lib/slapd/back-mdb/Makefile:1.2
--- src/external/bsd/openldap/lib/slapd/back-mdb/Makefile:1.1	Tue Dec 28 17:05:44 2021
+++ src/external/bsd/openldap/lib/slapd/back-mdb/Makefile	Sat Jun  3 21:33:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/12/28 17:05:44 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/06/03 21:33:02 lukem Exp $
 
 USE_FORT=yes
 LIBISPRIVATE=yes
@@ -13,7 +13,7 @@ LMDB=${LDAP_DISTDIR}/libraries/liblmdb
 
 .PATH: ${BACK_MDB} ${LMDB}
 
-COPTS.mdb.c += -Wno-error=stringop-overflow
+COPTS.mdb.c += ${CC_WNO_STRINGOP_OVERFLOW}
 
 CPPFLAGS+=-I${SLAPD} -I${BACK_MDB} -I${LMDB}
 

Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.32 src/external/mit/xorg/lib/libGL/Makefile:1.33
--- src/external/mit/xorg/lib/libGL/Makefile:1.32	Sun Jul 11 20:52:06 2021
+++ src/external/mit/xorg/lib/libGL/Makefile	Sat Jun  3 21:33:02 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.32 2021/07/11 20:52:06 mrg Exp $
+#	$NetBSD: Makefile,v 1.33 2023/06/03 21:33:02 lukem Exp $
 
 .include 
 
@@ -231,9 +231,7 @@ PKGCONFIG_SED_FLAGS= \
 
 CWARNFLAGS.clang+=	-Wno-tautological-compare -Wno-format -Wno-constant-conversion \
 			-Wno-error=incompatible-pointer-types -Wno-error=atomic-alignment
-.if ${HAVE_GCC:U0} >= 7
-CWARNFLAGS.gcc+=	-Wno-error=stringop-overflow
-.endif
+CWARNFLAGS.gcc+=	${CC_WNO_STRINGOP_OVERFLOW}
 
 .include 
 .include 

Index: src/external/mit/xorg/lib/libGL.old/Makefile
diff -u src/external/mit/xorg/lib/libGL.old/Makefile:1.3 src/external/mit/xorg/lib/libGL.old/Makefile:1.4
--- src/external/mit/xorg/lib/libGL.old/Makefile:1.3	Thu Sep 29 18:58:04 2022
+++ src/external/mit/xorg/lib/libGL.old/Makefile	Sat Jun  3 21:33:02 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v

CVS commit: src/external

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:33:02 UTC 2023

Modified Files:
src/external/apache2/llvm: Makefile.inc
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64:
Makefile
src/external/bsd/openldap/lib/slapd/back-mdb: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libGL.old: Makefile
src/external/mpl/dhcp/bin/server: Makefile

Log Message:
adapt to ${CC_WNO_STRINGOP_OVERFLOW}

Use ${CC_WNO_STRINGOP_OVERFLOW} instead of
the older style more complex expressions.

Remove workarounds if they were only for gcc < 10.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/apache2/llvm/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 \

src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/openldap/lib/slapd/back-mdb/Makefile
cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libGL.old/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/dhcp/bin/server/Makefile

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

CVS commit: src

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:31:47 UTC 2023

Modified Files:
src/external/bsd/atf/lib/tools: Makefile
src/external/bsd/file/lib: Makefile
src/external/bsd/ipf/bin/ipsend: Makefile
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/cddl/osnet/lib/libdtrace: Makefile
src/external/gpl3/gcc.old/usr.bin/backend: Makefile
src/external/gpl3/gcc/lib/libubsan: Makefile
src/external/gpl3/gcc/usr.bin/backend: Makefile
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
src/sys/external/bsd/drm2/radeon: files.radeon
src/sys/modules/i915drmkms: Makefile
src/tests/libexec/ld.elf_so: Makefile

Log Message:
adapt to ${CC_WNO_MAYBE_UNINITIALIZED}

Use ${CC_WNO_MAYBE_UNINITIALIZED} instead of
the older style more complex expressions.

Remove workarounds if they were for a specific
version of gcc < 10.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/lib/tools/Makefile
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/lib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ipf/bin/ipsend/Makefile
cvs rdiff -u -r1.31 -r1.32 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.31 -r1.32 src/external/cddl/osnet/lib/libdtrace/Makefile
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc.old/usr.bin/backend/Makefile
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gcc/lib/libubsan/Makefile
cvs rdiff -u -r1.67 -r1.68 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.89 -r1.90 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/radeon/files.radeon
cvs rdiff -u -r1.21 -r1.22 src/sys/modules/i915drmkms/Makefile
cvs rdiff -u -r1.19 -r1.20 src/tests/libexec/ld.elf_so/Makefile

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

Modified files:

Index: src/external/bsd/atf/lib/tools/Makefile
diff -u src/external/bsd/atf/lib/tools/Makefile:1.7 src/external/bsd/atf/lib/tools/Makefile:1.8
--- src/external/bsd/atf/lib/tools/Makefile:1.7	Sun Sep 29 23:44:58 2019
+++ src/external/bsd/atf/lib/tools/Makefile	Sat Jun  3 21:31:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/09/29 23:44:58 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/03 21:31:45 lukem Exp $
 
 NOLINT=		# defined
 
@@ -36,8 +36,6 @@ SRCS=		application.cpp \
 		ui.cpp \
 		user.cpp
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.parser.cpp += -Wno-error=maybe-uninitialized
-.endif
+COPTS.parser.cpp += ${CC_WNO_MAYBE_UNINITIALIZED}
 
 .include 

Index: src/external/bsd/file/lib/Makefile
diff -u src/external/bsd/file/lib/Makefile:1.15 src/external/bsd/file/lib/Makefile:1.16
--- src/external/bsd/file/lib/Makefile:1.15	Tue Dec 17 18:59:39 2019
+++ src/external/bsd/file/lib/Makefile	Sat Jun  3 21:31:45 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2019/12/17 18:59:39 christos Exp $
+#	$NetBSD: Makefile,v 1.16 2023/06/03 21:31:45 lukem Exp $
 #
 
 USE_FORT?= yes	# data driven bugs?
@@ -42,6 +42,4 @@ magic.h:magic.h.in
 	${TOOL_SED} -e "s/X.YY/${VERSION:S/.//g}/" < ${.ALLSRC} > ${.TARGET}
 CLEANFILES+=	magic.h
 
-CFLAGS+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-maybe-uninitialized :}
-
 .include 

Index: src/external/bsd/ipf/bin/ipsend/Makefile
diff -u src/external/bsd/ipf/bin/ipsend/Makefile:1.5 src/external/bsd/ipf/bin/ipsend/Makefile:1.6
--- src/external/bsd/ipf/bin/ipsend/Makefile:1.5	Wed Feb 12 00:30:48 2020
+++ src/external/bsd/ipf/bin/ipsend/Makefile	Sat Jun  3 21:31:45 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2020/02/12 00:30:48 fox Exp $
+#	$NetBSD: Makefile,v 1.6 2023/06/03 21:31:45 lukem Exp $
 
 .include 
 .include "../Makefile.inc"
@@ -25,8 +25,6 @@ DPSRCS+=	iplang_y.h
 .PATH:		${UDIST}/ipsend \
 		${UDIST}/iplang
 
-COPTS.ipsopt.c+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=maybe-uninitialized :}
-
 iplang_y.c: iplang_y.y
 	${_MKTARGET_CREATE}
 	${YACC} -d ${.ALLSRC}

Index: src/external/bsd/ntp/bin/ntpd/Makefile
diff -u src/external/bsd/ntp/bin/ntpd/Makefile:1.31 src/external/bsd/ntp/bin/ntpd/Makefile:1.32
--- src/external/bsd/ntp/bin/ntpd/Makefile:1.31	Sat Jun  3 09:09:04 2023
+++ src/external/bsd/ntp/bin/ntpd/Makefile	Sat Jun  3 21:31:46 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.31 2023/06/03 09:09:04 lukem Exp $
+#	$NetBSD: Makefile,v 1.32 2023/06/03 21:31:46 lukem Exp $
 
 .include 
 
@@ -87,7 +87,7 @@ CPPFLAGS+=-I${IDIST}/include -I${IDIST}/
 .PATH: ${DIST}
 YHEADER=1
 
-COPTS.ntp_control.c+=		${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-error=maybe-uninitialized :}
+COPTS.ntp_control.c+=		${CC_WNO_MAYBE_UNINITIALIZED}
 COPTS.ntp_loopfilter.c+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-error=restrict :}
 COPTS.ntp_loopfilter.c+=	${CC_WNO_FORMAT_TRUNCATION}
 COPTS.ntp_crypto.c+=		${CC_WNO_FORMAT_TRUNCATION}

Index: src/external/cddl/osnet/lib/libdtrace/Makefile
diff -u

CVS commit: src

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:31:47 UTC 2023

Modified Files:
src/external/bsd/atf/lib/tools: Makefile
src/external/bsd/file/lib: Makefile
src/external/bsd/ipf/bin/ipsend: Makefile
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/cddl/osnet/lib/libdtrace: Makefile
src/external/gpl3/gcc.old/usr.bin/backend: Makefile
src/external/gpl3/gcc/lib/libubsan: Makefile
src/external/gpl3/gcc/usr.bin/backend: Makefile
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
src/sys/external/bsd/drm2/radeon: files.radeon
src/sys/modules/i915drmkms: Makefile
src/tests/libexec/ld.elf_so: Makefile

Log Message:
adapt to ${CC_WNO_MAYBE_UNINITIALIZED}

Use ${CC_WNO_MAYBE_UNINITIALIZED} instead of
the older style more complex expressions.

Remove workarounds if they were for a specific
version of gcc < 10.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/lib/tools/Makefile
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/lib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ipf/bin/ipsend/Makefile
cvs rdiff -u -r1.31 -r1.32 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.31 -r1.32 src/external/cddl/osnet/lib/libdtrace/Makefile
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc.old/usr.bin/backend/Makefile
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gcc/lib/libubsan/Makefile
cvs rdiff -u -r1.67 -r1.68 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.89 -r1.90 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/radeon/files.radeon
cvs rdiff -u -r1.21 -r1.22 src/sys/modules/i915drmkms/Makefile
cvs rdiff -u -r1.19 -r1.20 src/tests/libexec/ld.elf_so/Makefile

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

CVS commit: src

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:30:25 UTC 2023

Modified Files:
src/bin/ksh: Makefile
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/lib/verify: Makefile
src/crypto/external/bsd/openssh/bin/sftp: Makefile
src/external/bsd/libevent/lib/libevent: Makefile
src/external/bsd/libpcap/lib: Makefile
src/external/bsd/ntp: Makefile.inc
src/external/bsd/pdisk/bin: Makefile
src/external/bsd/pkg_install: Makefile.inc
src/lib/libbz2: Makefile
src/sys/conf: copts.mk
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
src/sys/external/bsd/drm2/nouveau: files.nouveau
src/sys/external/bsd/drm2/radeon: files.radeon
src/sys/external/bsd/drm2/ttm: files.ttm
src/sys/external/isc/atheros_hal/conf: files.ath_hal
src/sys/modules/ath_hal: Makefile
src/sys/modules/pf: Makefile
src/sys/modules/radeondrm: Makefile
src/sys/modules/savagedrm: Makefile
src/sys/modules/viadrmums: Makefile
src/sys/modules/zlib: Makefile
src/sys/rump/kern/lib/libz: Makefile
src/usr.bin/stat: Makefile
src/usr.bin/telnet: Makefile
src/usr.sbin/quotacheck: Makefile

Log Message:
adapt to ${CC_WNO_IMPLICIT_FALLTHROUGH}

Use ${CC_WNO_IMPLICIT_FALLTHROUGH} instead of
the older style more complex expressions.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/bin/ksh/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/netpgp/lib/verify/Makefile
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libevent/lib/libevent/Makefile
cvs rdiff -u -r1.30 -r1.31 src/external/bsd/libpcap/lib/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pdisk/bin/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pkg_install/Makefile.inc
cvs rdiff -u -r1.20 -r1.21 src/lib/libbz2/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/conf/copts.mk
cvs rdiff -u -r1.88 -r1.89 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/nouveau/files.nouveau
cvs rdiff -u -r1.37 -r1.38 src/sys/external/bsd/drm2/radeon/files.radeon
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/ttm/files.ttm
cvs rdiff -u -r1.8 -r1.9 src/sys/external/isc/atheros_hal/conf/files.ath_hal
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/ath_hal/Makefile
cvs rdiff -u -r1.17 -r1.18 src/sys/modules/pf/Makefile
cvs rdiff -u -r1.15 -r1.16 src/sys/modules/radeondrm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/savagedrm/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/viadrmums/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/zlib/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/kern/lib/libz/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/stat/Makefile
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/telnet/Makefile
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/quotacheck/Makefile

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

Modified files:

Index: src/bin/ksh/Makefile
diff -u src/bin/ksh/Makefile:1.36 src/bin/ksh/Makefile:1.37
--- src/bin/ksh/Makefile:1.36	Sun Sep 29 23:44:58 2019
+++ src/bin/ksh/Makefile	Sat Jun  3 21:30:20 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.36 2019/09/29 23:44:58 mrg Exp $
+#	$NetBSD: Makefile,v 1.37 2023/06/03 21:30:20 lukem Exp $
 
 WARNS=3
 CWARNFLAGS.clang+=	-Wno-error=cast-qual
@@ -48,8 +48,6 @@ ksh.1: ksh.Man mkman
 	${HOST_SH} $(.CURDIR)/mkman ksh $(.CURDIR)/ksh.Man >ksh.1.tmp \
 	&& mv ksh.1.tmp ksh.1
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS+=	-Wno-error=implicit-fallthrough
-.endif
+COPTS+=	${CC_WNO_IMPLICIT_FALLTHROUGH}
 
 .include 

Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.20 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.21
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.20	Sat Jun  3 09:09:01 2023
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile	Sat Jun  3 21:30:20 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2023/06/03 09:09:01 lukem Exp $
+#	$NetBSD: Makefile,v 1.21 2023/06/03 21:30:20 lukem Exp $
 
 PROG=netpgpverify
 BINDIR=		/usr/bin
@@ -32,9 +32,7 @@ EXTDIST=${.CURDIR}/../../dist
 
 .include 
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS+=	-Wno-error=implicit-fallthrough
-.endif
+COPTS+=			${CC_WNO_IMPLICIT_FALLTHROUGH}
 
 COPTS.libverify.c+=	${CC_WNO_FORMAT_TRUNCATION}
 

Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.15 src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.16
---

CVS commit: src

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:30:25 UTC 2023

Modified Files:
src/bin/ksh: Makefile
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/lib/verify: Makefile
src/crypto/external/bsd/openssh/bin/sftp: Makefile
src/external/bsd/libevent/lib/libevent: Makefile
src/external/bsd/libpcap/lib: Makefile
src/external/bsd/ntp: Makefile.inc
src/external/bsd/pdisk/bin: Makefile
src/external/bsd/pkg_install: Makefile.inc
src/lib/libbz2: Makefile
src/sys/conf: copts.mk
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
src/sys/external/bsd/drm2/nouveau: files.nouveau
src/sys/external/bsd/drm2/radeon: files.radeon
src/sys/external/bsd/drm2/ttm: files.ttm
src/sys/external/isc/atheros_hal/conf: files.ath_hal
src/sys/modules/ath_hal: Makefile
src/sys/modules/pf: Makefile
src/sys/modules/radeondrm: Makefile
src/sys/modules/savagedrm: Makefile
src/sys/modules/viadrmums: Makefile
src/sys/modules/zlib: Makefile
src/sys/rump/kern/lib/libz: Makefile
src/usr.bin/stat: Makefile
src/usr.bin/telnet: Makefile
src/usr.sbin/quotacheck: Makefile

Log Message:
adapt to ${CC_WNO_IMPLICIT_FALLTHROUGH}

Use ${CC_WNO_IMPLICIT_FALLTHROUGH} instead of
the older style more complex expressions.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/bin/ksh/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/netpgp/lib/verify/Makefile
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libevent/lib/libevent/Makefile
cvs rdiff -u -r1.30 -r1.31 src/external/bsd/libpcap/lib/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pdisk/bin/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pkg_install/Makefile.inc
cvs rdiff -u -r1.20 -r1.21 src/lib/libbz2/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/conf/copts.mk
cvs rdiff -u -r1.88 -r1.89 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/nouveau/files.nouveau
cvs rdiff -u -r1.37 -r1.38 src/sys/external/bsd/drm2/radeon/files.radeon
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/ttm/files.ttm
cvs rdiff -u -r1.8 -r1.9 src/sys/external/isc/atheros_hal/conf/files.ath_hal
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/ath_hal/Makefile
cvs rdiff -u -r1.17 -r1.18 src/sys/modules/pf/Makefile
cvs rdiff -u -r1.15 -r1.16 src/sys/modules/radeondrm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/savagedrm/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/viadrmums/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/zlib/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/kern/lib/libz/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/stat/Makefile
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/telnet/Makefile
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/quotacheck/Makefile

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

CVS commit: src

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:28:53 UTC 2023

Modified Files:
src/tests/kernel: Makefile
src/usr.bin/newsyslog: Makefile

Log Message:
adapt to ${CC_WNO_FORMAT_TRUNCATION}


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/tests/kernel/Makefile
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/newsyslog/Makefile

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

CVS commit: src

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:28:53 UTC 2023

Modified Files:
src/tests/kernel: Makefile
src/usr.bin/newsyslog: Makefile

Log Message:
adapt to ${CC_WNO_FORMAT_TRUNCATION}


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/tests/kernel/Makefile
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/newsyslog/Makefile

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

Modified files:

Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.71 src/tests/kernel/Makefile:1.72
--- src/tests/kernel/Makefile:1.71	Fri Apr 21 21:50:05 2023
+++ src/tests/kernel/Makefile	Sat Jun  3 21:28:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2023/04/21 21:50:05 gutteridge Exp $
+# $NetBSD: Makefile,v 1.72 2023/06/03 21:28:52 lukem Exp $
 
 NOMAN=		# defined
 
@@ -82,10 +82,8 @@ t_subr_prf.c: gen_t_subr_prf ${NETBSDSRC
 
 CPPFLAGS.t_subr_prf.c=	-Wno-pointer-sign	# XXX platform vs kernel SHA2
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 # Test explicitly tests failure modes.
-CPPFLAGS.t_subr_prf.c+=	-Wno-error=format-truncation
-.endif
+CPPFLAGS.t_subr_prf.c+=	${CC_WNO_FORMAT_TRUNCATION}
 
 SANITIZER_RENAME_CLASSES+=		t_subr_prf
 SANITIZER_RENAME_FILES.t_subr_prf+=	t_subr_prf.c

Index: src/usr.bin/newsyslog/Makefile
diff -u src/usr.bin/newsyslog/Makefile:1.20 src/usr.bin/newsyslog/Makefile:1.21
--- src/usr.bin/newsyslog/Makefile:1.20	Sun Sep 29 23:45:01 2019
+++ src/usr.bin/newsyslog/Makefile	Sat Jun  3 21:28:53 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2019/09/29 23:45:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.21 2023/06/03 21:28:53 lukem Exp $
 
 PROG=	newsyslog
 SRCS=	newsyslog.c
@@ -8,8 +8,6 @@ MLINKS+=newsyslog.8 newsyslog.conf.5
 
 .include 
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.newsyslog.c += -Wno-error=format-truncation
-.endif
+COPTS.newsyslog.c +=	${CC_WNO_FORMAT_TRUNCATION}
 
 .include

CVS commit: src/external/mpl/dhcp/bin/server

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:27:11 UTC 2023

Modified Files:
src/external/mpl/dhcp/bin/server: Makefile

Log Message:
dhcp: remove gcc 8 workaround

(if it's needed, add it back using ${CC_WNO_FORMAT_OVERFLOW})


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/dhcp/bin/server/Makefile

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

Modified files:

Index: src/external/mpl/dhcp/bin/server/Makefile
diff -u src/external/mpl/dhcp/bin/server/Makefile:1.8 src/external/mpl/dhcp/bin/server/Makefile:1.9
--- src/external/mpl/dhcp/bin/server/Makefile:1.8	Sat Jun  3 09:09:08 2023
+++ src/external/mpl/dhcp/bin/server/Makefile	Sat Jun  3 21:27:11 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/06/03 09:09:08 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 21:27:11 lukem Exp $
 
 .include 
 
@@ -19,7 +19,6 @@ FILES=	dhcpd.conf
 COPTS.ddns.c +=-Wno-stringop-overflow
 .endif
 
-COPTS.mdb6.c +=		${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
 COPTS.omapi.c +=	-Wno-stack-protector
 COPTS.confpars.c+=	${CC_WNO_STRINGOP_TRUNCATION}
 COPTS.mdb6.c+=		${CC_WNO_STRINGOP_OVERFLOW}

CVS commit: src/external/mpl/dhcp/bin/server

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:27:11 UTC 2023

Modified Files:
src/external/mpl/dhcp/bin/server: Makefile

Log Message:
dhcp: remove gcc 8 workaround

(if it's needed, add it back using ${CC_WNO_FORMAT_OVERFLOW})


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/dhcp/bin/server/Makefile

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

CVS commit: src/external/bsd/ipf/bin/ipmon

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:26:53 UTC 2023

Modified Files:
src/external/bsd/ipf/bin/ipmon: Makefile

Log Message:
ipmon: remove duplicate warning suppression


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ipf/bin/ipmon/Makefile

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

Modified files:

Index: src/external/bsd/ipf/bin/ipmon/Makefile
diff -u src/external/bsd/ipf/bin/ipmon/Makefile:1.6 src/external/bsd/ipf/bin/ipmon/Makefile:1.7
--- src/external/bsd/ipf/bin/ipmon/Makefile:1.6	Sat Jun  3 09:09:03 2023
+++ src/external/bsd/ipf/bin/ipmon/Makefile	Sat Jun  3 21:26:52 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2023/06/03 09:09:03 lukem Exp $
+#	$NetBSD: Makefile,v 1.7 2023/06/03 21:26:52 lukem Exp $
 
 PROG=		ipmon
 SRCS=		ipmon.c ipmon_y.c ipmon_l.c
@@ -11,8 +11,6 @@ DPSRCS+=	ipmon_l.h ipmon_y.h
 CLEANFILES+=	ipmon_y.c ipmon_y.h
 CLEANFILES+=	ipmon_l.c ipmon_l.h
 
-COPTS.ipmon.c+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
-
 ipmon_y.c: ipmon_y.y
 	${_MKTARGET_CREATE}
 	${YACC} -d ${.ALLSRC}
@@ -36,6 +34,6 @@ ipmon_l.h: lexer.h
 	${TOOL_SED} -e 's/yy/ipmon_yy/g' \
 	${.ALLSRC} > ${.TARGET}
 
-COPTS.ipmon.c+=	${CC_WNO_ADDRESS_OF_PACKED_MEMBER} ${CC_WNO_FORMAT_OVERFLOW}
+COPTS.ipmon.c+=	${CC_WNO_ADDRESS_OF_PACKED_MEMBER} ${CC_WNO_FORMAT_OVERFLOW}
 
 .include

CVS commit: src/external/bsd/ipf/bin/ipmon

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:26:53 UTC 2023

Modified Files:
src/external/bsd/ipf/bin/ipmon: Makefile

Log Message:
ipmon: remove duplicate warning suppression


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ipf/bin/ipmon/Makefile

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

CVS commit: src

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:26:29 UTC 2023

Modified Files:
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
src/external/bsd/ipf: Makefile.inc
src/external/bsd/tcpdump/bin: Makefile
src/sbin/fsck_udf: Makefile
src/sbin/newfs_udf: Makefile
src/share/mk: bsd.kmodule.mk
src/sys/arch/i386/stand/efiboot/bootx64: Makefile
src/sys/arch/macppc/stand: Makefile.inc
src/sys/arch/sparc/stand/boot: Makefile
src/sys/arch/sparc/stand/bootxx: Makefile
src/sys/arch/sparc/stand/ofwboot: Makefile
src/sys/arch/zaurus/stand: Makefile.inc
src/sys/conf: Makefile.kern.inc
src/sys/rump/fs/lib/libudf: Makefile
src/sys/rump/net/lib: Makefile.inc
src/sys/stand/efiboot: Makefile.efiboot
src/usr.sbin/fstyp: Makefile
src/usr.sbin/installboot: Makefile
src/usr.sbin/makefs/udf: Makefile.inc
src/usr.sbin/pf: Makefile.inc

Log Message:
adapt to ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}

Simplify CWARNFLAGS to use ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
which works for both clang and gcc, and remove compiler-specific
equivalents.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ipf/Makefile.inc
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sbin/fsck_udf/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sbin/newfs_udf/Makefile
cvs rdiff -u -r1.83 -r1.84 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/stand/efiboot/bootx64/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/macppc/stand/Makefile.inc
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/sparc/stand/boot/Makefile
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sparc/stand/bootxx/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sparc/stand/ofwboot/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/stand/Makefile.inc
cvs rdiff -u -r1.296 -r1.297 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/fs/lib/libudf/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/net/lib/Makefile.inc
cvs rdiff -u -r1.27 -r1.28 src/sys/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/fstyp/Makefile
cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/installboot/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/makefs/udf/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/pf/Makefile.inc

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

Modified files:

Index: src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
diff -u src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.16 src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.17
--- src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.16	Sat Jun  3 09:09:02 2023
+++ src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile	Sat Jun  3 21:26:27 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2023/06/03 09:09:02 lukem Exp $
+#	$NetBSD: Makefile,v 1.17 2023/06/03 21:26:27 lukem Exp $
 
 PROG=	mdnsd
 
@@ -17,8 +17,8 @@ COPTS.uds_daemon.c += -Wno-stack-protect
 
 MAN=	mdnsd.8
 
-CWARNFLAGS.clang+=	-Wno-unused-value -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+=	${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS.clang+=	-Wno-unused-value
+CWARNFLAGS+=		${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
 
 COPTS.DNSCommon.c+=	${CC_WNO_RETURN_LOCAL_ADDR}
 

Index: src/external/bsd/ipf/Makefile.inc
diff -u src/external/bsd/ipf/Makefile.inc:1.8 src/external/bsd/ipf/Makefile.inc:1.9
--- src/external/bsd/ipf/Makefile.inc:1.8	Sat Jun  3 09:09:03 2023
+++ src/external/bsd/ipf/Makefile.inc	Sat Jun  3 21:26:27 2023
@@ -1,11 +1,10 @@
-#	$NetBSD: Makefile.inc,v 1.8 2023/06/03 09:09:03 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.9 2023/06/03 21:26:27 lukem Exp $
 
 WARNS?=	1	# XXX -Wcast-qual -Wshadow
 CWARNFLAGS.clang+=	-Wno-format -Wno-tautological-compare \
 			-Wno-self-assign -Wno-array-bounds \
-			-Wno-error=unused-const-variable \
-			-Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+=	${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+			-Wno-error=unused-const-variable
+CWARNFLAGS+=		${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
 
 .include 
 

Index: src/external/bsd/tcpdump/bin/Makefile
diff -u src/external/bsd/tcpdump/bin/Makefile:1.24 src/external/bsd/tcpdump/bin/Makefile:1.25
--- src/external/bsd/tcpdump/bin/Makefile:1.24	Sat Jun  3 09:09:05 2023
+++ src/external/bsd/tcpdump/bin/Makefile	Sat Jun  3 21:26:27 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2023/06/03 09:09:05 lukem Exp $	
+#	$NetBSD: Makefile,v 1.25 2023/06/03 21:26:27 lukem Exp $	
 
 WARNS?=	1	# XXX: need to cleanup later
 
@@ -205,8 +205,7 @@ tcpdump.8: tcpdump.1.in
 	@rm -f ${.TARGET}
 	cp ${.ALLSRC} ${.TARGET}
 
-CWARNFLAGS.clang+=	-Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+=	${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+=

CVS commit: src

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:26:29 UTC 2023

Modified Files:
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
src/external/bsd/ipf: Makefile.inc
src/external/bsd/tcpdump/bin: Makefile
src/sbin/fsck_udf: Makefile
src/sbin/newfs_udf: Makefile
src/share/mk: bsd.kmodule.mk
src/sys/arch/i386/stand/efiboot/bootx64: Makefile
src/sys/arch/macppc/stand: Makefile.inc
src/sys/arch/sparc/stand/boot: Makefile
src/sys/arch/sparc/stand/bootxx: Makefile
src/sys/arch/sparc/stand/ofwboot: Makefile
src/sys/arch/zaurus/stand: Makefile.inc
src/sys/conf: Makefile.kern.inc
src/sys/rump/fs/lib/libudf: Makefile
src/sys/rump/net/lib: Makefile.inc
src/sys/stand/efiboot: Makefile.efiboot
src/usr.sbin/fstyp: Makefile
src/usr.sbin/installboot: Makefile
src/usr.sbin/makefs/udf: Makefile.inc
src/usr.sbin/pf: Makefile.inc

Log Message:
adapt to ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}

Simplify CWARNFLAGS to use ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
which works for both clang and gcc, and remove compiler-specific
equivalents.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ipf/Makefile.inc
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sbin/fsck_udf/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sbin/newfs_udf/Makefile
cvs rdiff -u -r1.83 -r1.84 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/stand/efiboot/bootx64/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/macppc/stand/Makefile.inc
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/sparc/stand/boot/Makefile
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sparc/stand/bootxx/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sparc/stand/ofwboot/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/stand/Makefile.inc
cvs rdiff -u -r1.296 -r1.297 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/fs/lib/libudf/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/net/lib/Makefile.inc
cvs rdiff -u -r1.27 -r1.28 src/sys/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/fstyp/Makefile
cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/installboot/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/makefs/udf/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/pf/Makefile.inc

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

CVS commit: src/share/mk

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:24:58 UTC 2023

Modified Files:
src/share/mk: bsd.lib.mk bsd.lua.mk bsd.own.mk bsd.sys.mk

Log Message:
bsd.*.mk: move MKSTRIPSYM default to bsd.own.mk

Add default for MKSTRIPSYM=yes to to bsd.own.mk _MKVARS.no.
Test ${MKSTRIPSYM} != "no".


To generate a diff of this commit:
cvs rdiff -u -r1.393 -r1.394 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.9 -r1.10 src/share/mk/bsd.lua.mk
cvs rdiff -u -r1.1340 -r1.1341 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.313 -r1.314 src/share/mk/bsd.sys.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.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.393 src/share/mk/bsd.lib.mk:1.394
--- src/share/mk/bsd.lib.mk:1.393	Sun May 28 10:33:13 2023
+++ src/share/mk/bsd.lib.mk	Sat Jun  3 21:24:57 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.393 2023/05/28 10:33:13 lukem Exp $
+#	$NetBSD: bsd.lib.mk,v 1.394 2023/06/03 21:24:57 lukem Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include 
@@ -563,7 +563,7 @@ _LIBLDOPTS+=	-Wl,-rpath,${SHLIBDIR} \
 _LIBLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \
 		-L=${SHLIBINSTALLDIR}
 .endif
-.if ${MKSTRIPSYM:Uyes} == "yes"
+.if ${MKSTRIPSYM} != "no"
 _LIBLDOPTS+=	-Wl,-x
 .else
 _LIBLDOPTS+=	-Wl,-X

Index: src/share/mk/bsd.lua.mk
diff -u src/share/mk/bsd.lua.mk:1.9 src/share/mk/bsd.lua.mk:1.10
--- src/share/mk/bsd.lua.mk:1.9	Sun Apr 16 20:46:17 2023
+++ src/share/mk/bsd.lua.mk	Sat Jun  3 21:24:57 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lua.mk,v 1.9 2023/04/16 20:46:17 nikita Exp $
+#	$NetBSD: bsd.lua.mk,v 1.10 2023/06/03 21:24:57 lukem Exp $
 #
 # Build rules and definitions for Lua modules
 
@@ -129,7 +129,7 @@ DPSRCS+=${LUA_SRCS.${_M}}
 SRCS+=${LUA_SRCS.${_M}}
 
 LUA_LDOPTS=	-Wl,--warn-shared-textrel
-.if ${MKSTRIPSYM:Uyes} == "yes"
+.if ${MKSTRIPSYM} != "no"
 LUA_LDOPTS+=	-Wl,-x
 .else
 LUA_LDOPTS+=	-Wl,-X

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1340 src/share/mk/bsd.own.mk:1.1341
--- src/share/mk/bsd.own.mk:1.1340	Sat Jun  3 21:23:49 2023
+++ src/share/mk/bsd.own.mk	Sat Jun  3 21:24:57 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1340 2023/06/03 21:23:49 lukem Exp $
+#	$NetBSD: bsd.own.mk,v 1.1341 2023/06/03 21:24:57 lukem Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1213,6 +1213,7 @@ _MKVARS.yes= \
 	MKSHARE \
 	MKSKEY \
 	MKSTATICLIB \
+	MKSTRIPSYM \
 	MKUNBOUND \
 	MKX11FONTS \
 	MKYP

Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.313 src/share/mk/bsd.sys.mk:1.314
--- src/share/mk/bsd.sys.mk:1.313	Sat Apr 29 20:31:59 2023
+++ src/share/mk/bsd.sys.mk	Sat Jun  3 21:24:57 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.313 2023/04/29 20:31:59 christos Exp $
+#	$NetBSD: bsd.sys.mk,v 1.314 2023/06/03 21:24:57 lukem Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -347,7 +347,7 @@ OBJCOPYLIBFLAGS_EXTRA=-w -K '[$$][dx]' -
 OBJCOPYLIBFLAGS_EXTRA=-w -K '[$$][adt]' -K '[$$][adt]\.*'
 .endif
 
-.if ${MKSTRIPSYM:Uyes} == "yes"
+.if ${MKSTRIPSYM} != "no"
 OBJCOPYLIBFLAGS?=${"${.TARGET:M*.po}" != "":?-X:-x} ${OBJCOPYLIBFLAGS_EXTRA}
 .else
 OBJCOPYLIBFLAGS?=-X ${OBJCOPYLIBFLAGS_EXTRA}

CVS commit: src/share/mk

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:24:58 UTC 2023

Modified Files:
src/share/mk: bsd.lib.mk bsd.lua.mk bsd.own.mk bsd.sys.mk

Log Message:
bsd.*.mk: move MKSTRIPSYM default to bsd.own.mk

Add default for MKSTRIPSYM=yes to to bsd.own.mk _MKVARS.no.
Test ${MKSTRIPSYM} != "no".


To generate a diff of this commit:
cvs rdiff -u -r1.393 -r1.394 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.9 -r1.10 src/share/mk/bsd.lua.mk
cvs rdiff -u -r1.1340 -r1.1341 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.313 -r1.314 src/share/mk/bsd.sys.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/indent

2023-06-03 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Sat Jun  3 21:24:26 UTC 2023

Modified Files:
src/usr.bin/indent: indent.c parse.c

Log Message:
indent: clean up handling of brace indentation

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.316 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.63 -r1.64 src/usr.bin/indent/parse.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/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.315 src/usr.bin/indent/indent.c:1.316
--- src/usr.bin/indent/indent.c:1.315	Fri Jun  2 15:07:46 2023
+++ src/usr.bin/indent/indent.c	Sat Jun  3 21:24:26 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: indent.c,v 1.315 2023/06/02 15:07:46 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.316 2023/06/03 21:24:26 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: indent.c,v 1.315 2023/06/02 15:07:46 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.316 2023/06/03 21:24:26 rillig Exp $");
 
 #include 
 #include 
@@ -534,7 +534,7 @@ process_lparen_or_lbracket(void)
 		/* this is a kluge to make sure that declarations will be
 		 * aligned right if proc decl has an explicit type on it, i.e.
 		 * "int a(x) {..." */
-		parse(psym_0);
+		parse(psym_stmt);
 		ps.init_or_struct = false;
 	}
 
@@ -724,7 +724,7 @@ process_semicolon(void)
 	ps.decl_ind = 0;
 
 	if (ps.spaced_expr_psym == psym_0) {
-		parse(psym_0);	/* let parser know about end of stmt */
+		parse(psym_stmt);
 		ps.force_nl = true;
 	}
 }

Index: src/usr.bin/indent/parse.c
diff -u src/usr.bin/indent/parse.c:1.63 src/usr.bin/indent/parse.c:1.64
--- src/usr.bin/indent/parse.c:1.63	Fri Jun  2 11:43:07 2023
+++ src/usr.bin/indent/parse.c	Sat Jun  3 21:24:26 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.63 2023/06/02 11:43:07 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.64 2023/06/03 21:24:26 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: parse.c,v 1.63 2023/06/02 11:43:07 rillig Exp $");
+__RCSID("$NetBSD: parse.c,v 1.64 2023/06/03 21:24:26 rillig Exp $");
 
 #include 
 
@@ -56,6 +56,20 @@ decl_level(void)
 	return level;
 }
 
+static void
+ps_push(parser_symbol psym)
+{
+	ps.s_sym[++ps.tos] = psym;
+	ps.s_ind_level[ps.tos] = ps.ind_level;
+}
+
+static void
+ps_push_follow(parser_symbol psym)
+{
+	ps.s_sym[++ps.tos] = psym;
+	ps.s_ind_level[ps.tos] = ps.ind_level_follow;
+}
+
 /*
  * Shift the token onto the parser stack, or reduce it by combining it with
  * previous tokens.
@@ -80,27 +94,20 @@ parse(parser_symbol psym)
 			break;	/* only put one declaration onto stack */
 
 		ps.break_after_comma = true;
-		ps.s_sym[++ps.tos] = psym_decl;
-		ps.s_ind_level[ps.tos] = ps.ind_level_follow;
+		ps_push_follow(psym_decl);
 
 		if (opt.ljust_decl)
 			ps.ind_level_follow = ps.ind_level = decl_level();
 		break;
 
 	case psym_if_expr:
-		if (ps.s_sym[ps.tos] == psym_if_expr_stmt_else
-		&& opt.else_if) {
-			/* Reduce "else if" to "if". This saves a lot of stack
-			 * space in case of a long "if-else-if ... else-if"
-			 * sequence. */
+		if (ps.s_sym[ps.tos] == psym_if_expr_stmt_else && opt.else_if)
 			ps.ind_level_follow = ps.s_ind_level[ps.tos--];
-		}
 		/* FALLTHROUGH */
 	case psym_do:
 	case psym_for_exprs:
-		ps.s_sym[++ps.tos] = psym;
-		ps.s_ind_level[ps.tos] = ps.ind_level = ps.ind_level_follow;
-		++ps.ind_level_follow;
+		ps.ind_level = ps.ind_level_follow++;
+		ps_push(psym);
 		break;
 
 	case psym_lbrace:
@@ -125,60 +132,52 @@ parse(parser_symbol psym)
 			}
 		}
 
-		ps.s_sym[++ps.tos] = psym_lbrace;
-		ps.s_ind_level[ps.tos] = ps.ind_level;
-		ps.s_sym[++ps.tos] = psym_stmt;
-		ps.s_ind_level[ps.tos] = ps.ind_level_follow;
+		ps_push(psym_lbrace);
+		ps_push_follow(psym_stmt);
 		break;
 
 	case psym_while_expr:
 		if (ps.s_sym[ps.tos] == psym_do_stmt) {
-			/* it is matched with do stmt */
 			ps.ind_level =
 			ps.ind_level_follow = ps.s_ind_level[ps.tos];
-			ps.s_sym[++ps.tos] = psym_while_expr;
-			ps.s_ind_level[ps.tos] = ps.ind_level;
-
-		} else {	/* it is a while loop */
-			ps.s_sym[++ps.tos] = psym_while_expr;
-			ps.s_ind_level[ps.tos] = ps.ind_level_follow;
+			ps_push(psym_while_expr);
+		} else {
+			ps_push_follow(psym_while_expr);
 			++ps.ind_level_follow;
 		}
 
 		break;
 
 	case psym_else:
-		if (ps.s_sym[ps.tos] != psym_if_expr_stmt)
+		if (ps.s_sym[ps.tos] != psym_if_expr_stmt) {
 			diag(1, "Unmatched 'else'");
-		else {
-			ps.ind_level = ps.s_ind_level[ps.tos];
-			ps.ind_level_follow = ps.ind_level + 1;
-			ps.s_sym[ps.tos] = psym_if_expr_stmt_else;
+			break;
 		}
+		ps.ind_level = ps.s_ind_level[ps.tos];
+		ps.ind_level_follow = ps.ind_level + 1;
+		ps.s_sym[ps.tos] = psym_if_expr_stmt_else;
 		break;
 
 	case psym_rbrace:
 		/* stack should have   or   */
-		if (ps.tos > 0 && ps.s_sym[ps.tos - 1] == psym_lbrace) {
-

CVS commit: src/usr.bin/indent

2023-06-03 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Sat Jun  3 21:24:26 UTC 2023

Modified Files:
src/usr.bin/indent: indent.c parse.c

Log Message:
indent: clean up handling of brace indentation

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.316 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.63 -r1.64 src/usr.bin/indent/parse.c

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

CVS commit: src/share/mk

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:23:50 UTC 2023

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

Log Message:
bsd.obj.mk: move MKHOSTOBJ to bsd.own.mk

Add default for MKHOSTOBJ=no to to bsd.own.mk _MKVARS.no.
Simplify bsd.obj.mk check.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/share/mk/bsd.obj.mk
cvs rdiff -u -r1.1339 -r1.1340 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.obj.mk
diff -u src/share/mk/bsd.obj.mk:1.53 src/share/mk/bsd.obj.mk:1.54
--- src/share/mk/bsd.obj.mk:1.53	Tue Mar 29 22:48:04 2022
+++ src/share/mk/bsd.obj.mk	Sat Jun  3 21:23:49 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.obj.mk,v 1.53 2022/03/29 22:48:04 christos Exp $
+#	$NetBSD: bsd.obj.mk,v 1.54 2023/06/03 21:23:49 lukem Exp $
 
 .if !defined(_BSD_OBJ_MK_)
 _BSD_OBJ_MK_=1
@@ -51,7 +51,7 @@ __usrobjdirpf:=	${__usrobjdirpf}.${BUILD
 __need_objdir_target=yes
 .endif
 
-.if defined(OBJHOSTMACHINE) && (${MKHOSTOBJ:Uno} != "no")
+.if defined(OBJHOSTMACHINE) && (${MKHOSTOBJ} != "no")
 # In case .CURDIR has been twiddled by a .mk file and is now relative,
 # make it absolute again.
 .if ${__curdir:M/*} == ""

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1339 src/share/mk/bsd.own.mk:1.1340
--- src/share/mk/bsd.own.mk:1.1339	Sat Jun  3 21:23:07 2023
+++ src/share/mk/bsd.own.mk	Sat Jun  3 21:23:49 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1339 2023/06/03 21:23:07 lukem Exp $
+#	$NetBSD: bsd.own.mk,v 1.1340 2023/06/03 21:23:49 lukem Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1355,6 +1355,7 @@ _MKVARS.no= \
 	MKDTRACE \
 	MKFIRMWARE \
 	MKGROFFHTMLDOC \
+	MKHOSTOBJ \
 	MKKYUA \
 	MKLIBCXX \
 	MKLINT \

CVS commit: src/share/mk

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:23:50 UTC 2023

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

Log Message:
bsd.obj.mk: move MKHOSTOBJ to bsd.own.mk

Add default for MKHOSTOBJ=no to to bsd.own.mk _MKVARS.no.
Simplify bsd.obj.mk check.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/share/mk/bsd.obj.mk
cvs rdiff -u -r1.1339 -r1.1340 src/share/mk/bsd.own.mk

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

CVS commit: src/share/mk

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:23:07 UTC 2023

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

Log Message:
bsd.dep.mk: move MKDEPINCLUDES to bsd.own.mk

Add default for MKDEPINCLUDES=no to to bsd.own.mk _MKVARS.no.
Simplify bsd.dep.mk check.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/share/mk/bsd.dep.mk
cvs rdiff -u -r1.1338 -r1.1339 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.dep.mk
diff -u src/share/mk/bsd.dep.mk:1.88 src/share/mk/bsd.dep.mk:1.89
--- src/share/mk/bsd.dep.mk:1.88	Tue Dec 14 16:22:07 2021
+++ src/share/mk/bsd.dep.mk	Sat Jun  3 21:23:07 2023
@@ -1,4 +1,6 @@
-#	$NetBSD: bsd.dep.mk,v 1.88 2021/12/14 16:22:07 christos Exp $
+#	$NetBSD: bsd.dep.mk,v 1.89 2023/06/03 21:23:07 lukem Exp $
+
+.include 
 
 # Basic targets
 realdepend:	beforedepend .depend afterdepend
@@ -39,7 +41,7 @@ ${__DPSRCS.d}: ${__DPSRCS.notd} ${DPSRCS
 
 MKDEPSUFFLAGS=-s ${MKDEP_SUFFIXES:Q}
 
-.if defined(MKDEPINCLUDES) && ${MKDEPINCLUDES} != "no"
+.if ${MKDEPINCLUDES} != "no"
 .STALE:
 	@echo Rebuilding dependency file: ${.ALLSRC}
 	@rm -f ${.ALLSRC}

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1338 src/share/mk/bsd.own.mk:1.1339
--- src/share/mk/bsd.own.mk:1.1338	Sat Jun  3 21:21:32 2023
+++ src/share/mk/bsd.own.mk	Sat Jun  3 21:23:07 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1338 2023/06/03 21:21:32 lukem Exp $
+#	$NetBSD: bsd.own.mk,v 1.1339 2023/06/03 21:23:07 lukem Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1350,6 +1350,7 @@ _MKVARS.no= \
 	MKCTF \
 	MKDEBUG \
 	MKDEBUGLIB \
+	MKDEPINCLUDES \
 	MKDTB \
 	MKDTRACE \
 	MKFIRMWARE \

CVS commit: src/share/mk

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:23:07 UTC 2023

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

Log Message:
bsd.dep.mk: move MKDEPINCLUDES to bsd.own.mk

Add default for MKDEPINCLUDES=no to to bsd.own.mk _MKVARS.no.
Simplify bsd.dep.mk check.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/share/mk/bsd.dep.mk
cvs rdiff -u -r1.1338 -r1.1339 src/share/mk/bsd.own.mk

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

CVS commit: src/share/mk

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:21:32 UTC 2023

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

Log Message:
bsd.*.mk: move MKCLEAN* to bsd.own.mk

Move the defaults for MKCLEANSRC and MKCLEANVERIFY
from bsd.clean.mk to bsd.own.mk _MKVARS.yes.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/mk/bsd.clean.mk
cvs rdiff -u -r1.1337 -r1.1338 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.clean.mk
diff -u src/share/mk/bsd.clean.mk:1.9 src/share/mk/bsd.clean.mk:1.10
--- src/share/mk/bsd.clean.mk:1.9	Tue Dec  7 22:40:52 2021
+++ src/share/mk/bsd.clean.mk	Sat Jun  3 21:21:32 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.clean.mk,v 1.9 2021/12/07 22:40:52 rillig Exp $
+# $NetBSD: bsd.clean.mk,v 1.10 2023/06/03 21:21:32 lukem Exp $
 
 # 
 #
@@ -31,9 +31,6 @@ _BSD_CLEAN_MK_=1
 
 .include 
 
-MKCLEANSRC?=	yes
-MKCLEANVERIFY?=	yes
-
 clean:		.PHONY __doclean
 __doclean:	.PHONY .MADE __cleanuse CLEANFILES
 cleandir:	.PHONY clean __docleandir

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1337 src/share/mk/bsd.own.mk:1.1338
--- src/share/mk/bsd.own.mk:1.1337	Sat Jun  3 09:09:13 2023
+++ src/share/mk/bsd.own.mk	Sat Jun  3 21:21:32 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1337 2023/06/03 09:09:13 lukem Exp $
+#	$NetBSD: bsd.own.mk,v 1.1338 2023/06/03 21:21:32 lukem Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1172,6 +1172,8 @@ _MKVARS.yes= \
 	MKATF \
 	MKBINUTILS \
 	MKBSDTAR \
+	MKCLEANSRC \
+	MKCLEANVERIFY \
 	MKCOMPLEX \
 	MKCVS \
 	MKCXX \

CVS commit: src/share/mk

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:21:32 UTC 2023

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

Log Message:
bsd.*.mk: move MKCLEAN* to bsd.own.mk

Move the defaults for MKCLEANSRC and MKCLEANVERIFY
from bsd.clean.mk to bsd.own.mk _MKVARS.yes.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/mk/bsd.clean.mk
cvs rdiff -u -r1.1337 -r1.1338 src/share/mk/bsd.own.mk

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

CVS commit: src/distrib/sets

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:20:53 UTC 2023

Modified Files:
src/distrib/sets: mkvars.mk

Log Message:
mkvars.mk: sort MKEXTRAVARS and remove dupes

Sort MKEXTRAVARS.
Remove obsolete MKBFD.
Remove entries already in  _MKVARS.no or _MKVARS.yes:
MKCOMPATTESTS MKDTC MKDYNAMICROOT MKFIRMWARE MKMANZ
MKRADEONFIRMWARE MKSLJIT MKSOFTFLOAT MKXORG_SERVER

Sorted output of comparing "before" and "after" is identical
besides those variables listed above.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/mkvars.mk

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

Modified files:

Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.41 src/distrib/sets/mkvars.mk:1.42
--- src/distrib/sets/mkvars.mk:1.41	Sun Aug 21 07:10:03 2022
+++ src/distrib/sets/mkvars.mk	Sat Jun  3 21:20:53 2023
@@ -1,48 +1,43 @@
-# $NetBSD: mkvars.mk,v 1.41 2022/08/21 07:10:03 lukem Exp $
+# $NetBSD: mkvars.mk,v 1.42 2023/06/03 21:20:53 lukem Exp $
 
+#
+# Extra variables to print.
+# Do not include entries from  _MKVARS.no and _MKVAR.yes.
+# Please keep alphabetically sorted with one entry per line.
+#
 MKEXTRAVARS= \
-	MACHINE \
-	MACHINE_ARCH \
-	MACHINE_CPU \
+	ARCH64 \
+	EABI \
 	HAVE_ACPI \
+	HAVE_BINUTILS \
 	HAVE_GCC \
 	HAVE_GDB \
-	HAVE_XORG_SERVER_VER \
-	HAVE_XORG_GLAMOR \
+	HAVE_LIBGCC_EH \
 	HAVE_MESA_VER \
 	HAVE_NVMM \
-	HAVE_BINUTILS \
-	HAVE_LIBGCC_EH \
 	HAVE_OPENSSL \
 	HAVE_SSP \
 	HAVE_UEFI \
-	OBJECT_FMT \
-	TOOLCHAIN_MISSING \
+	HAVE_XORG_GLAMOR \
+	HAVE_XORG_SERVER_VER \
 	KERNEL_DIR \
-	MKMANZ \
-	MKBFD \
+	MACHINE \
+	MACHINE_ARCH \
+	MACHINE_CPU \
+	MAKEVERBOSE \
 	MKCOMPAT \
-	MKCOMPATTESTS \
 	MKCOMPATMODULES \
-	MKDTC \
-	MKDYNAMICROOT \
-	MKFIRMWARE \
 	MKMANPAGES \
-	MKSLJIT \
-	MKSOFTFLOAT \
-	MKXORG \
-	MKXORG_SERVER \
-	MKRADEONFIRMWARE \
 	MKSTATICPIE \
+	MKXORG \
+	NETBSDSRCDIR \
+	OBJECT_FMT \
+	TARGET_ENDIANNESS \
+	TOOLCHAIN_MISSING \
 	USE_INET6 \
 	USE_KERBEROS \
 	USE_LDAP \
-	USE_YP \
-	NETBSDSRCDIR \
-	MAKEVERBOSE \
-	TARGET_ENDIANNESS \
-	EABI \
-	ARCH64
+	USE_YP
 
 #

CVS commit: src/distrib/sets

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 21:20:53 UTC 2023

Modified Files:
src/distrib/sets: mkvars.mk

Log Message:
mkvars.mk: sort MKEXTRAVARS and remove dupes

Sort MKEXTRAVARS.
Remove obsolete MKBFD.
Remove entries already in  _MKVARS.no or _MKVARS.yes:
MKCOMPATTESTS MKDTC MKDYNAMICROOT MKFIRMWARE MKMANZ
MKRADEONFIRMWARE MKSLJIT MKSOFTFLOAT MKXORG_SERVER

Sorted output of comparing "before" and "after" is identical
besides those variables listed above.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/mkvars.mk

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

CVS commit: src

2023-06-03 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Sat Jun  3 21:08:06 UTC 2023

Modified Files:
src/tests/usr.bin/xlint/lint1: queries.c t_usage.sh
src/usr.bin/xlint/lint1: decl.c err.c

Log Message:
lint: add query for static variables in functions

This query allows finding hidden global variables, as an easier-to-read
alternative to 'objdump -t'.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/usr.bin/xlint/lint1/queries.c
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/t_usage.sh
cvs rdiff -u -r1.314 -r1.315 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.196 -r1.197 src/usr.bin/xlint/lint1/err.c

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

Modified files:

Index: src/tests/usr.bin/xlint/lint1/queries.c
diff -u src/tests/usr.bin/xlint/lint1/queries.c:1.13 src/tests/usr.bin/xlint/lint1/queries.c:1.14
--- src/tests/usr.bin/xlint/lint1/queries.c:1.13	Sat May 13 20:55:44 2023
+++ src/tests/usr.bin/xlint/lint1/queries.c	Sat Jun  3 21:08:06 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: queries.c,v 1.13 2023/05/13 20:55:44 rillig Exp $	*/
+/*	$NetBSD: queries.c,v 1.14 2023/06/03 21:08:06 rillig Exp $	*/
 # 3 "queries.c"
 
 /*
@@ -15,7 +15,7 @@
  * 	such as casts between arithmetic types.
  */
 
-/* lint1-extra-flags: -q 1,2,3,4,5,6,7,8,9,10 -X 351 */
+/* lint1-extra-flags: -q 1,2,3,4,5,6,7,8,9,10,11 -X 351 */
 
 typedef unsigned char u8_t;
 typedef unsigned short u16_t;
@@ -367,6 +367,18 @@ Q10(void)
 	a += b *= c -= 0;
 }
 
+void
+Q11(void)
+{
+	/* expect+1: static variable 'static_var_no_init' in function [Q11] */
+	static int static_var_no_init;
+	/* expect+1: static variable 'static_var_init' in function [Q11] */
+	static int static_var_init = 1;
+
+	static_var_no_init++;
+	static_var_init++;
+}
+
 /*
  * Since queries do not affect the exit status, force a warning to make this
  * test conform to the general expectation that a test that produces output

Index: src/tests/usr.bin/xlint/lint1/t_usage.sh
diff -u src/tests/usr.bin/xlint/lint1/t_usage.sh:1.3 src/tests/usr.bin/xlint/lint1/t_usage.sh:1.4
--- src/tests/usr.bin/xlint/lint1/t_usage.sh:1.3	Sat May 13 20:55:44 2023
+++ src/tests/usr.bin/xlint/lint1/t_usage.sh	Sat Jun  3 21:08:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_usage.sh,v 1.3 2023/05/13 20:55:44 rillig Exp $
+# $NetBSD: t_usage.sh,v 1.4 2023/06/03 21:08:06 rillig Exp $
 #
 # Copyright (c) 2023 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -97,13 +97,13 @@ enable_queries_body()
 
 	# The largest known query.
 	atf_check \
-	"$lint1" -q 10 code.c /dev/null
+	"$lint1" -q 11 code.c /dev/null
 
 	# Larger than the largest known query.
 	atf_check \
 	-s 'exit:1' \
-	-e "inline:lint1: invalid query ID '11'\n" \
-	"$lint1" -q 11 code.c /dev/null
+	-e "inline:lint1: invalid query ID '12'\n" \
+	"$lint1" -q 12 code.c /dev/null
 
 	# Whitespace is not allowed before a query ID.
 	atf_check \

Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.314 src/usr.bin/xlint/lint1/decl.c:1.315
--- src/usr.bin/xlint/lint1/decl.c:1.314	Mon May 22 18:10:57 2023
+++ src/usr.bin/xlint/lint1/decl.c	Sat Jun  3 21:08:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.314 2023/05/22 18:10:57 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.315 2023/06/03 21:08:06 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: decl.c,v 1.314 2023/05/22 18:10:57 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.315 2023/06/03 21:08:06 rillig Exp $");
 #endif
 
 #include 
@@ -2780,7 +2780,6 @@ declare_local(sym_t *dsym, bool has_init
 			outsym(dsym, EXTERN, dsym->s_def);
 		else
 			outsym(dsym, dsym->s_ext_sym->s_scl, dsym->s_def);
-
 	}
 
 	if (dcs->d_redeclared_symbol != NULL)
@@ -2797,10 +2796,10 @@ declare_local(sym_t *dsym, bool has_init
 		set_first_typedef(dsym->s_type, dsym);
 	}
 
-	/*
-	 * Before we can check the size we must wait for an initialization
-	 * that may follow.
-	 */
+	if (dsym->s_scl == STATIC && any_query_enabled) {
+		/* static variable '%s' in function */
+		query_message(11, dsym->s_name);
+	}
 }
 
 /* Processes (re)declarations of external symbols inside blocks. */

Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.196 src/usr.bin/xlint/lint1/err.c:1.197
--- src/usr.bin/xlint/lint1/err.c:1.196	Sat May 13 20:55:44 2023
+++ src/usr.bin/xlint/lint1/err.c	Sat Jun  3 21:08:06 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: err.c,v 1.196 2023/05/13 20:55:44 rillig Exp $	*/
+/*	$NetBSD: err.c,v 1.197 2023/06/03 21:08:06 rillig Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: err.c,v 1.196 2023/05/13 20:55:44 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.197 2023/06/03 21:08:06 rillig Exp $");
 #endif
 
 #include 
@@ -706,6 +706,7 @@ static const char

CVS commit: src

2023-06-03 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Sat Jun  3 21:08:06 UTC 2023

Modified Files:
src/tests/usr.bin/xlint/lint1: queries.c t_usage.sh
src/usr.bin/xlint/lint1: decl.c err.c

Log Message:
lint: add query for static variables in functions

This query allows finding hidden global variables, as an easier-to-read
alternative to 'objdump -t'.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/usr.bin/xlint/lint1/queries.c
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/t_usage.sh
cvs rdiff -u -r1.314 -r1.315 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.196 -r1.197 src/usr.bin/xlint/lint1/err.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/xlint/lint1

2023-06-03 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Sat Jun  3 20:58:00 UTC 2023

Modified Files:
src/usr.bin/xlint/lint1: debug.c ops.def

Log Message:
lint: loosen assertion that unary operators have only a single operand


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/xlint/lint1/debug.c
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/xlint/lint1/ops.def

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/xlint/lint1/debug.c
diff -u src/usr.bin/xlint/lint1/debug.c:1.32 src/usr.bin/xlint/lint1/debug.c:1.33
--- src/usr.bin/xlint/lint1/debug.c:1.32	Sat Jun  3 20:40:28 2023
+++ src/usr.bin/xlint/lint1/debug.c	Sat Jun  3 20:58:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: debug.c,v 1.32 2023/06/03 20:40:28 rillig Exp $ */
+/* $NetBSD: debug.c,v 1.33 2023/06/03 20:58:00 rillig Exp $ */
 
 /*-
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: debug.c,v 1.32 2023/06/03 20:40:28 rillig Exp $");
+__RCSID("$NetBSD: debug.c,v 1.33 2023/06/03 20:58:00 rillig Exp $");
 #endif
 
 #include 
@@ -220,7 +220,9 @@ debug_node(const tnode_t *tn) // NOLINT(
 		debug_indent_inc();
 		lint_assert(tn->tn_left != NULL);
 		debug_node(tn->tn_left);
-		lint_assert(is_binary(tn) == (tn->tn_right != NULL));
+		if (op != INCBEF && op != INCAFT
+		&& op != DECBEF && op != DECAFT)
+			lint_assert(is_binary(tn) == (tn->tn_right != NULL));
 		if (tn->tn_right != NULL)
 			debug_node(tn->tn_right);
 		debug_indent_dec();

Index: src/usr.bin/xlint/lint1/ops.def
diff -u src/usr.bin/xlint/lint1/ops.def:1.29 src/usr.bin/xlint/lint1/ops.def:1.30
--- src/usr.bin/xlint/lint1/ops.def:1.29	Wed Jun 15 18:44:41 2022
+++ src/usr.bin/xlint/lint1/ops.def	Sat Jun  3 20:58:00 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: ops.def,v 1.29 2022/06/15 18:44:41 rillig Exp $ */
+/*	$NetBSD: ops.def,v 1.30 2023/06/03 20:58:00 rillig Exp $ */
 
 begin_ops()
 
@@ -34,6 +34,11 @@ op(	NOT,	"!",		 ,1,1,1, , , ,1,1, , , , 
 op(	COMPL,	"~",		 , , , , ,1, , ,1,1, , , , , , , , ,1,1)
 op(	INC,	"++",		 , , , , , , , , , , , , , , , , , , , )
 op(	DEC,	"--",		 , , , , , , , , , , , , , , , , , , , )
+/*
+ * The '++' and '--' operators are conceptually unary operators, but lint
+ * implements them as binary operators due to the pre-multiplied pointer
+ * arithmetics, see build_prepost_incdec and build_plus_minus.
+ */
 op(	INCBEF,	"++x",		 , , , , , , ,1, , , , ,1, , , , , ,1, )
 op(	DECBEF,	"--x",		 , , , , , , ,1, , , , ,1, , , , , ,1, )
 op(	INCAFT,	"x++",		 , , , , , , ,1, , , , ,1, , , , , ,1, )

CVS commit: src/usr.bin/xlint/lint1

2023-06-03 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Sat Jun  3 20:58:00 UTC 2023

Modified Files:
src/usr.bin/xlint/lint1: debug.c ops.def

Log Message:
lint: loosen assertion that unary operators have only a single operand


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/xlint/lint1/debug.c
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/xlint/lint1/ops.def

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

CVS commit: src

2023-06-03 Thread Andrius Varanavicius

Module Name:src
Committed By:   andvar
Date:   Sat Jun  3 20:41:45 UTC 2023

Modified Files:
src/lib/librumpuser/build-aux: depcomp
src/sys/arch/ia64/include: elf_machdep.h
src/sys/arch/ia64/stand/ia64/efi: start.S
src/sys/dev/ic: dwc_eqos.c
src/sys/dev/mii: bmtphyreg.h
src/sys/fs/udf: udf_subr.c

Log Message:
fix various typos in comments and messages.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/librumpuser/build-aux/depcomp
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/include/elf_machdep.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/ia64/efi/start.S
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/ic/dwc_eqos.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/mii/bmtphyreg.h
cvs rdiff -u -r1.173 -r1.174 src/sys/fs/udf/udf_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/lib/librumpuser/build-aux/depcomp
diff -u src/lib/librumpuser/build-aux/depcomp:1.1 src/lib/librumpuser/build-aux/depcomp:1.2
--- src/lib/librumpuser/build-aux/depcomp:1.1	Tue Nov  4 19:05:17 2014
+++ src/lib/librumpuser/build-aux/depcomp	Sat Jun  3 20:41:44 2023
@@ -198,7 +198,7 @@ gcc3)
   ;;
 
 gcc)
-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## Note that this doesn't just cater to obsolete pre-3.x GCC compilers.
 ## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
 ## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's

Index: src/sys/arch/ia64/include/elf_machdep.h
diff -u src/sys/arch/ia64/include/elf_machdep.h:1.4 src/sys/arch/ia64/include/elf_machdep.h:1.5
--- src/sys/arch/ia64/include/elf_machdep.h:1.4	Thu Apr 11 14:38:06 2019
+++ src/sys/arch/ia64/include/elf_machdep.h	Sat Jun  3 20:41:44 2023
@@ -1,4 +1,4 @@
-/*$NetBSD: elf_machdep.h,v 1.4 2019/04/11 14:38:06 kamil Exp $	*/
+/*$NetBSD: elf_machdep.h,v 1.5 2023/06/03 20:41:44 andvar Exp $	*/
 
 /*-
  * Copyright (c) 1996-1997 John D. Polstra.
@@ -102,7 +102,7 @@
 #define	R_IA64_LTV64MSB		0x76	/* word64 MSB	S + A */
 #define	R_IA64_LTV64LSB		0x77	/* word64 LSB	S + A */
 #define	R_IA64_IPLTMSB		0x80	/* function descriptor MSB special */
-#define	R_IA64_IPLTLSB		0x81	/* function descriptor LSB speciaal */
+#define	R_IA64_IPLTLSB		0x81	/* function descriptor LSB special */
 #define	R_IA64_SUB		0x85	/* immediate64	A - S */
 #define	R_IA64_LTOFF22X		0x86	/* immediate22	special */
 #define	R_IA64_LDXMOV		0x87	/* immediate22	special */

Index: src/sys/arch/ia64/stand/ia64/efi/start.S
diff -u src/sys/arch/ia64/stand/ia64/efi/start.S:1.2 src/sys/arch/ia64/stand/ia64/efi/start.S:1.3
--- src/sys/arch/ia64/stand/ia64/efi/start.S:1.2	Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/ia64/efi/start.S	Sat Jun  3 20:41:45 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: start.S,v 1.2 2006/04/22 07:58:53 cherry Exp $	*/
+*	$NetBSD: start.S,v 1.3 2023/06/03 20:41:45 andvar Exp $	*/
 	
 /*-
  * Copyright (c) 2001 Doug Rabson
@@ -74,7 +74,7 @@
 #define R_IA64_REL64MSB		0x6e	/* word64 MSB	BD + A */
 #define R_IA64_REL32LSB		0x6d	/* word32 LSB	BD + A */
 #define R_IA64_REL64LSB		0x6f	/* word64 LSB	BD + A */
-#define	R_IA64_IPLTLSB		0x81	/* function descriptor LSB speciaal */
+#define	R_IA64_IPLTLSB		0x81	/* function descriptor LSB special */
 
 ENTRY(_start, 2)
 	alloc	loc0=ar.pfs,2,3,3,0

Index: src/sys/dev/ic/dwc_eqos.c
diff -u src/sys/dev/ic/dwc_eqos.c:1.16 src/sys/dev/ic/dwc_eqos.c:1.17
--- src/sys/dev/ic/dwc_eqos.c:1.16	Sun Sep 18 18:20:31 2022
+++ src/sys/dev/ic/dwc_eqos.c	Sat Jun  3 20:41:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos.c,v 1.16 2022/09/18 18:20:31 thorpej Exp $ */
+/* $NetBSD: dwc_eqos.c,v 1.17 2023/06/03 20:41:45 andvar Exp $ */
 
 /*-
  * Copyright (c) 2022 Jared McNeill 
@@ -33,7 +33,7 @@
 #include "opt_net_mpsafe.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.16 2022/09/18 18:20:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.17 2023/06/03 20:41:45 andvar Exp $");
 
 #include 
 #include 
@@ -540,7 +540,7 @@ eqos_init_rings(struct eqos_softc *sc, i
 	WR4(sc, GMAC_DMA_CHAN0_TX_BASE_ADDR,
 	(uint32_t)sc->sc_tx.desc_ring_paddr);
 	WR4(sc, GMAC_DMA_CHAN0_TX_RING_LEN, TX_DESC_COUNT - 1);
-	DPRINTF(EDEB_TXRING, "tx ring paddr %lx with %u decriptors\n",
+	DPRINTF(EDEB_TXRING, "tx ring paddr %lx with %u descriptors\n",
 	sc->sc_tx.desc_ring_paddr, TX_DESC_COUNT);
 
 	sc->sc_rx.cur = sc->sc_rx.next = sc->sc_rx.queued = 0;
@@ -552,7 +552,7 @@ eqos_init_rings(struct eqos_softc *sc, i
 	WR4(sc, GMAC_DMA_CHAN0_RX_END_ADDR,
 	(uint32_t)sc->sc_rx.desc_ring_paddr +
 	DESC_OFF((sc->sc_rx.cur - 1) % RX_DESC_COUNT));
-	DPRINTF(EDEB_RXRING, "rx ring paddr %lx with %u decriptors\n",
+	DPRINTF(EDEB_RXRING, "rx ring paddr %lx with %u descriptors\n",
 	sc->sc_rx.desc_ring_paddr, RX_DESC_COUNT);
 }
 

Index: src/sys/dev/mii/bmtphyreg.h
diff -u

CVS commit: src

2023-06-03 Thread Andrius Varanavicius

Module Name:src
Committed By:   andvar
Date:   Sat Jun  3 20:41:45 UTC 2023

Modified Files:
src/lib/librumpuser/build-aux: depcomp
src/sys/arch/ia64/include: elf_machdep.h
src/sys/arch/ia64/stand/ia64/efi: start.S
src/sys/dev/ic: dwc_eqos.c
src/sys/dev/mii: bmtphyreg.h
src/sys/fs/udf: udf_subr.c

Log Message:
fix various typos in comments and messages.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/librumpuser/build-aux/depcomp
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/include/elf_machdep.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/ia64/efi/start.S
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/ic/dwc_eqos.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/mii/bmtphyreg.h
cvs rdiff -u -r1.173 -r1.174 src/sys/fs/udf/udf_subr.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/xlint/lint1

2023-06-03 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Sat Jun  3 20:40:28 UTC 2023

Modified Files:
src/usr.bin/xlint/lint1: debug.c

Log Message:
lint: use consistent and configurable stream for debug output


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/xlint/lint1/debug.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/xlint/lint1/debug.c
diff -u src/usr.bin/xlint/lint1/debug.c:1.31 src/usr.bin/xlint/lint1/debug.c:1.32
--- src/usr.bin/xlint/lint1/debug.c:1.31	Mon May 22 12:55:04 2023
+++ src/usr.bin/xlint/lint1/debug.c	Sat Jun  3 20:40:28 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: debug.c,v 1.31 2023/05/22 12:55:04 rillig Exp $ */
+/* $NetBSD: debug.c,v 1.32 2023/06/03 20:40:28 rillig Exp $ */
 
 /*-
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: debug.c,v 1.31 2023/05/22 12:55:04 rillig Exp $");
+__RCSID("$NetBSD: debug.c,v 1.32 2023/06/03 20:40:28 rillig Exp $");
 #endif
 
 #include 
@@ -49,13 +49,26 @@ __RCSID("$NetBSD: debug.c,v 1.31 2023/05
 static int debug_indentation = 0;
 
 
+static FILE *
+debug_file(void)
+{
+	/*
+	 * Using stdout preserves the order between the debug messages and
+	 * lint's diagnostics.
+	 *
+	 * Using stderr preserves the order between lint's debug messages and
+	 * yacc's debug messages (see the -y option).
+	 */
+	return stdout;
+}
+
 void __printflike(1, 2)
 debug_printf(const char *fmt, ...)
 {
 	va_list va;
 
 	va_start(va, fmt);
-	(void)vfprintf(stdout, fmt, va);
+	(void)vfprintf(debug_file(), fmt, va);
 	va_end(va);
 }
 
@@ -84,7 +97,7 @@ void
 debug_enter_func(const char *func)
 {
 
-	printf("%*s+ %s\n", 2 * debug_indentation++, "", func);
+	fprintf(debug_file(), "%*s+ %s\n", 2 * debug_indentation++, "", func);
 }
 
 void __printflike(1, 2)
@@ -94,16 +107,16 @@ debug_step(const char *fmt, ...)
 
 	debug_print_indent();
 	va_start(va, fmt);
-	(void)vfprintf(stdout, fmt, va);
+	(void)vfprintf(debug_file(), fmt, va);
 	va_end(va);
-	printf("\n");
+	fprintf(debug_file(), "\n");
 }
 
 void
 debug_leave_func(const char *func)
 {
 
-	printf("%*s- %s\n", 2 * --debug_indentation, "", func);
+	fprintf(debug_file(), "%*s- %s\n", 2 * --debug_indentation, "", func);
 }
 
 static void

CVS commit: src/usr.bin/xlint/lint1

2023-06-03 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Sat Jun  3 20:40:28 UTC 2023

Modified Files:
src/usr.bin/xlint/lint1: debug.c

Log Message:
lint: use consistent and configurable stream for debug output


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/xlint/lint1/debug.c

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

CVS commit: src

2023-06-03 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Sat Jun  3 20:28:54 UTC 2023

Modified Files:
src/tests/usr.bin/xlint/lint1: msg_107.c msg_123.c msg_132.c
src/usr.bin/xlint/lint1: tree.c

Log Message:
lint: provide more detailed types when operands do not match


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/msg_107.c
cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/xlint/lint1/msg_123.c
cvs rdiff -u -r1.30 -r1.31 src/tests/usr.bin/xlint/lint1/msg_132.c
cvs rdiff -u -r1.524 -r1.525 src/usr.bin/xlint/lint1/tree.c

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

Modified files:

Index: src/tests/usr.bin/xlint/lint1/msg_107.c
diff -u src/tests/usr.bin/xlint/lint1/msg_107.c:1.4 src/tests/usr.bin/xlint/lint1/msg_107.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_107.c:1.4	Sun Jun 19 12:14:34 2022
+++ src/tests/usr.bin/xlint/lint1/msg_107.c	Sat Jun  3 20:28:54 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg_107.c,v 1.4 2022/06/19 12:14:34 rillig Exp $	*/
+/*	$NetBSD: msg_107.c,v 1.5 2023/06/03 20:28:54 rillig Exp $	*/
 # 3 "msg_107.c"
 
 // Test for message: operands of '%s' have incompatible types '%s' and '%s' [107]
@@ -7,6 +7,6 @@
 void
 compare(double d, void *ptr)
 {
-	/* expect+1: error: operands of '==' have incompatible types 'double' and 'pointer' [107] */
+	/* expect+1: error: operands of '==' have incompatible types 'double' and 'pointer to void' [107] */
 	return d == ptr;
 }

Index: src/tests/usr.bin/xlint/lint1/msg_123.c
diff -u src/tests/usr.bin/xlint/lint1/msg_123.c:1.7 src/tests/usr.bin/xlint/lint1/msg_123.c:1.8
--- src/tests/usr.bin/xlint/lint1/msg_123.c:1.7	Tue Mar 28 14:44:34 2023
+++ src/tests/usr.bin/xlint/lint1/msg_123.c	Sat Jun  3 20:28:54 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg_123.c,v 1.7 2023/03/28 14:44:34 rillig Exp $	*/
+/*	$NetBSD: msg_123.c,v 1.8 2023/06/03 20:28:54 rillig Exp $	*/
 # 3 "msg_123.c"
 
 // Test for message: illegal combination of %s '%s' and %s '%s', op '%s' [123]
@@ -24,13 +24,13 @@ compare(_Bool b, int i, double d, const 
 	ok(d < b);
 	ok(d < i);
 	ok(d < d);
-	/* expect+1: error: operands of '<' have incompatible types 'double' and 'pointer' [107] */
+	/* expect+1: error: operands of '<' have incompatible types 'double' and 'pointer to const char' [107] */
 	bad(d < p);
 	/* expect+1: warning: illegal combination of pointer 'pointer to const char' and integer '_Bool', op '<' [123] */
 	bad(p < b);
 	/* expect+1: warning: illegal combination of pointer 'pointer to const char' and integer 'int', op '<' [123] */
 	bad(p < i);
-	/* expect+1: error: operands of '<' have incompatible types 'pointer' and 'double' [107] */
+	/* expect+1: error: operands of '<' have incompatible types 'pointer to const char' and 'double' [107] */
 	bad(p < d);
 	ok(p < p);
 }

Index: src/tests/usr.bin/xlint/lint1/msg_132.c
diff -u src/tests/usr.bin/xlint/lint1/msg_132.c:1.30 src/tests/usr.bin/xlint/lint1/msg_132.c:1.31
--- src/tests/usr.bin/xlint/lint1/msg_132.c:1.30	Tue May  9 15:51:33 2023
+++ src/tests/usr.bin/xlint/lint1/msg_132.c	Sat Jun  3 20:28:54 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg_132.c,v 1.30 2023/05/09 15:51:33 rillig Exp $	*/
+/*	$NetBSD: msg_132.c,v 1.31 2023/06/03 20:28:54 rillig Exp $	*/
 # 3 "msg_132.c"
 
 // Test for message: conversion from '%s' to '%s' may lose accuracy [132]
@@ -174,7 +174,7 @@ to_bool(long a, long b)
 const char *
 cover_build_plus_minus(const char *arr, double idx)
 {
-	/* expect+3: error: operands of '+' have incompatible types 'pointer' and 'double' [107] */
+	/* expect+3: error: operands of '+' have incompatible types 'pointer to const char' and 'double' [107] */
 	/* expect+2: warning: function 'cover_build_plus_minus' expects to return value [214] */
 	if (idx > 0.0)
 		return arr + idx;

Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.524 src/usr.bin/xlint/lint1/tree.c:1.525
--- src/usr.bin/xlint/lint1/tree.c:1.524	Mon May 22 12:55:04 2023
+++ src/usr.bin/xlint/lint1/tree.c	Sat Jun  3 20:28:54 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: tree.c,v 1.524 2023/05/22 12:55:04 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.525 2023/06/03 20:28:54 rillig Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: tree.c,v 1.524 2023/05/22 12:55:04 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.525 2023/06/03 20:28:54 rillig Exp $");
 #endif
 
 #include 
@@ -2203,7 +2203,7 @@ warn_incompatible_types(op_t op,
 		error(171, type_name(ltp), type_name(rtp));
 	} else if (mp->m_binary) {
 		/* operands of '%s' have incompatible types '%s' and '%s' */
-		error(107, mp->m_name, tspec_name(lt), tspec_name(rt));
+		error(107, mp->m_name, type_name(ltp), type_name(rtp));
 	} else {
 		lint_assert(rt == NO_TSPEC);
 		/* operand of '%s' has invalid type '%s' */

CVS commit: src

2023-06-03 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Sat Jun  3 20:28:54 UTC 2023

Modified Files:
src/tests/usr.bin/xlint/lint1: msg_107.c msg_123.c msg_132.c
src/usr.bin/xlint/lint1: tree.c

Log Message:
lint: provide more detailed types when operands do not match


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/msg_107.c
cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/xlint/lint1/msg_123.c
cvs rdiff -u -r1.30 -r1.31 src/tests/usr.bin/xlint/lint1/msg_132.c
cvs rdiff -u -r1.524 -r1.525 src/usr.bin/xlint/lint1/tree.c

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

CVS commit: src/distrib/sets/lists/xbase

2023-06-03 Thread Andrius Varanavicius

Module Name:src
Committed By:   andvar
Date:   Sat Jun  3 19:57:33 UTC 2023

Modified Files:
src/distrib/sets/lists/xbase: mi

Log Message:
fix typo xbase-obsolet -> xbase-obsolete.


To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/distrib/sets/lists/xbase/mi

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

Modified files:

Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.173 src/distrib/sets/lists/xbase/mi:1.174
--- src/distrib/sets/lists/xbase/mi:1.173	Sat Feb  4 16:34:36 2023
+++ src/distrib/sets/lists/xbase/mi	Sat Jun  3 19:57:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.173 2023/02/04 16:34:36 wiz Exp $
+# $NetBSD: mi,v 1.174 2023/06/03 19:57:33 andvar Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1355,7 +1355,7 @@
 ./usr/X11R7/man/cat1/xfontsel.0xbase-xfontsel-catman	.cat,xorg
 ./usr/X11R7/man/cat1/xfs.0xbase-xfs-catman	.cat,xorg
 ./usr/X11R7/man/cat1/xfsinfo.0xbase-xfsinfo-catman	.cat,xorg
-./usr/X11R7/man/cat1/xfwp.0xbase-obsolet	obsolete
+./usr/X11R7/man/cat1/xfwp.0xbase-obsolete	obsolete
 ./usr/X11R7/man/cat1/xgamma.0xbase-xgamma-catman	.cat,xorg
 ./usr/X11R7/man/cat1/xgc.0xbase-xgc-catman	.cat,xorg
 ./usr/X11R7/man/cat1/xhost.0xbase-xhost-catman	.cat,xorg

CVS commit: src/distrib/sets/lists/xbase

2023-06-03 Thread Andrius Varanavicius

Module Name:src
Committed By:   andvar
Date:   Sat Jun  3 19:57:33 UTC 2023

Modified Files:
src/distrib/sets/lists/xbase: mi

Log Message:
fix typo xbase-obsolet -> xbase-obsolete.


To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/distrib/sets/lists/xbase/mi

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

CVS commit: [netbsd-9] src/doc

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:36:22 UTC 2023

Modified Files:
src/doc [netbsd-9]: CHANGES-9.4

Log Message:
Tickets #1635 - #1641


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.67 -r1.1.2.68 src/doc/CHANGES-9.4

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

Modified files:

Index: src/doc/CHANGES-9.4
diff -u src/doc/CHANGES-9.4:1.1.2.67 src/doc/CHANGES-9.4:1.1.2.68
--- src/doc/CHANGES-9.4:1.1.2.67	Sun May 28 10:23:12 2023
+++ src/doc/CHANGES-9.4	Sat Jun  3 15:36:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.4,v 1.1.2.67 2023/05/28 10:23:12 martin Exp $
+# $NetBSD: CHANGES-9.4,v 1.1.2.68 2023/06/03 15:36:22 martin Exp $
 
 A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4
 release:
@@ -1431,3 +1431,53 @@ external/apache2/mDNSResponder/dist/mDNS
 	PR 57442: mdnsd(8): fix privilege separation.
 	[andvar, ticket #1634]
 
+external/gpl3/gcc/usr.bin/backend/Makefile	1.67
+external/gpl3/gcc/usr.bin/common-target/Makefile 1.12
+external/gpl3/gcc/usr.bin/common/Makefile	1.12
+external/gpl3/gcc/usr.bin/frontend/Makefile	1.15
+external/gpl3/gcc/usr.bin/libcpp/Makefile	1.10
+external/gpl3/gcc/usr.bin/libdecnumber/Makefile	1.9
+
+	PR 57014: gcc: fix build with clang++ HOST_CXX.
+	[lukem, ticket #1635]
+
+sys/lib/libsa/subr_prf.c			1.30
+
+	libsa/printf: do not fetch long va_arg as long long.
+	[rin, ticket #1636]
+
+sys/dev/pci/if_aq.c1.45
+
+	aq(4): if_transmit: invoke softint_schedule(9) with kpreempt disabled.
+	[rin, ticket #1637]
+
+distrib/amiga/stand/loadbsd.uue			1.4
+sys/arch/amiga/stand/loadbsd/Makefile		1.5
+sys/arch/amiga/stand/loadbsd/README		1.6
+sys/arch/amiga/stand/loadbsd/loadbsd.c		1.38
+sys/arch/amiga/stand/loadbsd/startit.s		1.1
+sys/arch/amiga/stand/loadbsd/vmakefile		1.1
+
+	Update loadbsd source and distribution binary to version 3.3.
+	[abs, ticket #1638]
+
+sys/dev/ipmi.c	1.10
+
+	ipmi(4): ignore non-recoverable and critical limits smaller than
+	the warning limits. These are usually invalid.
+	[sborrill, ticket #1639]
+
+bin/date/Makefile   up to 1.16
+bin/date/date.1 up to 1.54
+bin/date/date.c up to 1.65
+
+	date(1): add -R option for displaying time in RFC 5322 format
+	and -f option to set the time.
+	[kim, ticket #1640]
+
+external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c 1.16
+external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c 1.7
+
+	mdnsd(8): restore fixes for PR 46758.
+	[andvar, ticket #1641]
+

CVS commit: [netbsd-9] src/doc

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:36:22 UTC 2023

Modified Files:
src/doc [netbsd-9]: CHANGES-9.4

Log Message:
Tickets #1635 - #1641


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.67 -r1.1.2.68 src/doc/CHANGES-9.4

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

CVS commit: [netbsd-9] src/external/apache2/mDNSResponder/dist

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:34:30 UTC 2023

Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix [netbsd-9]:
PosixDaemon.c
src/external/apache2/mDNSResponder/dist/mDNSShared [netbsd-9]:
PlatformCommon.c

Log Message:
Pull up following revision(s) (requested by andvar in ticket #1641):

external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c: 
revision 1.7
external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c: revision 
1.16

mdnsd(8): restore fixes for PR bin/46758, lost on resolving merge conflicts.

Original commit message from Roy Marples:
"Derive our primary interface and address by trying to connect to an
address in the TEST-NET-2 network as noted in RFC5737 instead of using
the 1.1.1.1 address. Also, use port 7 (echo) for better style.
Fixes PR bin/46758 thanks to Lloyd Parkes."


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.2 -r1.12.4.3 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
cvs rdiff -u -r1.5.4.1 -r1.5.4.2 \
src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c

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

CVS commit: [netbsd-9] src/external/apache2/mDNSResponder/dist

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:34:30 UTC 2023

Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix [netbsd-9]:
PosixDaemon.c
src/external/apache2/mDNSResponder/dist/mDNSShared [netbsd-9]:
PlatformCommon.c

Log Message:
Pull up following revision(s) (requested by andvar in ticket #1641):

external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c: 
revision 1.7
external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c: revision 
1.16

mdnsd(8): restore fixes for PR bin/46758, lost on resolving merge conflicts.

Original commit message from Roy Marples:
"Derive our primary interface and address by trying to connect to an
address in the TEST-NET-2 network as noted in RFC5737 instead of using
the 1.1.1.1 address. Also, use port 7 (echo) for better style.
Fixes PR bin/46758 thanks to Lloyd Parkes."


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.2 -r1.12.4.3 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
cvs rdiff -u -r1.5.4.1 -r1.5.4.2 \
src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.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/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.12.4.2 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.12.4.3
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.12.4.2	Sun May 28 10:21:15 2023
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c	Sat Jun  3 15:34:30 2023
@@ -92,7 +92,7 @@ mDNSlocal void mDNS_StatusCallback(mDNS 
 static void Reconfigure(mDNS *m)
 {
 mDNSAddr DynDNSIP;
-const mDNSAddr dummy = { mDNSAddrType_IPv4, { { { 1, 1, 1, 1 } } } };;
+const mDNSAddr dummy = { mDNSAddrType_IPv4, { { { 198, 51, 100, 42 } } } };;
 mDNS_SetPrimaryInterfaceInfo(m, NULL, NULL, NULL);
 mDNS_Lock(m);
 if (ParseDNSServers(m, uDNS_SERVERS_FILE) < 0)

Index: src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.5.4.1 src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.5.4.2
--- src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.5.4.1	Sun Jul 26 10:44:28 2020
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c	Sat Jun  3 15:34:30 2023
@@ -52,7 +52,7 @@ mDNSexport void mDNSPlatformSourceAddrFo
 addr.a4.sin_len = inner_len;
 #endif
 addr.a4.sin_family  = AF_INET;
-addr.a4.sin_port= 1;// Not important, any port will do
+addr.a4.sin_port= 7;// Not important, any port will do
 addr.a4.sin_addr.s_addr = dst->ip.v4.NotAnInteger;
 }
 else if (dst->type == mDNSAddrType_IPv6)
@@ -63,7 +63,7 @@ mDNSexport void mDNSPlatformSourceAddrFo
 #endif
 addr.a6.sin6_family   = AF_INET6;
 addr.a6.sin6_flowinfo = 0;
-addr.a6.sin6_port = 1;  // Not important, any port will do
+addr.a6.sin6_port = 7;  // Not important, any port will do
 addr.a6.sin6_addr = *(struct in6_addr*)>ip.v6;
 addr.a6.sin6_scope_id = 0;
 }
@@ -71,9 +71,17 @@ mDNSexport void mDNSPlatformSourceAddrFo
 
 if ((connect(sock, , inner_len)) < 0)
 {
-if (errno != EADDRNOTAVAIL)
-	LogMsg("mDNSPlatformSourceAddrForDest: connect %#a failed errno %d (%s)", dst, errno, strerror(errno));
-	goto exit;
+static mDNSv4Addr dummy = { 198, 51, 100, 42 };
+
+// Don't spam if we can't connect to 198.51.100.42 to the console.
+// That is our test address to out which interfaces/address should be primary and is also
+// configured in mDNSPosix/PosixDaemon.c:Reconfigure()
+// Failing to connect to it with EADDRNOTAVAIL is a common situation, especially on boot up.
+if (dst->type == mDNSAddrType_IPv4 && dst->ip.v4.NotAnInteger == dummy.NotAnInteger && errno == EADDRNOTAVAIL)
+LogInfo("mDNSPlatformSourceAddrForDest: connect %#a failed errno %d (%s)", dst, errno, strerror(errno));
+else
+LogMsg("mDNSPlatformSourceAddrForDest: connect %#a failed errno %d (%s)", dst, errno, strerror(errno));
+goto exit;
 }
 
 if ((getsockname(sock, , )) < 0)

CVS commit: [netbsd-10] src/doc

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:33:41 UTC 2023

Modified Files:
src/doc [netbsd-10]: CHANGES-10.0

Log Message:
Tickets #185 - #193


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.67 -r1.1.2.68 src/doc/CHANGES-10.0

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

Modified files:

Index: src/doc/CHANGES-10.0
diff -u src/doc/CHANGES-10.0:1.1.2.67 src/doc/CHANGES-10.0:1.1.2.68
--- src/doc/CHANGES-10.0:1.1.2.67	Tue May 30 07:21:22 2023
+++ src/doc/CHANGES-10.0	Sat Jun  3 15:33:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-10.0,v 1.1.2.67 2023/05/30 07:21:22 martin Exp $
+# $NetBSD: CHANGES-10.0,v 1.1.2.68 2023/06/03 15:33:41 martin Exp $
 
 A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16
 until the 10.0 release:
@@ -1990,3 +1990,59 @@ usr.sbin/bta2dpd/bta2dpd/sbc_encode.c		1
 	bta2dpd(8): fix playback, pad(4) may return partial reads.
 	[nat, ticket #184]
 
+sys/lib/libsa/subr_prf.c			1.30
+
+	libsa/printf: do not fetch long va_arg as long long.
+	[rin, ticket #185]
+
+sys/dev/pci/virtio.c1.75-1.78
+sys/dev/pci/virtio_pci.c			1.41,1.42
+sys/dev/pci/virtiovar.h1.29
+sys/dev/virtio/virtio_mmio.c			1.10
+
+	virtio(4): bug fixes, including PRs 57357 and 57358.
+	[yamaguchi, ticket #186]
+
+sys/dev/pci/if_aq.c1.45
+
+	aq(4): if_transmit: invoke softint_schedule(9) with kpreempt disabled.
+	[rin, ticket #187]
+
+sys/ddb/db_command.c1.182
+
+	ddb(4): PR 57435: fix duplicate "show mount".
+	[uwe, ticket #188]
+
+distrib/amiga/stand/loadbsd.uue			1.4
+sys/arch/amiga/stand/loadbsd/Makefile		1.5
+sys/arch/amiga/stand/loadbsd/README		1.6
+sys/arch/amiga/stand/loadbsd/loadbsd.c		1.38
+sys/arch/amiga/stand/loadbsd/startit.s		1.1
+sys/arch/amiga/stand/loadbsd/vmakefile		1.1
+
+	amiga: update loadbsd source and distribution binary to version 3.3.
+	[abs, ticket #189]
+
+sys/external/bsd/drm2/i915drm/intelfb.c		1.25
+
+	intelfb(4): fix mmap(2) offset calculation.
+	[nat, ticket #190]
+
+sys/dev/ipmi.c	1.10
+
+	ipmi(4): ignore non-recoverable and critical limits smaller than
+	the warning limits. These are usually invalid.
+	[sborrill, ticket #191]
+
+bin/date/date.1	1.52-1.54
+bin/date/date.c	1.64,1.65
+
+	date(1): add -R option for displaying time in RFC 5322 format.
+	[kim, ticket #192]
+
+external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c 1.16
+external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c 1.7
+
+	mdnsd(8): restore fixes for PR 46758.
+	[andvar, ticket #193]
+

CVS commit: [netbsd-10] src/doc

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:33:41 UTC 2023

Modified Files:
src/doc [netbsd-10]: CHANGES-10.0

Log Message:
Tickets #185 - #193


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.67 -r1.1.2.68 src/doc/CHANGES-10.0

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

CVS commit: [netbsd-10] src/external/apache2/mDNSResponder/dist

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:32:01 UTC 2023

Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix [netbsd-10]:
PosixDaemon.c
src/external/apache2/mDNSResponder/dist/mDNSShared [netbsd-10]:
PlatformCommon.c

Log Message:
Pull up following revision(s) (requested by andvar in ticket #193):

external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c: 
revision 1.7
external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c: revision 
1.16

mdnsd(8): restore fixes for PR bin/46758, lost on resolving merge conflicts.

Original commit message from Roy Marples:
"Derive our primary interface and address by trying to connect to an
address in the TEST-NET-2 network as noted in RFC5737 instead of using
the 1.1.1.1 address. Also, use port 7 (echo) for better style.
Fixes PR bin/46758 thanks to Lloyd Parkes."


To generate a diff of this commit:
cvs rdiff -u -r1.14.6.1 -r1.14.6.2 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
cvs rdiff -u -r1.6 -r1.6.6.1 \
src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.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/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.14.6.1 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.14.6.2
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.14.6.1	Sun May 28 10:20:08 2023
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c	Sat Jun  3 15:32:01 2023
@@ -92,7 +92,7 @@ mDNSlocal void mDNS_StatusCallback(mDNS 
 static void Reconfigure(mDNS *m)
 {
 mDNSAddr DynDNSIP;
-const mDNSAddr dummy = { mDNSAddrType_IPv4, { { { 1, 1, 1, 1 } } } };;
+const mDNSAddr dummy = { mDNSAddrType_IPv4, { { { 198, 51, 100, 42 } } } };;
 mDNS_SetPrimaryInterfaceInfo(m, NULL, NULL, NULL);
 mDNS_Lock(m);
 if (ParseDNSServers(m, uDNS_SERVERS_FILE) < 0)

Index: src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.6 src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.6.6.1
--- src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.6	Tue Jul 21 14:04:07 2020
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c	Sat Jun  3 15:32:01 2023
@@ -52,7 +52,7 @@ mDNSexport void mDNSPlatformSourceAddrFo
 addr.a4.sin_len = inner_len;
 #endif
 addr.a4.sin_family  = AF_INET;
-addr.a4.sin_port= 1;// Not important, any port will do
+addr.a4.sin_port= 7;// Not important, any port will do
 addr.a4.sin_addr.s_addr = dst->ip.v4.NotAnInteger;
 }
 else if (dst->type == mDNSAddrType_IPv6)
@@ -63,7 +63,7 @@ mDNSexport void mDNSPlatformSourceAddrFo
 #endif
 addr.a6.sin6_family   = AF_INET6;
 addr.a6.sin6_flowinfo = 0;
-addr.a6.sin6_port = 1;  // Not important, any port will do
+addr.a6.sin6_port = 7;  // Not important, any port will do
 addr.a6.sin6_addr = *(struct in6_addr*)>ip.v6;
 addr.a6.sin6_scope_id = 0;
 }
@@ -71,9 +71,17 @@ mDNSexport void mDNSPlatformSourceAddrFo
 
 if ((connect(sock, , inner_len)) < 0)
 {
-if (errno != EADDRNOTAVAIL)
-	LogMsg("mDNSPlatformSourceAddrForDest: connect %#a failed errno %d (%s)", dst, errno, strerror(errno));
-	goto exit;
+static mDNSv4Addr dummy = { 198, 51, 100, 42 };
+
+// Don't spam if we can't connect to 198.51.100.42 to the console.
+// That is our test address to out which interfaces/address should be primary and is also
+// configured in mDNSPosix/PosixDaemon.c:Reconfigure()
+// Failing to connect to it with EADDRNOTAVAIL is a common situation, especially on boot up.
+if (dst->type == mDNSAddrType_IPv4 && dst->ip.v4.NotAnInteger == dummy.NotAnInteger && errno == EADDRNOTAVAIL)
+LogInfo("mDNSPlatformSourceAddrForDest: connect %#a failed errno %d (%s)", dst, errno, strerror(errno));
+else
+LogMsg("mDNSPlatformSourceAddrForDest: connect %#a failed errno %d (%s)", dst, errno, strerror(errno));
+goto exit;
 }
 
 if ((getsockname(sock, , )) < 0)

CVS commit: [netbsd-10] src/external/apache2/mDNSResponder/dist

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:32:01 UTC 2023

Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix [netbsd-10]:
PosixDaemon.c
src/external/apache2/mDNSResponder/dist/mDNSShared [netbsd-10]:
PlatformCommon.c

Log Message:
Pull up following revision(s) (requested by andvar in ticket #193):

external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c: 
revision 1.7
external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c: revision 
1.16

mdnsd(8): restore fixes for PR bin/46758, lost on resolving merge conflicts.

Original commit message from Roy Marples:
"Derive our primary interface and address by trying to connect to an
address in the TEST-NET-2 network as noted in RFC5737 instead of using
the 1.1.1.1 address. Also, use port 7 (echo) for better style.
Fixes PR bin/46758 thanks to Lloyd Parkes."


To generate a diff of this commit:
cvs rdiff -u -r1.14.6.1 -r1.14.6.2 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
cvs rdiff -u -r1.6 -r1.6.6.1 \
src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c

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

CVS commit: [netbsd-9] src/bin/date

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:27:13 UTC 2023

Modified Files:
src/bin/date [netbsd-9]: Makefile date.1 date.c

Log Message:
Pull up the following revisions, requested by kim in ticket #1640:

bin/date/Makefile   up to 1.16
bin/date/date.1 up to 1.54
bin/date/date.c up to 1.65

Add -R option for displaying time in RFC 5322 format, similar to GNU date.
Add -f option to set the time. From FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.46.1 src/bin/date/Makefile
cvs rdiff -u -r1.47 -r1.47.6.1 src/bin/date/date.1
cvs rdiff -u -r1.61 -r1.61.18.1 src/bin/date/date.c

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

Modified files:

Index: src/bin/date/Makefile
diff -u src/bin/date/Makefile:1.15 src/bin/date/Makefile:1.15.46.1
--- src/bin/date/Makefile:1.15	Sun Aug 14 10:53:16 2011
+++ src/bin/date/Makefile	Sat Jun  3 15:27:13 2023
@@ -1,10 +1,15 @@
-#	$NetBSD: Makefile,v 1.15 2011/08/14 10:53:16 christos Exp $
+#	$NetBSD: Makefile,v 1.15.46.1 2023/06/03 15:27:13 martin Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
+.include 
+
 PROG=	date
-SRCS=	date.c netdate.c
+SRCS=	date.c
+.if !defined(HOSTPROG)
+SRCS+=	netdate.c
 DPADD+=	${LIBUTIL}
 LDADD+=	-lutil
+.endif
 CPPFLAGS+=-I${.CURDIR}
 
 COPTS.date.c = -Wno-format-nonliteral

Index: src/bin/date/date.1
diff -u src/bin/date/date.1:1.47 src/bin/date/date.1:1.47.6.1
--- src/bin/date/date.1:1.47	Sat Jan 27 18:59:38 2018
+++ src/bin/date/date.1	Sat Jun  3 15:27:13 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: date.1,v 1.47 2018/01/27 18:59:38 wiz Exp $
+.\"	$NetBSD: date.1,v 1.47.6.1 2023/06/03 15:27:13 martin Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" @(#)date.1	8.3 (Berkeley) 4/28/95
 .\"
-.Dd January 25, 2018
+.Dd May 31, 2023
 .Dt DATE 1
 .Os
 .Sh NAME
@@ -40,19 +40,27 @@
 .Nd display or set date and time
 .Sh SYNOPSIS
 .Nm
-.Op Fl ajnu
+.Op Fl ajnRu
 .Op Fl d Ar date
 .Op Fl r Ar seconds
 .Op Cm + Ns Ar format
 .Sm off
-.Oo Oo Oo Oo Oo Oo
+.Oo
+.Oo Oo Oo Oo Oo
 .Ar CC Oc
 .Ar yy Oc
 .Ar mm Oc
 .Ar dd Oc
-.Ar HH Oc Ar MM Oo
-.Li \&. Ar SS Oc Oc
+.Ar HH Oc
+.Ar MM
+.Op Cm \&. Ar SS
+.Oc
 .Sm on
+.Nm
+.Op Fl ajnRu
+.Fl f Ar input_format
+.Ar new_date
+.Op Cm + Ns Ar format
 .Sh DESCRIPTION
 .Nm
 displays the current date and time when invoked without arguments.
@@ -61,7 +69,7 @@ way or set the date.
 Only the superuser may set the date.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width Fl
 .It Fl a
 Use
 .Xr adjtime 2
@@ -76,6 +84,25 @@ actually changing the system clock.
 (See
 .Xr parsedate 3
 for examples.)
+.It Fl f Ar input_fmt
+Use
+.Ar input_fmt
+as the format string to parse the
+.Ar new_date
+provided rather than using the default
+.Sm off
+.Oo Oo Oo Oo Oo
+.Ar CC Oc
+.Ar yy Oc
+.Ar mm Oc
+.Ar dd Oc
+.Ar HH Oc
+.Ar MM
+.Op Cm \&. Ar SS
+.Sm on
+format.
+Parsing is done using
+.Xr strptime 3 .
 .It Fl j
 Parse the provided canonical representation of date and time (described below)
 and display the result without actually changing the system clock.
@@ -93,6 +120,9 @@ The
 option stops
 .Nm
 from setting the time for other than the current machine.
+.It Fl R
+Use a default display format that conforms to the date and time
+specification in RFC 5322 (Internet Message Format).
 .It Fl r Ar seconds
 Print out the date and time that is
 .Ar seconds
@@ -109,12 +139,13 @@ The format string may contain any of the
 in the
 .Xr strftime 3
 manual page, as well as any arbitrary text.
-A  character is always output after the characters
+A
+.Aq newline
+character is always output after the characters
 specified by the format string.
 The format string for the default display is:
-.Bd -literal -offset indent
-%a %b %e %H:%M:%S %Z %Y
-.Ed
+.Pp
+.Dl %a %b %e %H:%M:%S %Z %Y
 .Pp
 If an operand does not have a leading plus sign, it is interpreted as
 a value for setting the system's notion of the current date and time.
@@ -156,7 +187,7 @@ and years are handled automatically.
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
 .Nm :
-.Bl -tag -width iTZ
+.Bl -tag -width Ev
 .It Ev TZ
 The timezone to use when displaying dates.
 See
@@ -164,13 +195,14 @@ See
 for more information.
 .El
 .Sh FILES
-.Bl -tag -width /usr/share/zoneinfo/posixrules -compact
+.Bl -tag -width Pa -compact
 .It Pa /etc/localtime
 Symlink pointing to system's default timezone information file in
 .Pa /usr/share/zoneinfo
 directory.
-.It Pa /usr/lib/locale//LC_TIME
-Description of time locale .
+.It Pa /usr/lib/locale/ Ns Ao Ar L Ac Ns Pa /LC_TIME
+Description of time locale
+.Aq Ar L .
 .It Pa /usr/share/zoneinfo
 Time zone information directory.
 .It Pa /usr/share/zoneinfo/posixrules
@@ -189,9 +221,8 @@ is

CVS commit: [netbsd-9] src/bin/date

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:27:13 UTC 2023

Modified Files:
src/bin/date [netbsd-9]: Makefile date.1 date.c

Log Message:
Pull up the following revisions, requested by kim in ticket #1640:

bin/date/Makefile   up to 1.16
bin/date/date.1 up to 1.54
bin/date/date.c up to 1.65

Add -R option for displaying time in RFC 5322 format, similar to GNU date.
Add -f option to set the time. From FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.46.1 src/bin/date/Makefile
cvs rdiff -u -r1.47 -r1.47.6.1 src/bin/date/date.1
cvs rdiff -u -r1.61 -r1.61.18.1 src/bin/date/date.c

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

CVS commit: [netbsd-10] src/bin/date

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:23:42 UTC 2023

Modified Files:
src/bin/date [netbsd-10]: date.1 date.c

Log Message:
Pull up following revision(s) (requested by kim in ticket #192):

bin/date/date.1: revision 1.52
bin/date/date.1: revision 1.53
bin/date/date.1: revision 1.54
bin/date/date.c: revision 1.64
bin/date/date.c: revision 1.65

Add -R option for displaying time in RFC 5322 format, similar to GNU date.

date(1): minor markup fixes

Add -R to usage

date(1): sync two [CC]yy]mm]dd]HH]MM[.SS] instances
The markup was the same (modulo Li vs Cm for the dot before the
seconds), but use the same source markup grouping/layout in both to
make this fact more obvious.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.51.2.1 src/bin/date/date.1
cvs rdiff -u -r1.63 -r1.63.2.1 src/bin/date/date.c

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

Modified files:

Index: src/bin/date/date.1
diff -u src/bin/date/date.1:1.51 src/bin/date/date.1:1.51.2.1
--- src/bin/date/date.1:1.51	Sat Oct 22 20:11:43 2022
+++ src/bin/date/date.1	Sat Jun  3 15:23:42 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: date.1,v 1.51 2022/10/22 20:11:43 christos Exp $
+.\"	$NetBSD: date.1,v 1.51.2.1 2023/06/03 15:23:42 martin Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" @(#)date.1	8.3 (Berkeley) 4/28/95
 .\"
-.Dd October 22, 2022
+.Dd May 31, 2023
 .Dt DATE 1
 .Os
 .Sh NAME
@@ -40,23 +40,26 @@
 .Nd display or set date and time
 .Sh SYNOPSIS
 .Nm
-.Op Fl ajnu
+.Op Fl ajnRu
 .Op Fl d Ar date
 .Op Fl r Ar seconds
 .Op Cm + Ns Ar format
 .Sm off
-.Oo Oo Oo Oo Oo Oo
+.Oo
+.Oo Oo Oo Oo Oo
 .Ar CC Oc
 .Ar yy Oc
 .Ar mm Oc
 .Ar dd Oc
-.Ar HH Oc Ar MM Oo
-.Li \&. Ar SS Oc Oc
+.Ar HH Oc
+.Ar MM
+.Op Cm \&. Ar SS
+.Oc
 .Sm on
 .Nm
-.Op Fl ajnu
+.Op Fl ajnRu
 .Fl f Ar input_format
-new_date
+.Ar new_date
 .Op Cm + Ns Ar format
 .Sh DESCRIPTION
 .Nm
@@ -66,7 +69,7 @@ way or set the date.
 Only the superuser may set the date.
 .Pp
 The options are as follows:
-.Bl -tag -width 12n
+.Bl -tag -width Fl
 .It Fl a
 Use
 .Xr adjtime 2
@@ -89,12 +92,13 @@ as the format string to parse the
 provided rather than using the default
 .Sm off
 .Oo Oo Oo Oo Oo
-.Ar cc Oc
+.Ar CC Oc
 .Ar yy Oc
 .Ar mm Oc
 .Ar dd Oc
-.Ar HH
-.Oc Ar MM Op Cm \&. Ar SS
+.Ar HH Oc
+.Ar MM
+.Op Cm \&. Ar SS
 .Sm on
 format.
 Parsing is done using
@@ -116,6 +120,9 @@ The
 option stops
 .Nm
 from setting the time for other than the current machine.
+.It Fl R
+Use a default display format that conforms to the date and time
+specification in RFC 5322 (Internet Message Format).
 .It Fl r Ar seconds
 Print out the date and time that is
 .Ar seconds
@@ -132,7 +139,9 @@ The format string may contain any of the
 in the
 .Xr strftime 3
 manual page, as well as any arbitrary text.
-A  character is always output after the characters
+A
+.Aq newline
+character is always output after the characters
 specified by the format string.
 The format string for the default display is:
 .Pp
@@ -178,7 +187,7 @@ and years are handled automatically.
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
 .Nm :
-.Bl -tag -width iTZ
+.Bl -tag -width Ev
 .It Ev TZ
 The timezone to use when displaying dates.
 See
@@ -186,13 +195,14 @@ See
 for more information.
 .El
 .Sh FILES
-.Bl -tag -width /usr/share/zoneinfo/posixrules -compact
+.Bl -tag -width Pa -compact
 .It Pa /etc/localtime
 Symlink pointing to system's default timezone information file in
 .Pa /usr/share/zoneinfo
 directory.
-.It Pa /usr/lib/locale//LC_TIME
-Description of time locale .
+.It Pa /usr/lib/locale/ Ns Ao Ar L Ac Ns Pa /LC_TIME
+Description of time locale
+.Aq Ar L .
 .It Pa /usr/share/zoneinfo
 Time zone information directory.
 .It Pa /usr/share/zoneinfo/posixrules

Index: src/bin/date/date.c
diff -u src/bin/date/date.c:1.63 src/bin/date/date.c:1.63.2.1
--- src/bin/date/date.c:1.63	Sat Oct 22 20:11:43 2022
+++ src/bin/date/date.c	Sat Jun  3 15:23:42 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: date.c,v 1.63 2022/10/22 20:11:43 christos Exp $ */
+/* $NetBSD: date.c,v 1.63.2.1 2023/06/03 15:23:42 martin Exp $ */
 
 /*
  * Copyright (c) 1985, 1987, 1988, 1993
@@ -44,7 +44,7 @@ __COPYRIGHT(
 #if 0
 static char sccsid[] = "@(#)date.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: date.c,v 1.63 2022/10/22 20:11:43 christos Exp $");
+__RCSID("$NetBSD: date.c,v 1.63.2.1 2023/06/03 15:23:42 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -71,7 +71,7 @@ __RCSID("$NetBSD: date.c,v 1.63 2022/10/
 #include "extern.h"
 
 static time_t tval;
-static int aflag, jflag, rflag, nflag;
+static int Rflag, aflag, jflag, rflag, nflag;
 static char *fmt;
 
 __dead static void badcanotime(const char *, const char *, size_t);
@@ -91,7 +91,7 @@ main(int argc, char *argv[])

CVS commit: [netbsd-10] src/bin/date

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:23:42 UTC 2023

Modified Files:
src/bin/date [netbsd-10]: date.1 date.c

Log Message:
Pull up following revision(s) (requested by kim in ticket #192):

bin/date/date.1: revision 1.52
bin/date/date.1: revision 1.53
bin/date/date.1: revision 1.54
bin/date/date.c: revision 1.64
bin/date/date.c: revision 1.65

Add -R option for displaying time in RFC 5322 format, similar to GNU date.

date(1): minor markup fixes

Add -R to usage

date(1): sync two [CC]yy]mm]dd]HH]MM[.SS] instances
The markup was the same (modulo Li vs Cm for the dot before the
seconds), but use the same source markup grouping/layout in both to
make this fact more obvious.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.51.2.1 src/bin/date/date.1
cvs rdiff -u -r1.63 -r1.63.2.1 src/bin/date/date.c

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

CVS commit: [netbsd-9] src/sys/dev

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:17:31 UTC 2023

Modified Files:
src/sys/dev [netbsd-9]: ipmi.c

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1639):

sys/dev/ipmi.c: revision 1.10

Ignore non-recoverable and critical limits smaller than the warning limits.
These are usually invalid.

Name the limit flags to make code more readable.


To generate a diff of this commit:
cvs rdiff -u -r1.4.4.2 -r1.4.4.3 src/sys/dev/ipmi.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/ipmi.c
diff -u src/sys/dev/ipmi.c:1.4.4.2 src/sys/dev/ipmi.c:1.4.4.3
--- src/sys/dev/ipmi.c:1.4.4.2	Wed Dec  8 15:50:13 2021
+++ src/sys/dev/ipmi.c	Sat Jun  3 15:17:31 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipmi.c,v 1.4.4.2 2021/12/08 15:50:13 martin Exp $ */
+/*	$NetBSD: ipmi.c,v 1.4.4.3 2023/06/03 15:17:31 martin Exp $ */
 
 /*
  * Copyright (c) 2019 Michael van Elst
@@ -76,7 +76,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.4.4.2 2021/12/08 15:50:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.4.4.3 2023/06/03 15:17:31 martin Exp $");
 
 #include 
 #include 
@@ -1533,6 +1533,14 @@ ipmi_get_limits(struct sysmon_envsys *sm
 	return;
 }
 
+/* valid bits for (upper,lower) x (non-recoverable, critical, warn) */
+#define UN	0x20
+#define UC	0x10
+#define UW	0x08
+#define LN	0x04
+#define LC	0x02
+#define LW	0x01
+
 static void
 ipmi_get_sensor_limits(struct ipmi_softc *sc, struct ipmi_sensor *psensor,
 		   sysmon_envsys_lim_t *limits, uint32_t *props)
@@ -1540,7 +1548,7 @@ ipmi_get_sensor_limits(struct ipmi_softc
 	struct sdrtype1	*s1 = (struct sdrtype1 *)psensor->i_sdr;
 	bool failure;
 	int	rxlen;
-	uint8_t	data[32];
+	uint8_t	data[32], valid;
 	uint32_t prop_critmax, prop_warnmax, prop_critmin, prop_warnmin;
 	int32_t *pcritmax, *pwarnmax, *pcritmin, *pwarnmin;
 
@@ -1582,27 +1590,43 @@ ipmi_get_sensor_limits(struct ipmi_softc
 		break;
 	}
 
-	if (data[0] & 0x20 && data[6] != 0xff) {
+	valid = data[0];
+
+	/* if upper non-recoverable < warning, ignore it */
+	if ((valid & (UN|UW)) == (UN|UW) && data[6] < data[4])
+		valid ^= UN;
+	/* if upper critical < warning, ignore it */
+	if ((valid & (UC|UW)) == (UC|UW) && data[5] < data[4])
+		valid ^= UC;
+
+	/* if lower non-recoverable > warning, ignore it */
+	if ((data[0] & (LN|LW)) == (LN|LW) && data[3] > data[1])
+		valid ^= LN;
+	/* if lower critical > warning, ignore it */
+	if ((data[0] & (LC|LW)) == (LC|LW) && data[2] > data[1])
+		valid ^= LC;
+
+	if (valid & UN && data[6] != 0xff) {
 		*pcritmax = ipmi_convert_sensor([6], psensor);
 		*props |= prop_critmax;
 	}
-	if (data[0] & 0x10 && data[5] != 0xff) {
+	if (valid & UC && data[5] != 0xff) {
 		*pcritmax = ipmi_convert_sensor([5], psensor);
 		*props |= prop_critmax;
 	}
-	if (data[0] & 0x08 && data[4] != 0xff) {
+	if (valid & UW && data[4] != 0xff) {
 		*pwarnmax = ipmi_convert_sensor([4], psensor);
 		*props |= prop_warnmax;
 	}
-	if (data[0] & 0x04 && data[3] != 0x00) {
+	if (valid & LN && data[3] != 0x00) {
 		*pcritmin = ipmi_convert_sensor([3], psensor);
 		*props |= prop_critmin;
 	}
-	if (data[0] & 0x02 && data[2] != 0x00) {
+	if (valid & LC && data[2] != 0x00) {
 		*pcritmin = ipmi_convert_sensor([2], psensor);
 		*props |= prop_critmin;
 	}
-	if (data[0] & 0x01 && data[1] != 0x00) {
+	if (valid & LW && data[1] != 0x00) {
 		*pwarnmin = ipmi_convert_sensor([1], psensor);
 		*props |= prop_warnmin;
 	}

CVS commit: [netbsd-9] src/sys/dev

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:17:31 UTC 2023

Modified Files:
src/sys/dev [netbsd-9]: ipmi.c

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1639):

sys/dev/ipmi.c: revision 1.10

Ignore non-recoverable and critical limits smaller than the warning limits.
These are usually invalid.

Name the limit flags to make code more readable.


To generate a diff of this commit:
cvs rdiff -u -r1.4.4.2 -r1.4.4.3 src/sys/dev/ipmi.c

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

CVS commit: [netbsd-10] src/sys/dev

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:16:08 UTC 2023

Modified Files:
src/sys/dev [netbsd-10]: ipmi.c

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #191):

sys/dev/ipmi.c: revision 1.10

Ignore non-recoverable and critical limits smaller than the warning limits.
These are usually invalid.

Name the limit flags to make code more readable.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.10.1 src/sys/dev/ipmi.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/ipmi.c
diff -u src/sys/dev/ipmi.c:1.9 src/sys/dev/ipmi.c:1.9.10.1
--- src/sys/dev/ipmi.c:1.9	Tue Jun 15 00:20:33 2021
+++ src/sys/dev/ipmi.c	Sat Jun  3 15:16:08 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipmi.c,v 1.9 2021/06/15 00:20:33 riastradh Exp $ */
+/*	$NetBSD: ipmi.c,v 1.9.10.1 2023/06/03 15:16:08 martin Exp $ */
 
 /*
  * Copyright (c) 2019 Michael van Elst
@@ -76,7 +76,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.9 2021/06/15 00:20:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.9.10.1 2023/06/03 15:16:08 martin Exp $");
 
 #include 
 #include 
@@ -1533,6 +1533,14 @@ ipmi_get_limits(struct sysmon_envsys *sm
 	return;
 }
 
+/* valid bits for (upper,lower) x (non-recoverable, critical, warn) */
+#define UN	0x20
+#define UC	0x10
+#define UW	0x08
+#define LN	0x04
+#define LC	0x02
+#define LW	0x01
+
 static void
 ipmi_get_sensor_limits(struct ipmi_softc *sc, struct ipmi_sensor *psensor,
 		   sysmon_envsys_lim_t *limits, uint32_t *props)
@@ -1540,7 +1548,7 @@ ipmi_get_sensor_limits(struct ipmi_softc
 	struct sdrtype1	*s1 = (struct sdrtype1 *)psensor->i_sdr;
 	bool failure;
 	int	rxlen;
-	uint8_t	data[32];
+	uint8_t	data[32], valid;
 	uint32_t prop_critmax, prop_warnmax, prop_critmin, prop_warnmin;
 	int32_t *pcritmax, *pwarnmax, *pcritmin, *pwarnmin;
 
@@ -1582,27 +1590,43 @@ ipmi_get_sensor_limits(struct ipmi_softc
 		break;
 	}
 
-	if (data[0] & 0x20 && data[6] != 0xff) {
+	valid = data[0];
+
+	/* if upper non-recoverable < warning, ignore it */
+	if ((valid & (UN|UW)) == (UN|UW) && data[6] < data[4])
+		valid ^= UN;
+	/* if upper critical < warning, ignore it */
+	if ((valid & (UC|UW)) == (UC|UW) && data[5] < data[4])
+		valid ^= UC;
+
+	/* if lower non-recoverable > warning, ignore it */
+	if ((data[0] & (LN|LW)) == (LN|LW) && data[3] > data[1])
+		valid ^= LN;
+	/* if lower critical > warning, ignore it */
+	if ((data[0] & (LC|LW)) == (LC|LW) && data[2] > data[1])
+		valid ^= LC;
+
+	if (valid & UN && data[6] != 0xff) {
 		*pcritmax = ipmi_convert_sensor([6], psensor);
 		*props |= prop_critmax;
 	}
-	if (data[0] & 0x10 && data[5] != 0xff) {
+	if (valid & UC && data[5] != 0xff) {
 		*pcritmax = ipmi_convert_sensor([5], psensor);
 		*props |= prop_critmax;
 	}
-	if (data[0] & 0x08 && data[4] != 0xff) {
+	if (valid & UW && data[4] != 0xff) {
 		*pwarnmax = ipmi_convert_sensor([4], psensor);
 		*props |= prop_warnmax;
 	}
-	if (data[0] & 0x04 && data[3] != 0x00) {
+	if (valid & LN && data[3] != 0x00) {
 		*pcritmin = ipmi_convert_sensor([3], psensor);
 		*props |= prop_critmin;
 	}
-	if (data[0] & 0x02 && data[2] != 0x00) {
+	if (valid & LC && data[2] != 0x00) {
 		*pcritmin = ipmi_convert_sensor([2], psensor);
 		*props |= prop_critmin;
 	}
-	if (data[0] & 0x01 && data[1] != 0x00) {
+	if (valid & LW && data[1] != 0x00) {
 		*pwarnmin = ipmi_convert_sensor([1], psensor);
 		*props |= prop_warnmin;
 	}

CVS commit: [netbsd-10] src/sys/dev

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:16:08 UTC 2023

Modified Files:
src/sys/dev [netbsd-10]: ipmi.c

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #191):

sys/dev/ipmi.c: revision 1.10

Ignore non-recoverable and critical limits smaller than the warning limits.
These are usually invalid.

Name the limit flags to make code more readable.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.10.1 src/sys/dev/ipmi.c

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

CVS commit: [netbsd-10] src/sys/external/bsd/drm2/i915drm

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:13:48 UTC 2023

Modified Files:
src/sys/external/bsd/drm2/i915drm [netbsd-10]: intelfb.c

Log Message:
Pull up following revision(s) (requested by nat in ticket #190):

sys/external/bsd/drm2/i915drm/intelfb.c: revision 1.25

Use the offset in mmap calculations.
It fixes wsfb(4) when used with intelfb(4).

Ok riastradh@


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.4.1 src/sys/external/bsd/drm2/i915drm/intelfb.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/drm2/i915drm/intelfb.c
diff -u src/sys/external/bsd/drm2/i915drm/intelfb.c:1.24 src/sys/external/bsd/drm2/i915drm/intelfb.c:1.24.4.1
--- src/sys/external/bsd/drm2/i915drm/intelfb.c:1.24	Mon Jul 18 23:34:02 2022
+++ src/sys/external/bsd/drm2/i915drm/intelfb.c	Sat Jun  3 15:13:48 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: intelfb.c,v 1.24 2022/07/18 23:34:02 riastradh Exp $	*/
+/*	$NetBSD: intelfb.c,v 1.24.4.1 2023/06/03 15:13:48 martin Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.24 2022/07/18 23:34:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.24.4.1 2023/06/03 15:13:48 martin Exp $");
 
 #include 
 #include 
@@ -181,8 +181,8 @@ intelfb_drmfb_mmapfb(struct drmfb_softc 
 	KASSERT(0 <= offset);
 	KASSERT(offset < vma->node.size);
 
-	return bus_space_mmap(dev->bst, ggtt->gmadr.start, vma->node.start,
-	prot, BUS_SPACE_MAP_PREFETCHABLE);
+	return bus_space_mmap(dev->bst, ggtt->gmadr.start,
+	vma->node.start + offset, prot, BUS_SPACE_MAP_PREFETCHABLE);
 }
 
 static void

CVS commit: [netbsd-10] src/sys/external/bsd/drm2/i915drm

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:13:48 UTC 2023

Modified Files:
src/sys/external/bsd/drm2/i915drm [netbsd-10]: intelfb.c

Log Message:
Pull up following revision(s) (requested by nat in ticket #190):

sys/external/bsd/drm2/i915drm/intelfb.c: revision 1.25

Use the offset in mmap calculations.
It fixes wsfb(4) when used with intelfb(4).

Ok riastradh@


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.4.1 src/sys/external/bsd/drm2/i915drm/intelfb.c

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

CVS commit: [netbsd-8] src/doc

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:10:56 UTC 2023

Modified Files:
src/doc [netbsd-8]: CHANGES-8.3

Log Message:
Ticket #1823


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.174 -r1.1.2.175 src/doc/CHANGES-8.3

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

Modified files:

Index: src/doc/CHANGES-8.3
diff -u src/doc/CHANGES-8.3:1.1.2.174 src/doc/CHANGES-8.3:1.1.2.175
--- src/doc/CHANGES-8.3:1.1.2.174	Tue May  2 17:27:31 2023
+++ src/doc/CHANGES-8.3	Sat Jun  3 15:10:56 2023
@@ -1,4 +1,4 @@
- $NetBSD: CHANGES-8.3,v 1.1.2.174 2023/05/02 17:27:31 martin Exp $
+ $NetBSD: CHANGES-8.3,v 1.1.2.175 2023/06/03 15:10:56 martin Exp $
 
 A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3
 release:
@@ -3313,3 +3313,13 @@ lib/libc/locale/newlocale.c			1.4
 	newlocale(3): fix parsing a locale string with multiple components.
 	[mlelstv, ticket #1822]
 
+distrib/amiga/stand/loadbsd.uue			1.4
+sys/arch/amiga/stand/loadbsd/Makefile		1.5
+sys/arch/amiga/stand/loadbsd/README		1.6
+sys/arch/amiga/stand/loadbsd/loadbsd.c		1.38
+sys/arch/amiga/stand/loadbsd/startit.s		1.1
+sys/arch/amiga/stand/loadbsd/vmakefile		1.1
+
+	Update loadbsd source and distribution binary to version 3.3.
+	[abs, ticket #1823]
+

CVS commit: [netbsd-8] src/doc

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:10:56 UTC 2023

Modified Files:
src/doc [netbsd-8]: CHANGES-8.3

Log Message:
Ticket #1823


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.174 -r1.1.2.175 src/doc/CHANGES-8.3

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

CVS commit: [netbsd-8] src

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:09:01 UTC 2023

Modified Files:
src/distrib/amiga/stand [netbsd-8]: loadbsd.uue
src/sys/arch/amiga/stand/loadbsd [netbsd-8]: Makefile README loadbsd.c
Added Files:
src/sys/arch/amiga/stand/loadbsd [netbsd-8]: startit.s vmakefile

Log Message:
Pull up following revision(s) (requested by abs in ticket #1823):

sys/arch/amiga/stand/loadbsd/loadbsd.c: revision 1.38
distrib/amiga/stand/loadbsd.uue: revision 1.4
sys/arch/amiga/stand/loadbsd/startit.s: revision 1.1
sys/arch/amiga/stand/loadbsd/Makefile: revision 1.5
sys/arch/amiga/stand/loadbsd/vmakefile: revision 1.1
sys/arch/amiga/stand/loadbsd/README: revision 1.6

Update loadbsd source and distribution binary to version 3.3.
- Loading the kernel to the highest priority memory segment is default now.
- New option -l to revert the to the previous behaviour of largest segment.
- New option -M to define a minimum size for the memory segment.
- Fixed some warnings and typos.
- Put assembler inline source into its own source text startit.s.
- Can be built with Bebbo's gcc6 Amiga port or with vbcc.


To generate a diff of this commit:
cvs rdiff -u -r1.2.8.1 -r1.2.8.2 src/distrib/amiga/stand/loadbsd.uue
cvs rdiff -u -r1.3.10.1 -r1.3.10.2 src/sys/arch/amiga/stand/loadbsd/Makefile \
src/sys/arch/amiga/stand/loadbsd/README
cvs rdiff -u -r1.35.46.1 -r1.35.46.2 \
src/sys/arch/amiga/stand/loadbsd/loadbsd.c
cvs rdiff -u -r0 -r1.1.6.2 src/sys/arch/amiga/stand/loadbsd/startit.s \
src/sys/arch/amiga/stand/loadbsd/vmakefile

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

Modified files:

Index: src/distrib/amiga/stand/loadbsd.uue
diff -u src/distrib/amiga/stand/loadbsd.uue:1.2.8.1 src/distrib/amiga/stand/loadbsd.uue:1.2.8.2
--- src/distrib/amiga/stand/loadbsd.uue:1.2.8.1	Fri Feb 24 13:57:19 2023
+++ src/distrib/amiga/stand/loadbsd.uue	Sat Jun  3 15:09:01 2023
@@ -1,611 +1,614 @@
 begin 755 loadbsd
-M```#\P`#``(``!22ZP``/I```4DB/(
+M```#\P`#``(``!0```&!.KO\N(GD$(`EG"BQY
-M8$ZN_F(B>0@@"6<*+'D```!@3J[^8BQ?3G5G0!E>'!A;G-I;VXN;0!C86XG="!O<&5N(&5X<&%NF4])3`X;'@@871TF4Z("5L9`H`9F%I;&5D(&%L;&]C("5D`'5N86)L92!T
-M;R!L;V%D(2!N
-M97=E`H`
-M2V5R;F5L(&%T("4P.+"!&87-T;65M('5S960@870@)3`X;'@*`$-A;B=T
-M(&-O<'D@=7!W87)D6]U2!A9V%I;B!/4B!T2!T:&4@+5H@;W!T:6]N
-M"!T;R!&87-T;65M("4P.("HJ
-M*@H`2V5R;F5L('-I>F4@)6QD(&5X8V5E9',@0VAI<"!-96UO``43KH39BQY8$*`0_K[Q4ZN_=@CP`1T
-M`DJ`9@``D$AZ^\%@U#!\_[_1P'`UL(AEJ#`[B@9.^P`"`;;_H`'T`9;_H/^@
-M_Z#_H`(`_Z#_H/^@_Z#_H/^@_Z#_H/^@`8K_H/^@`6K_H/^@_Z`"'/^@_Z#_
-MH/^@_Z#_H`$2`1H!GO^@_Z#_H/^@`BC_H/^@`_H`$Z`<+_H`$B`5K_H`%6
-M`2[_H`%B<`$CP6Q(>OMT+PHO`TZY```GYD_O``QZ_[J`9@#_8"(Y
-M="`!Y8G5P9:`<`@V8`_OXJ$D*#+@,L>01R_R`!($-.KO^X)@!F``%N
-M3KH(N$AM_^!(;?_<2_Y$ZZ!8).N@I"*T/_Z$_O``Q*N0```6AF``%*(#P`
-M``\`+P!'[?_H+PLO!4ZY```9ND_O``Q2@&8``31(>OKV8`#^L'#]Q(!@`/]<
-M<`&$@&``_U1P`2/`E&``_TAP`2/`F&``_SPO.0```8!.N0``,3CA
-MB.6((\!X6(]@`/\@<`)@P@C"`!!@`/\4",(`$6``_PQ(>OF<2'KZ5B\P
-M`?(```"H``Q.N0``,``00JB`\```_`&``_K8B+?_\5H%P_$GYH,*`*!0@!-B$V(#E
-MC-*$*`?IC-B'Y8S8@2P$4(9*N0```)AG&$7L``2=SKW494@O!DAZ^>).N0``
-M-ZQ0CR`\```!`-"Y;-"&(\"0(CP`!``$+'D```!@3J[_.B/`
-M?&8X+P9(>OFZ2'@`%$ZZ$:@`*4HXO"$*`,"H`""\`+RH`!"\:+PY(>OE%
-M3KD``#>L4(I/[P`88(HK0/_H<#]*N0```6AF!!`\``\O`"\++P5.N0``&;I/
-M[P`,4H!F"$AZ^6Y@`/RJ("W__%:`OE$3KD``#>L6(\B
-M+?_@OEA
-M3KD``#@46(]*N0```)AF#G)I1@$L>0```YA.KO\Z2KD```"89@QR9"QY```#
-MF$ZN_SHF;?_\("W_^"(M_^A"K?_8LH!G#@Q%``%C>B!+D<$K2/_8)L='ZP`@
-M1>O_X"QY!'+_(`$@0TZN_[@F`&98(\H```"$))0V?``$MI1E``"P#$4`
-M`F,``2!*N0```(AF``$6('D```!\("W_Y+"(8P``IB\`+PA(>OH.3KD``#>L
-M2'KZ+$AX`!1.N@[>0D5@`/]:)D!@BB!#<`,DV"38)-@DV%'(__8DV$*`$#D`
-M``"`OF.3KD``#>L4(\@$P:`
-M`P```":`2KD```"89PXO`$AZ^9!.N0``-ZQ0CT?K`$1@`/\J0?*X`$/TN``@
-MV2#9(-E2@T?K``Q@`/\V1?!)(`$(+SD```!L2'H&;B\*3KD``#6`+'D```!@
-M3J[]A"\M_^0O.0```'Q(>OG,3KD``#>L3^\`&$JYF&8,0```YA.
-MKO\Z2KD```"89P``BD*G3KD```!D("W_X+"&8A8O`"\&2'KYN4ZY```WK$AZ
-M^=M@`/[R<`$CP(@O.0```'Q(>OGI3KD``#>L4(]%^@7B8+!Z"NJH,'P`
-M2R\!+PDO""\`2'KW'4ZY```WK#HU`6+_[/_^3^\`%`Q%3G-G`/ZL#$4`"6,`
-M_=H_!4)G2'KW'V``_0"3R2QY"$ZN_R)*N0```(A7P$G`1(`O`"\Y
-MG"\Y```!9"\YC"\Y@"\M_]@O`B\M_^`O+?_<+RW_Y"`M_^R0K?_H
-M+P`O!B\Y?$Z20H!,[5S\_[!.74YU5')A;G-L871E9"`E,#AX('-Z("4P
-M.'@@=&\@)3`X>"!S>B`E,#AX"@!Z:VEC:R!M96UO0```&!.KO]V3-]\_$_O``Q.=29J`!@F*@`4
-M0^\`.)?#(PLL>0```&!"@"!#3J[]!DOO`#@B92X`E\G6B2`)9@8D;P`P8+!*
-MN0```)AG("\)+P=('VX@&8``,93B2`)`(``#___*@!2A2]%`#0H`9B%#(1`9UHB
-M`E*!(`'0@="!,:H`#@VPH"`"T(+0@N6(0?0(`!`J``E(@#%```XA10`(
-M(40`!"H"5(4O2P`T+'D```!@($-P`B)-3J[]!B)O`#0N`)?)UHDD!6``_T0R
-M?``!T\)!\9@`T``43KH)B'+_1D'"@&=H(@!T&.2I%#P`
-M?;2!9R9"0$A`#(2P9QIB'@R"6&<0#(/H9P@,@?1F'B0?
-M+%].=0R+N&?R#(^@9^H,@```!]!GXB\`2'K^^$ZY```WK$AX``%.

CVS commit: [netbsd-8] src

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:09:01 UTC 2023

Modified Files:
src/distrib/amiga/stand [netbsd-8]: loadbsd.uue
src/sys/arch/amiga/stand/loadbsd [netbsd-8]: Makefile README loadbsd.c
Added Files:
src/sys/arch/amiga/stand/loadbsd [netbsd-8]: startit.s vmakefile

Log Message:
Pull up following revision(s) (requested by abs in ticket #1823):

sys/arch/amiga/stand/loadbsd/loadbsd.c: revision 1.38
distrib/amiga/stand/loadbsd.uue: revision 1.4
sys/arch/amiga/stand/loadbsd/startit.s: revision 1.1
sys/arch/amiga/stand/loadbsd/Makefile: revision 1.5
sys/arch/amiga/stand/loadbsd/vmakefile: revision 1.1
sys/arch/amiga/stand/loadbsd/README: revision 1.6

Update loadbsd source and distribution binary to version 3.3.
- Loading the kernel to the highest priority memory segment is default now.
- New option -l to revert the to the previous behaviour of largest segment.
- New option -M to define a minimum size for the memory segment.
- Fixed some warnings and typos.
- Put assembler inline source into its own source text startit.s.
- Can be built with Bebbo's gcc6 Amiga port or with vbcc.


To generate a diff of this commit:
cvs rdiff -u -r1.2.8.1 -r1.2.8.2 src/distrib/amiga/stand/loadbsd.uue
cvs rdiff -u -r1.3.10.1 -r1.3.10.2 src/sys/arch/amiga/stand/loadbsd/Makefile \
src/sys/arch/amiga/stand/loadbsd/README
cvs rdiff -u -r1.35.46.1 -r1.35.46.2 \
src/sys/arch/amiga/stand/loadbsd/loadbsd.c
cvs rdiff -u -r0 -r1.1.6.2 src/sys/arch/amiga/stand/loadbsd/startit.s \
src/sys/arch/amiga/stand/loadbsd/vmakefile

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

CVS commit: [netbsd-9] src

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:07:53 UTC 2023

Modified Files:
src/distrib/amiga/stand [netbsd-9]: loadbsd.uue
src/sys/arch/amiga/stand/loadbsd [netbsd-9]: Makefile README loadbsd.c
Added Files:
src/sys/arch/amiga/stand/loadbsd [netbsd-9]: startit.s vmakefile

Log Message:
Pull up following revision(s) (requested by abs in ticket #1638):

sys/arch/amiga/stand/loadbsd/loadbsd.c: revision 1.38
distrib/amiga/stand/loadbsd.uue: revision 1.4
sys/arch/amiga/stand/loadbsd/startit.s: revision 1.1
sys/arch/amiga/stand/loadbsd/Makefile: revision 1.5
sys/arch/amiga/stand/loadbsd/vmakefile: revision 1.1
sys/arch/amiga/stand/loadbsd/README: revision 1.6

Update loadbsd source and distribution binary to version 3.3.
- Loading the kernel to the highest priority memory segment is default now.
- New option -l to revert the to the previous behaviour of largest segment.
- New option -M to define a minimum size for the memory segment.
- Fixed some warnings and typos.
- Put assembler inline source into its own source text startit.s.
- Can be built with Bebbo's gcc6 Amiga port or with vbcc.


To generate a diff of this commit:
cvs rdiff -u -r1.2.18.1 -r1.2.18.2 src/distrib/amiga/stand/loadbsd.uue
cvs rdiff -u -r1.3.22.1 -r1.3.22.2 src/sys/arch/amiga/stand/loadbsd/Makefile \
src/sys/arch/amiga/stand/loadbsd/README
cvs rdiff -u -r1.36.2.1 -r1.36.2.2 src/sys/arch/amiga/stand/loadbsd/loadbsd.c
cvs rdiff -u -r0 -r1.1.4.2 src/sys/arch/amiga/stand/loadbsd/startit.s \
src/sys/arch/amiga/stand/loadbsd/vmakefile

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

Modified files:

Index: src/distrib/amiga/stand/loadbsd.uue
diff -u src/distrib/amiga/stand/loadbsd.uue:1.2.18.1 src/distrib/amiga/stand/loadbsd.uue:1.2.18.2
--- src/distrib/amiga/stand/loadbsd.uue:1.2.18.1	Fri Feb 24 13:51:44 2023
+++ src/distrib/amiga/stand/loadbsd.uue	Sat Jun  3 15:07:53 2023
@@ -1,611 +1,614 @@
 begin 755 loadbsd
-M```#\P`#``(``!22ZP``/I```4DB/(
+M```#\P`#``(``!0```&!.KO\N(GD$(`EG"BQY
-M8$ZN_F(B>0@@"6<*+'D```!@3J[^8BQ?3G5G0!E>'!A;G-I;VXN;0!C86XG="!O<&5N(&5X<&%NF4])3`X;'@@871TF4Z("5L9`H`9F%I;&5D(&%L;&]C("5D`'5N86)L92!T
-M;R!L;V%D(2!N
-M97=E`H`
-M2V5R;F5L(&%T("4P.+"!&87-T;65M('5S960@870@)3`X;'@*`$-A;B=T
-M(&-O<'D@=7!W87)D6]U2!A9V%I;B!/4B!T2!T:&4@+5H@;W!T:6]N
-M"!T;R!&87-T;65M("4P.("HJ
-M*@H`2V5R;F5L('-I>F4@)6QD(&5X8V5E9',@0VAI<"!-96UO``43KH39BQY8$*`0_K[Q4ZN_=@CP`1T
-M`DJ`9@``D$AZ^\%@U#!\_[_1P'`UL(AEJ#`[B@9.^P`"`;;_H`'T`9;_H/^@
-M_Z#_H`(`_Z#_H/^@_Z#_H/^@_Z#_H/^@`8K_H/^@`6K_H/^@_Z`"'/^@_Z#_
-MH/^@_Z#_H`$2`1H!GO^@_Z#_H/^@`BC_H/^@`_H`$Z`<+_H`$B`5K_H`%6
-M`2[_H`%B<`$CP6Q(>OMT+PHO`TZY```GYD_O``QZ_[J`9@#_8"(Y
-M="`!Y8G5P9:`<`@V8`_OXJ$D*#+@,L>01R_R`!($-.KO^X)@!F``%N
-M3KH(N$AM_^!(;?_<2_Y$ZZ!8).N@I"*T/_Z$_O``Q*N0```6AF``%*(#P`
-M``\`+P!'[?_H+PLO!4ZY```9ND_O``Q2@&8``31(>OKV8`#^L'#]Q(!@`/]<
-M<`&$@&``_U1P`2/`E&``_TAP`2/`F&``_SPO.0```8!.N0``,3CA
-MB.6((\!X6(]@`/\@<`)@P@C"`!!@`/\4",(`$6``_PQ(>OF<2'KZ5B\P
-M`?(```"H``Q.N0``,``00JB`\```_`&``_K8B+?_\5H%P_$GYH,*`*!0@!-B$V(#E
-MC-*$*`?IC-B'Y8S8@2P$4(9*N0```)AG&$7L``2=SKW494@O!DAZ^>).N0``
-M-ZQ0CR`\```!`-"Y;-"&(\"0(CP`!``$+'D```!@3J[_.B/`
-M?&8X+P9(>OFZ2'@`%$ZZ$:@`*4HXO"$*`,"H`""\`+RH`!"\:+PY(>OE%
-M3KD``#>L4(I/[P`88(HK0/_H<#]*N0```6AF!!`\``\O`"\++P5.N0``&;I/
-M[P`,4H!F"$AZ^6Y@`/RJ("W__%:`OE$3KD``#>L6(\B
-M+?_@OEA
-M3KD``#@46(]*N0```)AF#G)I1@$L>0```YA.KO\Z2KD```"89@QR9"QY```#
-MF$ZN_SHF;?_\("W_^"(M_^A"K?_8LH!G#@Q%``%C>B!+D<$K2/_8)L='ZP`@
-M1>O_X"QY!'+_(`$@0TZN_[@F`&98(\H```"$))0V?``$MI1E``"P#$4`
-M`F,``2!*N0```(AF``$6('D```!\("W_Y+"(8P``IB\`+PA(>OH.3KD``#>L
-M2'KZ+$AX`!1.N@[>0D5@`/]:)D!@BB!#<`,DV"38)-@DV%'(__8DV$*`$#D`
-M``"`OF.3KD``#>L4(\@$P:`
-M`P```":`2KD```"89PXO`$AZ^9!.N0``-ZQ0CT?K`$1@`/\J0?*X`$/TN``@
-MV2#9(-E2@T?K``Q@`/\V1?!)(`$(+SD```!L2'H&;B\*3KD``#6`+'D```!@
-M3J[]A"\M_^0O.0```'Q(>OG,3KD``#>L3^\`&$JYF&8,0```YA.
-MKO\Z2KD```"89P``BD*G3KD```!D("W_X+"&8A8O`"\&2'KYN4ZY```WK$AZ
-M^=M@`/[R<`$CP(@O.0```'Q(>OGI3KD``#>L4(]%^@7B8+!Z"NJH,'P`
-M2R\!+PDO""\`2'KW'4ZY```WK#HU`6+_[/_^3^\`%`Q%3G-G`/ZL#$4`"6,`
-M_=H_!4)G2'KW'V``_0"3R2QY"$ZN_R)*N0```(A7P$G`1(`O`"\Y
-MG"\Y```!9"\YC"\Y@"\M_]@O`B\M_^`O+?_<+RW_Y"`M_^R0K?_H
-M+P`O!B\Y?$Z20H!,[5S\_[!.74YU5')A;G-L871E9"`E,#AX('-Z("4P
-M.'@@=&\@)3`X>"!S>B`E,#AX"@!Z:VEC:R!M96UO0```&!.KO]V3-]\_$_O``Q.=29J`!@F*@`4
-M0^\`.)?#(PLL>0```&!"@"!#3J[]!DOO`#@B92X`E\G6B2`)9@8D;P`P8+!*
-MN0```)AG("\)+P=('VX@&8``,93B2`)`(``#___*@!2A2]%`#0H`9B%#(1`9UHB
-M`E*!(`'0@="!,:H`#@VPH"`"T(+0@N6(0?0(`!`J``E(@#%```XA10`(
-M(40`!"H"5(4O2P`T+'D```!@($-P`B)-3J[]!B)O`#0N`)?)UHDD!6``_T0R
-M?``!T\)!\9@`T``43KH)B'+_1D'"@&=H(@!T&.2I%#P`
-M?;2!9R9"0$A`#(2P9QIB'@R"6&<0#(/H9P@,@?1F'B0?
-M+%].=0R+N&?R#(^@9^H,@```!]!GXB\`2'K^^$ZY```WK$AX``%.

CVS commit: [netbsd-9] src

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:07:53 UTC 2023

Modified Files:
src/distrib/amiga/stand [netbsd-9]: loadbsd.uue
src/sys/arch/amiga/stand/loadbsd [netbsd-9]: Makefile README loadbsd.c
Added Files:
src/sys/arch/amiga/stand/loadbsd [netbsd-9]: startit.s vmakefile

Log Message:
Pull up following revision(s) (requested by abs in ticket #1638):

sys/arch/amiga/stand/loadbsd/loadbsd.c: revision 1.38
distrib/amiga/stand/loadbsd.uue: revision 1.4
sys/arch/amiga/stand/loadbsd/startit.s: revision 1.1
sys/arch/amiga/stand/loadbsd/Makefile: revision 1.5
sys/arch/amiga/stand/loadbsd/vmakefile: revision 1.1
sys/arch/amiga/stand/loadbsd/README: revision 1.6

Update loadbsd source and distribution binary to version 3.3.
- Loading the kernel to the highest priority memory segment is default now.
- New option -l to revert the to the previous behaviour of largest segment.
- New option -M to define a minimum size for the memory segment.
- Fixed some warnings and typos.
- Put assembler inline source into its own source text startit.s.
- Can be built with Bebbo's gcc6 Amiga port or with vbcc.


To generate a diff of this commit:
cvs rdiff -u -r1.2.18.1 -r1.2.18.2 src/distrib/amiga/stand/loadbsd.uue
cvs rdiff -u -r1.3.22.1 -r1.3.22.2 src/sys/arch/amiga/stand/loadbsd/Makefile \
src/sys/arch/amiga/stand/loadbsd/README
cvs rdiff -u -r1.36.2.1 -r1.36.2.2 src/sys/arch/amiga/stand/loadbsd/loadbsd.c
cvs rdiff -u -r0 -r1.1.4.2 src/sys/arch/amiga/stand/loadbsd/startit.s \
src/sys/arch/amiga/stand/loadbsd/vmakefile

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

CVS commit: [netbsd-10] src

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:04:06 UTC 2023

Modified Files:
src/distrib/amiga/stand [netbsd-10]: loadbsd.uue
src/sys/arch/amiga/stand/loadbsd [netbsd-10]: Makefile README loadbsd.c
Added Files:
src/sys/arch/amiga/stand/loadbsd [netbsd-10]: startit.s vmakefile

Log Message:
Pull up following revision(s) (requested by abs in ticket #189):

sys/arch/amiga/stand/loadbsd/loadbsd.c: revision 1.38
distrib/amiga/stand/loadbsd.uue: revision 1.4
sys/arch/amiga/stand/loadbsd/startit.s: revision 1.1
sys/arch/amiga/stand/loadbsd/Makefile: revision 1.5
sys/arch/amiga/stand/loadbsd/vmakefile: revision 1.1
sys/arch/amiga/stand/loadbsd/README: revision 1.6

Update loadbsd source and distribution binary to version 3.3.
- Loading the kernel to the highest priority memory segment is default now.
- New option -l to revert the to the previous behaviour of largest segment.
- New option -M to define a minimum size for the memory segment.
- Fixed some warnings and typos.
- Put assembler inline source into its own source text startit.s.
- Can be built with Bebbo's gcc6 Amiga port or with vbcc.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 src/distrib/amiga/stand/loadbsd.uue
cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/arch/amiga/stand/loadbsd/Makefile
cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/arch/amiga/stand/loadbsd/README
cvs rdiff -u -r1.37 -r1.37.4.1 src/sys/arch/amiga/stand/loadbsd/loadbsd.c
cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/amiga/stand/loadbsd/startit.s \
src/sys/arch/amiga/stand/loadbsd/vmakefile

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

CVS commit: [netbsd-10] src

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 15:04:06 UTC 2023

Modified Files:
src/distrib/amiga/stand [netbsd-10]: loadbsd.uue
src/sys/arch/amiga/stand/loadbsd [netbsd-10]: Makefile README loadbsd.c
Added Files:
src/sys/arch/amiga/stand/loadbsd [netbsd-10]: startit.s vmakefile

Log Message:
Pull up following revision(s) (requested by abs in ticket #189):

sys/arch/amiga/stand/loadbsd/loadbsd.c: revision 1.38
distrib/amiga/stand/loadbsd.uue: revision 1.4
sys/arch/amiga/stand/loadbsd/startit.s: revision 1.1
sys/arch/amiga/stand/loadbsd/Makefile: revision 1.5
sys/arch/amiga/stand/loadbsd/vmakefile: revision 1.1
sys/arch/amiga/stand/loadbsd/README: revision 1.6

Update loadbsd source and distribution binary to version 3.3.
- Loading the kernel to the highest priority memory segment is default now.
- New option -l to revert the to the previous behaviour of largest segment.
- New option -M to define a minimum size for the memory segment.
- Fixed some warnings and typos.
- Put assembler inline source into its own source text startit.s.
- Can be built with Bebbo's gcc6 Amiga port or with vbcc.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 src/distrib/amiga/stand/loadbsd.uue
cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/arch/amiga/stand/loadbsd/Makefile
cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/arch/amiga/stand/loadbsd/README
cvs rdiff -u -r1.37 -r1.37.4.1 src/sys/arch/amiga/stand/loadbsd/loadbsd.c
cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/amiga/stand/loadbsd/startit.s \
src/sys/arch/amiga/stand/loadbsd/vmakefile

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

Modified files:

Index: src/distrib/amiga/stand/loadbsd.uue
diff -u src/distrib/amiga/stand/loadbsd.uue:1.3 src/distrib/amiga/stand/loadbsd.uue:1.3.2.1
--- src/distrib/amiga/stand/loadbsd.uue:1.3	Tue Sep  6 17:50:18 2022
+++ src/distrib/amiga/stand/loadbsd.uue	Sat Jun  3 15:04:06 2023
@@ -1,611 +1,614 @@
 begin 755 loadbsd
-M```#\P`#``(``!22ZP``/I```4DB/(
+M```#\P`#``(``!0```&!.KO\N(GD$(`EG"BQY
-M8$ZN_F(B>0@@"6<*+'D```!@3J[^8BQ?3G5G0!E>'!A;G-I;VXN;0!C86XG="!O<&5N(&5X<&%NF4])3`X;'@@871TF4Z("5L9`H`9F%I;&5D(&%L;&]C("5D`'5N86)L92!T
-M;R!L;V%D(2!N
-M97=E`H`
-M2V5R;F5L(&%T("4P.+"!&87-T;65M('5S960@870@)3`X;'@*`$-A;B=T
-M(&-O<'D@=7!W87)D6]U2!A9V%I;B!/4B!T2!T:&4@+5H@;W!T:6]N
-M"!T;R!&87-T;65M("4P.("HJ
-M*@H`2V5R;F5L('-I>F4@)6QD(&5X8V5E9',@0VAI<"!-96UO``43KH39BQY8$*`0_K[Q4ZN_=@CP`1T
-M`DJ`9@``D$AZ^\%@U#!\_[_1P'`UL(AEJ#`[B@9.^P`"`;;_H`'T`9;_H/^@
-M_Z#_H`(`_Z#_H/^@_Z#_H/^@_Z#_H/^@`8K_H/^@`6K_H/^@_Z`"'/^@_Z#_
-MH/^@_Z#_H`$2`1H!GO^@_Z#_H/^@`BC_H/^@`_H`$Z`<+_H`$B`5K_H`%6
-M`2[_H`%B<`$CP6Q(>OMT+PHO`TZY```GYD_O``QZ_[J`9@#_8"(Y
-M="`!Y8G5P9:`<`@V8`_OXJ$D*#+@,L>01R_R`!($-.KO^X)@!F``%N
-M3KH(N$AM_^!(;?_<2_Y$ZZ!8).N@I"*T/_Z$_O``Q*N0```6AF``%*(#P`
-M``\`+P!'[?_H+PLO!4ZY```9ND_O``Q2@&8``31(>OKV8`#^L'#]Q(!@`/]<
-M<`&$@&``_U1P`2/`E&``_TAP`2/`F&``_SPO.0```8!.N0``,3CA
-MB.6((\!X6(]@`/\@<`)@P@C"`!!@`/\4",(`$6``_PQ(>OF<2'KZ5B\P
-M`?(```"H``Q.N0``,``00JB`\```_`&``_K8B+?_\5H%P_$GYH,*`*!0@!-B$V(#E
-MC-*$*`?IC-B'Y8S8@2P$4(9*N0```)AG&$7L``2=SKW494@O!DAZ^>).N0``
-M-ZQ0CR`\```!`-"Y;-"&(\"0(CP`!``$+'D```!@3J[_.B/`
-M?&8X+P9(>OFZ2'@`%$ZZ$:@`*4HXO"$*`,"H`""\`+RH`!"\:+PY(>OE%
-M3KD``#>L4(I/[P`88(HK0/_H<#]*N0```6AF!!`\``\O`"\++P5.N0``&;I/
-M[P`,4H!F"$AZ^6Y@`/RJ("W__%:`OE$3KD``#>L6(\B
-M+?_@OEA
-M3KD``#@46(]*N0```)AF#G)I1@$L>0```YA.KO\Z2KD```"89@QR9"QY```#
-MF$ZN_SHF;?_\("W_^"(M_^A"K?_8LH!G#@Q%``%C>B!+D<$K2/_8)L='ZP`@
-M1>O_X"QY!'+_(`$@0TZN_[@F`&98(\H```"$))0V?``$MI1E``"P#$4`
-M`F,``2!*N0```(AF``$6('D```!\("W_Y+"(8P``IB\`+PA(>OH.3KD``#>L
-M2'KZ+$AX`!1.N@[>0D5@`/]:)D!@BB!#<`,DV"38)-@DV%'(__8DV$*`$#D`
-M``"`OF.3KD``#>L4(\@$P:`
-M`P```":`2KD```"89PXO`$AZ^9!.N0``-ZQ0CT?K`$1@`/\J0?*X`$/TN``@
-MV2#9(-E2@T?K``Q@`/\V1?!)(`$(+SD```!L2'H&;B\*3KD``#6`+'D```!@
-M3J[]A"\M_^0O.0```'Q(>OG,3KD``#>L3^\`&$JYF&8,0```YA.
-MKO\Z2KD```"89P``BD*G3KD```!D("W_X+"&8A8O`"\&2'KYN4ZY```WK$AZ
-M^=M@`/[R<`$CP(@O.0```'Q(>OGI3KD``#>L4(]%^@7B8+!Z"NJH,'P`
-M2R\!+PDO""\`2'KW'4ZY```WK#HU`6+_[/_^3^\`%`Q%3G-G`/ZL#$4`"6,`
-M_=H_!4)G2'KW'V``_0"3R2QY"$ZN_R)*N0```(A7P$G`1(`O`"\Y
-MG"\Y```!9"\YC"\Y@"\M_]@O`B\M_^`O+?_<+RW_Y"`M_^R0K?_H
-M+P`O!B\Y?$Z20H!,[5S\_[!.74YU5')A;G-L871E9"`E,#AX('-Z("4P
-M.'@@=&\@)3`X>"!S>B`E,#AX"@!Z:VEC:R!M96UO0```&!.KO]V3-]\_$_O``Q.=29J`!@F*@`4
-M0^\`.)?#(PLL>0```&!"@"!#3J[]!DOO`#@B92X`E\G6B2`)9@8D;P`P8+!*
-MN0```)AG("\)+P=('VX@&8``,93B2`)`(``#___*@!2A2]%`#0H`9B%#(1`9UHB
-M`E*!(`'0@="!,:H`#@VPH"`"T(+0@N6(0?0(`!`J``E(@#%```XA10`(
-M(40`!"H"5(4O2P`T+'D```!@($-P`B)-3J[]!B)O`#0N`)?)UHDD!6``_T0R
-M?``!T\)!\9@`T``43KH)B'+_1D'"@&=H(@!T&.2I%#P`
-M?;2!9R9"0$A`#(2P9QIB'@R"6&<0#(/H9P@,@?1F'B0?
-M+%].=0R+N&?R#(^@9^H,@```!]!GXB\`2'K^^$ZY```WK$AX``%.

CVS commit: [netbsd-10] src/sys/ddb

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 14:47:52 UTC 2023

Modified Files:
src/sys/ddb [netbsd-10]: db_command.c

Log Message:
Pull up following revision(s) (requested by uwe in ticket #188):

sys/ddb/db_command.c: revision 1.182

ddb: PR kern/57435 - fix duplicate "show mount"

Bolivar cannot carry double.  One of these commands should have been
"show mounts", cf. page/pages and a few others.  While here fix the
function name to be db_show_all_mounts to conform to the pattern.


To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.181.4.1 src/sys/ddb/db_command.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/ddb/db_command.c
diff -u src/sys/ddb/db_command.c:1.181 src/sys/ddb/db_command.c:1.181.4.1
--- src/sys/ddb/db_command.c:1.181	Thu Apr 28 07:08:38 2022
+++ src/sys/ddb/db_command.c	Sat Jun  3 14:47:52 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_command.c,v 1.181 2022/04/28 07:08:38 msaitoh Exp $	*/
+/*	$NetBSD: db_command.c,v 1.181.4.1 2023/06/03 14:47:52 martin Exp $	*/
 
 /*
  * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2009, 2019
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.181 2022/04/28 07:08:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.181.4.1 2023/06/03 14:47:52 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_aio.h"
@@ -203,7 +203,7 @@ static void	db_show_all_locks(db_expr_t,
 static void	db_show_lockstats(db_expr_t, bool, db_expr_t, const char *);
 static void	db_show_all_freelists(db_expr_t, bool, db_expr_t, const char *);
 static void	db_mount_print_cmd(db_expr_t, bool, db_expr_t, const char *);
-static void	db_show_all_mount(db_expr_t, bool, db_expr_t, const char *);
+static void	db_show_all_mounts(db_expr_t, bool, db_expr_t, const char *);
 static void	db_mbuf_print_cmd(db_expr_t, bool, db_expr_t, const char *);
 static void	db_kqueue_print_cmd(db_expr_t, bool, db_expr_t, const char *);
 static void	db_map_print_cmd(db_expr_t, bool, db_expr_t, const char *);
@@ -279,10 +279,10 @@ static const struct db_command db_show_c
 	"-c prints all mbuf chains") },
 	{ DDB_ADD_CMD("module", db_show_module_cmd,	0,
 	"Print kernel modules", NULL, NULL) },
-	{ DDB_ADD_CMD("mount",	db_show_all_mount,	0,
-	"Print all mount structures.", "[/f]", NULL) },
 	{ DDB_ADD_CMD("mount",	db_mount_print_cmd,	0,
 	"Print the mount structure at address.", "[/f] address",NULL) },
+	{ DDB_ADD_CMD("mounts",	db_show_all_mounts,	0,
+	"Print all mount structures.", "[/f]", NULL) },
 #ifdef MQUEUE
 	{ DDB_ADD_CMD("mqueue", db_show_mqueue_cmd,	0,
 	"Print the message queues", NULL, NULL) },
@@ -1244,7 +1244,7 @@ db_mount_print_cmd(db_expr_t addr, bool 
 }
 
 static void
-db_show_all_mount(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
+db_show_all_mounts(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
 {
 #ifdef _KERNEL	/* XXX CRASH(8) */
 	bool full = false;

CVS commit: [netbsd-10] src/sys/ddb

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 14:47:52 UTC 2023

Modified Files:
src/sys/ddb [netbsd-10]: db_command.c

Log Message:
Pull up following revision(s) (requested by uwe in ticket #188):

sys/ddb/db_command.c: revision 1.182

ddb: PR kern/57435 - fix duplicate "show mount"

Bolivar cannot carry double.  One of these commands should have been
"show mounts", cf. page/pages and a few others.  While here fix the
function name to be db_show_all_mounts to conform to the pattern.


To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.181.4.1 src/sys/ddb/db_command.c

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

CVS commit: [netbsd-9] src/sys/dev/pci

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 14:46:08 UTC 2023

Modified Files:
src/sys/dev/pci [netbsd-9]: if_aq.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #1637):

sys/dev/pci/if_aq.c: revision 1.45

aq(4): if_transmit: Invoke softint_schedule(9) with kpreempt disabled.


To generate a diff of this commit:
cvs rdiff -u -r1.17.2.3 -r1.17.2.4 src/sys/dev/pci/if_aq.c

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

Modified files:

Index: src/sys/dev/pci/if_aq.c
diff -u src/sys/dev/pci/if_aq.c:1.17.2.3 src/sys/dev/pci/if_aq.c:1.17.2.4
--- src/sys/dev/pci/if_aq.c:1.17.2.3	Tue Jul  7 12:02:29 2020
+++ src/sys/dev/pci/if_aq.c	Sat Jun  3 14:46:07 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_aq.c,v 1.17.2.3 2020/07/07 12:02:29 martin Exp $	*/
+/*	$NetBSD: if_aq.c,v 1.17.2.4 2023/06/03 14:46:07 martin Exp $	*/
 
 /**
  * aQuantia Corporation Network Driver
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.17.2.3 2020/07/07 12:02:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.17.2.4 2023/06/03 14:46:07 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_if_aq.h"
@@ -4635,7 +4635,9 @@ aq_transmit(struct ifnet *ifp, struct mb
 		aq_send_common_locked(ifp, sc, txring, true);
 		mutex_exit(>txr_mutex);
 	} else {
+		kpreempt_disable();
 		softint_schedule(txring->txr_softint);
+		kpreempt_enable();
 	}
 	return 0;
 }

CVS commit: [netbsd-9] src/sys/dev/pci

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 14:46:08 UTC 2023

Modified Files:
src/sys/dev/pci [netbsd-9]: if_aq.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #1637):

sys/dev/pci/if_aq.c: revision 1.45

aq(4): if_transmit: Invoke softint_schedule(9) with kpreempt disabled.


To generate a diff of this commit:
cvs rdiff -u -r1.17.2.3 -r1.17.2.4 src/sys/dev/pci/if_aq.c

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

CVS commit: [netbsd-10] src/sys/dev/pci

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 14:44:34 UTC 2023

Modified Files:
src/sys/dev/pci [netbsd-10]: if_aq.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #187):

sys/dev/pci/if_aq.c: revision 1.45

aq(4): if_transmit: Invoke softint_schedule(9) with kpreempt disabled.


To generate a diff of this commit:
cvs rdiff -u -r1.39.2.1 -r1.39.2.2 src/sys/dev/pci/if_aq.c

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

Modified files:

Index: src/sys/dev/pci/if_aq.c
diff -u src/sys/dev/pci/if_aq.c:1.39.2.1 src/sys/dev/pci/if_aq.c:1.39.2.2
--- src/sys/dev/pci/if_aq.c:1.39.2.1	Mon Jan 30 11:52:22 2023
+++ src/sys/dev/pci/if_aq.c	Sat Jun  3 14:44:34 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_aq.c,v 1.39.2.1 2023/01/30 11:52:22 martin Exp $	*/
+/*	$NetBSD: if_aq.c,v 1.39.2.2 2023/06/03 14:44:34 martin Exp $	*/
 
 /**
  * aQuantia Corporation Network Driver
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.39.2.1 2023/01/30 11:52:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.39.2.2 2023/06/03 14:44:34 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_if_aq.h"
@@ -5901,7 +5901,9 @@ aq_transmit(struct ifnet *ifp, struct mb
 		aq_send_common_locked(ifp, sc, txring, true);
 		mutex_exit(>txr_mutex);
 	} else {
+		kpreempt_disable();
 		softint_schedule(txring->txr_softint);
+		kpreempt_enable();
 	}
 	return 0;
 }

CVS commit: [netbsd-10] src/sys/dev/pci

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 14:44:34 UTC 2023

Modified Files:
src/sys/dev/pci [netbsd-10]: if_aq.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #187):

sys/dev/pci/if_aq.c: revision 1.45

aq(4): if_transmit: Invoke softint_schedule(9) with kpreempt disabled.


To generate a diff of this commit:
cvs rdiff -u -r1.39.2.1 -r1.39.2.2 src/sys/dev/pci/if_aq.c

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

CVS commit: [netbsd-10] src/sys/dev

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 14:40:25 UTC 2023

Modified Files:
src/sys/dev/pci [netbsd-10]: virtio.c virtio_pci.c virtiovar.h
src/sys/dev/virtio [netbsd-10]: virtio_mmio.c

Log Message:
Pull up following revision(s) (requested by yamaguchi in ticket #186):

sys/dev/pci/virtio_pci.c: revision 1.41
sys/dev/pci/virtio_pci.c: revision 1.42
sys/dev/virtio/virtio_mmio.c: revision 1.10
sys/dev/pci/virtiovar.h: revision 1.29
sys/dev/pci/virtio.c: revision 1.75
sys/dev/pci/virtio.c: revision 1.76
sys/dev/pci/virtio.c: revision 1.77
sys/dev/pci/virtio.c: revision 1.78

virtio@pci: Fix assertion on detach.

If the child never attached in the first place, it's OK for it to not
have detached.

XXX This should not be a set of flags; this should be a state
enumeration, because some flags make no sense, like FINISHED|FAILED.

XXX This should not be asserted separately in each bus; there should
be a single place in virtio.c to assert this, uniformly in all buses.

PR kern/57357

Use enumeration for state of a child driver instead of flags
and check its detaching by using sc->sc_child in virtio_softc
pointed out by riastradh, thanks.
fixes PR/57357

Fix not to allocate unnecessary descriptor
fixes PR/57358

virtio(4): change variable name, nfc

virtio(4): change members of struct vring_desc_extra before free a slot

This prevents the following race condition.
1. Thread-A: calls virtio_dequeue_commit() and
 puts a slot into free descriptor chain in vq_free_slot()
2. Thread-B: calls virtio_enqueue_prep() and get the slot stored by Thread-A
3. Thread-B: calls virtio_enqueue_reserve() and
 changes desc_base and desc_free_idx for the slot
4. Thread-A: changes the same members updated by Thread-B
reported by hannken, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.63.2.4 -r1.63.2.5 src/sys/dev/pci/virtio.c
cvs rdiff -u -r1.38.4.1 -r1.38.4.2 src/sys/dev/pci/virtio_pci.c
cvs rdiff -u -r1.24.4.1 -r1.24.4.2 src/sys/dev/pci/virtiovar.h
cvs rdiff -u -r1.7.4.1 -r1.7.4.2 src/sys/dev/virtio/virtio_mmio.c

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

Modified files:

Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.63.2.4 src/sys/dev/pci/virtio.c:1.63.2.5
--- src/sys/dev/pci/virtio.c:1.63.2.4	Sat May 13 10:56:10 2023
+++ src/sys/dev/pci/virtio.c	Sat Jun  3 14:40:25 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: virtio.c,v 1.63.2.4 2023/05/13 10:56:10 martin Exp $	*/
+/*	$NetBSD: virtio.c,v 1.63.2.5 2023/06/03 14:40:25 martin Exp $	*/
 
 /*
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.63.2.4 2023/05/13 10:56:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.63.2.5 2023/06/03 14:40:25 martin Exp $");
 
 #include 
 #include 
@@ -944,12 +944,12 @@ vq_alloc_slot_locked(struct virtio_softc
 size_t nslots)
 {
 	struct vring_desc *vd;
-	uint16_t rv, tail;
+	uint16_t head, tail;
 	size_t i;
 
 	KASSERT(mutex_owned(>vq_freedesc_lock));
 
-	tail = virtio_rw16(sc, vq->vq_free_idx);
+	head = tail = virtio_rw16(sc, vq->vq_free_idx);
 	for (i = 0; i < nslots - 1; i++) {
 		if (tail == VRING_DESC_CHAIN_END)
 			return VRING_DESC_CHAIN_END;
@@ -962,13 +962,11 @@ vq_alloc_slot_locked(struct virtio_softc
 	if (tail == VRING_DESC_CHAIN_END)
 		return VRING_DESC_CHAIN_END;
 
-	rv = virtio_rw16(sc, vq->vq_free_idx);
-
 	vd = >vq_desc[tail];
 	vd->flags = virtio_rw16(sc, 0);
 	vq->vq_free_idx = vd->next;
 
-	return rv;
+	return head;
 }
 static uint16_t
 vq_alloc_slot(struct virtio_softc *sc, struct virtqueue *vq, size_t nslots)
@@ -1096,17 +1094,18 @@ virtio_enqueue_reserve(struct virtio_sof
 		}
 		vd[i].flags  = virtio_rw16(sc, 0);
 	} else {
-		uint16_t s;
+		if (nsegs > 1) {
+			uint16_t s;
 
-		s = vq_alloc_slot(sc, vq, nsegs - 1);
-		if (s == VRING_DESC_CHAIN_END) {
-			vq_free_slot(sc, vq, slot);
-			return EAGAIN;
+			s = vq_alloc_slot(sc, vq, nsegs - 1);
+			if (s == VRING_DESC_CHAIN_END) {
+vq_free_slot(sc, vq, slot);
+return EAGAIN;
+			}
+			vd->next = virtio_rw16(sc, s);
+			vd->flags = virtio_rw16(sc, VRING_DESC_F_NEXT);
 		}
 
-		vd->next = virtio_rw16(sc, s);
-		vd->flags = virtio_rw16(sc, VRING_DESC_F_NEXT);
-
 		vdx->desc_base = >vq_desc[0];
 		vdx->desc_free_idx = slot;
 	}
@@ -1259,12 +1258,12 @@ virtio_enqueue_abort(struct virtio_softc
 {
 	struct vring_desc_extra *vdx;
 
-	vq_free_slot(sc, vq, slot);
-
 	vdx = >vq_descx[slot];
 	vdx->desc_free_idx = VRING_DESC_CHAIN_END;
 	vdx->desc_base = NULL;
 
+	vq_free_slot(sc, vq, slot);
+
 	return 0;
 }
 
@@ -1309,12 +1308,12 @@ virtio_dequeue_commit(struct virtio_soft
 {
 	struct vring_desc_extra *vdx;
 
-	vq_free_slot(sc, vq, slot);
-
 	vdx = >vq_descx[slot];
 	vdx->desc_base = NULL;
 	vdx->desc_free_idx = VRING_DESC_CHAIN_END;
 
+	vq_free_slot(sc, vq, slot);
+

CVS commit: [netbsd-10] src/sys/dev

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 14:40:25 UTC 2023

Modified Files:
src/sys/dev/pci [netbsd-10]: virtio.c virtio_pci.c virtiovar.h
src/sys/dev/virtio [netbsd-10]: virtio_mmio.c

Log Message:
Pull up following revision(s) (requested by yamaguchi in ticket #186):

sys/dev/pci/virtio_pci.c: revision 1.41
sys/dev/pci/virtio_pci.c: revision 1.42
sys/dev/virtio/virtio_mmio.c: revision 1.10
sys/dev/pci/virtiovar.h: revision 1.29
sys/dev/pci/virtio.c: revision 1.75
sys/dev/pci/virtio.c: revision 1.76
sys/dev/pci/virtio.c: revision 1.77
sys/dev/pci/virtio.c: revision 1.78

virtio@pci: Fix assertion on detach.

If the child never attached in the first place, it's OK for it to not
have detached.

XXX This should not be a set of flags; this should be a state
enumeration, because some flags make no sense, like FINISHED|FAILED.

XXX This should not be asserted separately in each bus; there should
be a single place in virtio.c to assert this, uniformly in all buses.

PR kern/57357

Use enumeration for state of a child driver instead of flags
and check its detaching by using sc->sc_child in virtio_softc
pointed out by riastradh, thanks.
fixes PR/57357

Fix not to allocate unnecessary descriptor
fixes PR/57358

virtio(4): change variable name, nfc

virtio(4): change members of struct vring_desc_extra before free a slot

This prevents the following race condition.
1. Thread-A: calls virtio_dequeue_commit() and
 puts a slot into free descriptor chain in vq_free_slot()
2. Thread-B: calls virtio_enqueue_prep() and get the slot stored by Thread-A
3. Thread-B: calls virtio_enqueue_reserve() and
 changes desc_base and desc_free_idx for the slot
4. Thread-A: changes the same members updated by Thread-B
reported by hannken, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.63.2.4 -r1.63.2.5 src/sys/dev/pci/virtio.c
cvs rdiff -u -r1.38.4.1 -r1.38.4.2 src/sys/dev/pci/virtio_pci.c
cvs rdiff -u -r1.24.4.1 -r1.24.4.2 src/sys/dev/pci/virtiovar.h
cvs rdiff -u -r1.7.4.1 -r1.7.4.2 src/sys/dev/virtio/virtio_mmio.c

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

CVS commit: [netbsd-9] src/sys/lib/libsa

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 14:35:18 UTC 2023

Modified Files:
src/sys/lib/libsa [netbsd-9]: subr_prf.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #1636):

sys/lib/libsa/subr_prf.c: revision 1.30

libsa/printf: Do not fetch long va_arg as long long.

This does real harm iff all of the following conditions are satisfied:
(1) On ILP32 architectures.
(2) Both LIBSA_PRINTF_LONGLONG_SUPPORT and LIBSA_PRINTF_WIDTH_SUPPORT
compile-time options are enabled.
(3) Width field is used with 'l' modifier.

This is an implicit-fallthrough bug, but unfortunately, GCC 10.4 cannot
find this out somehow...


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.4.1 src/sys/lib/libsa/subr_prf.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/lib/libsa/subr_prf.c
diff -u src/sys/lib/libsa/subr_prf.c:1.28 src/sys/lib/libsa/subr_prf.c:1.28.4.1
--- src/sys/lib/libsa/subr_prf.c:1.28	Sun Feb  3 11:59:43 2019
+++ src/sys/lib/libsa/subr_prf.c	Sat Jun  3 14:35:18 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_prf.c,v 1.28 2019/02/03 11:59:43 mrg Exp $	*/
+/*	$NetBSD: subr_prf.c,v 1.28.4.1 2023/06/03 14:35:18 martin Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -202,6 +202,7 @@ reswitch:
 	break;
 ++fmt;
 			}
+			goto reswitch;
 #endif
 		case 'l':
 #ifdef LIBSA_PRINTF_LONGLONG_SUPPORT

CVS commit: [netbsd-9] src/sys/lib/libsa

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 14:35:18 UTC 2023

Modified Files:
src/sys/lib/libsa [netbsd-9]: subr_prf.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #1636):

sys/lib/libsa/subr_prf.c: revision 1.30

libsa/printf: Do not fetch long va_arg as long long.

This does real harm iff all of the following conditions are satisfied:
(1) On ILP32 architectures.
(2) Both LIBSA_PRINTF_LONGLONG_SUPPORT and LIBSA_PRINTF_WIDTH_SUPPORT
compile-time options are enabled.
(3) Width field is used with 'l' modifier.

This is an implicit-fallthrough bug, but unfortunately, GCC 10.4 cannot
find this out somehow...


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.4.1 src/sys/lib/libsa/subr_prf.c

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

CVS commit: [netbsd-10] src/sys/lib/libsa

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 14:33:56 UTC 2023

Modified Files:
src/sys/lib/libsa [netbsd-10]: subr_prf.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #185):

sys/lib/libsa/subr_prf.c: revision 1.30

libsa/printf: Do not fetch long va_arg as long long.

This does real harm iff all of the following conditions are satisfied:
(1) On ILP32 architectures.
(2) Both LIBSA_PRINTF_LONGLONG_SUPPORT and LIBSA_PRINTF_WIDTH_SUPPORT
compile-time options are enabled.
(3) Width field is used with 'l' modifier.

This is an implicit-fallthrough bug, but unfortunately, GCC 10.4 cannot
find this out somehow...


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.20.1 src/sys/lib/libsa/subr_prf.c

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

CVS commit: [netbsd-10] src/sys/lib/libsa

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 14:33:56 UTC 2023

Modified Files:
src/sys/lib/libsa [netbsd-10]: subr_prf.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #185):

sys/lib/libsa/subr_prf.c: revision 1.30

libsa/printf: Do not fetch long va_arg as long long.

This does real harm iff all of the following conditions are satisfied:
(1) On ILP32 architectures.
(2) Both LIBSA_PRINTF_LONGLONG_SUPPORT and LIBSA_PRINTF_WIDTH_SUPPORT
compile-time options are enabled.
(3) Width field is used with 'l' modifier.

This is an implicit-fallthrough bug, but unfortunately, GCC 10.4 cannot
find this out somehow...


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.20.1 src/sys/lib/libsa/subr_prf.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/lib/libsa/subr_prf.c
diff -u src/sys/lib/libsa/subr_prf.c:1.29 src/sys/lib/libsa/subr_prf.c:1.29.20.1
--- src/sys/lib/libsa/subr_prf.c:1.29	Sat Jun  6 15:45:47 2020
+++ src/sys/lib/libsa/subr_prf.c	Sat Jun  3 14:33:55 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_prf.c,v 1.29 2020/06/06 15:45:47 thorpej Exp $	*/
+/*	$NetBSD: subr_prf.c,v 1.29.20.1 2023/06/03 14:33:55 martin Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -209,6 +209,7 @@ reswitch:
 	break;
 ++fmt;
 			}
+			goto reswitch;
 #endif
 		case 'l':
 #ifdef LIBSA_PRINTF_LONGLONG_SUPPORT

CVS commit: [netbsd-9] src/external/gpl3/gcc/usr.bin

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 14:24:25 UTC 2023

Modified Files:
src/external/gpl3/gcc/usr.bin/backend [netbsd-9]: Makefile
src/external/gpl3/gcc/usr.bin/common [netbsd-9]: Makefile
src/external/gpl3/gcc/usr.bin/common-target [netbsd-9]: Makefile
src/external/gpl3/gcc/usr.bin/frontend [netbsd-9]: Makefile
src/external/gpl3/gcc/usr.bin/libcpp [netbsd-9]: Makefile
src/external/gpl3/gcc/usr.bin/libdecnumber [netbsd-9]: Makefile

Log Message:
Pull up following revision(s) (requested by lukem in ticket #1635):

external/gpl3/gcc/usr.bin/libdecnumber/Makefile: revision 1.9
external/gpl3/gcc/usr.bin/common/Makefile: revision 1.12
external/gpl3/gcc/usr.bin/backend/Makefile: revision 1.67
external/gpl3/gcc/usr.bin/common-target/Makefile: revision 1.12
external/gpl3/gcc/usr.bin/frontend/Makefile: revision 1.15
external/gpl3/gcc/usr.bin/libcpp/Makefile: revision 1.10

gcc: fix build with clang++ HOST_CXX

Define HOSTPROG_CXX before .include anything that brings in bsd.own.mk.

This ensures that HOST_DBG (etc) gets assigned before HOST_CFLAGS
and HOST_CXXFLAGS is created.
backend: .include  much earlier, as per the other directories.

Fixes backend build when using clang++ as the host compiler (e.g., macOS),
because backend host tools are now built with -O.
Inspired by https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255760

Fixes PR toolchain/57014


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.55.2.1 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.9 -r1.9.2.1 src/external/gpl3/gcc/usr.bin/common/Makefile
cvs rdiff -u -r1.8 -r1.8.2.1 \
src/external/gpl3/gcc/usr.bin/common-target/Makefile
cvs rdiff -u -r1.13 -r1.13.2.1 \
src/external/gpl3/gcc/usr.bin/frontend/Makefile
cvs rdiff -u -r1.8 -r1.8.6.1 src/external/gpl3/gcc/usr.bin/libcpp/Makefile
cvs rdiff -u -r1.7 -r1.7.6.1 \
src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile

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

Modified files:

Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.55 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.55.2.1
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.55	Sat Feb  9 21:03:24 2019
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile	Sat Jun  3 14:24:25 2023
@@ -1,7 +1,11 @@
-#	$NetBSD: Makefile,v 1.55 2019/02/09 21:03:24 maya Exp $
+#	$NetBSD: Makefile,v 1.55.2.1 2023/06/03 14:24:25 martin Exp $
 
+HOSTPROG_CXX=	1
 LIBISPRIVATE=	yes
 
+# For ../Makefile.inc and bsd.own.mk
+.include 
+
 LIB=		backend
 
 SRCS=		${G_OBJS} ${G_out_file:T} regsub.c
@@ -27,10 +31,6 @@ CPPFLAGS.cppdefault.c+=	-DPREFIX=\"/usr\
 
 HOST_CXXFLAGS+=	-std=gnu++98
 
-HOSTPROG_CXX=	1
-
-.include 
-
 HOST_LIBIBERTYOBJ!=	cd ${.CURDIR}/../host-libiberty && ${PRINTOBJDIR}
 
 .include 

Index: src/external/gpl3/gcc/usr.bin/common/Makefile
diff -u src/external/gpl3/gcc/usr.bin/common/Makefile:1.9 src/external/gpl3/gcc/usr.bin/common/Makefile:1.9.2.1
--- src/external/gpl3/gcc/usr.bin/common/Makefile:1.9	Mon Feb  4 04:49:20 2019
+++ src/external/gpl3/gcc/usr.bin/common/Makefile	Sat Jun  3 14:24:25 2023
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.9 2019/02/04 04:49:20 mrg Exp $
+#	$NetBSD: Makefile,v 1.9.2.1 2023/06/03 14:24:25 martin Exp $
 
+HOSTPROG_CXX=	1
 LIBISPRIVATE=	yes
 
 # For ../Makefile.inc and bsd.own.mk
@@ -21,8 +22,6 @@ CPPFLAGS+=	-I${GCCARCH} -I${BACKENDOBJ} 
 MKPIC:=		no
 MKPICLIB:=	no
 
-HOSTPROG_CXX=	1
-
 COPTS.diagnostic.c=	-Wno-stack-protector
 COPTS.intl.c=		-Wno-stack-protector
 

Index: src/external/gpl3/gcc/usr.bin/common-target/Makefile
diff -u src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.8 src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.8.2.1
--- src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.8	Tue Feb  5 04:45:07 2019
+++ src/external/gpl3/gcc/usr.bin/common-target/Makefile	Sat Jun  3 14:24:25 2023
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.8 2019/02/05 04:45:07 mrg Exp $
+#	$NetBSD: Makefile,v 1.8.2.1 2023/06/03 14:24:25 martin Exp $
 
+HOSTPROG_CXX=	1
 LIBISPRIVATE=	yes
 
 # For ../Makefile.inc and bsd.own.mk
@@ -39,8 +40,6 @@ HOST_CPPFLAGS+=	-DGENERATOR_FILE
 MKPIC:=		no
 MKPICLIB:=	no
 
-HOSTPROG_CXX=	1
-
 .include 
 
 # Force using C++ for this

Index: src/external/gpl3/gcc/usr.bin/frontend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.13 src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.13.2.1
--- src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.13	Fri Feb  1 10:32:32 2019
+++ src/external/gpl3/gcc/usr.bin/frontend/Makefile	Sat Jun  3 14:24:25 2023
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.13 2019/02/01 10:32:32 mrg Exp $
+#	$NetBSD: Makefile,v 1.13.2.1 2023/06/03 14:24:25 martin Exp $
 
+HOSTPROG_CXX=	1
 LIBISPRIVATE=	yes
 
 # For ../Makefile.inc and bsd.own.mk
@@ -9,8 +10,6 @@ LIB=		frontend

CVS commit: [netbsd-9] src/external/gpl3/gcc/usr.bin

2023-06-03 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jun  3 14:24:25 UTC 2023

Modified Files:
src/external/gpl3/gcc/usr.bin/backend [netbsd-9]: Makefile
src/external/gpl3/gcc/usr.bin/common [netbsd-9]: Makefile
src/external/gpl3/gcc/usr.bin/common-target [netbsd-9]: Makefile
src/external/gpl3/gcc/usr.bin/frontend [netbsd-9]: Makefile
src/external/gpl3/gcc/usr.bin/libcpp [netbsd-9]: Makefile
src/external/gpl3/gcc/usr.bin/libdecnumber [netbsd-9]: Makefile

Log Message:
Pull up following revision(s) (requested by lukem in ticket #1635):

external/gpl3/gcc/usr.bin/libdecnumber/Makefile: revision 1.9
external/gpl3/gcc/usr.bin/common/Makefile: revision 1.12
external/gpl3/gcc/usr.bin/backend/Makefile: revision 1.67
external/gpl3/gcc/usr.bin/common-target/Makefile: revision 1.12
external/gpl3/gcc/usr.bin/frontend/Makefile: revision 1.15
external/gpl3/gcc/usr.bin/libcpp/Makefile: revision 1.10

gcc: fix build with clang++ HOST_CXX

Define HOSTPROG_CXX before .include anything that brings in bsd.own.mk.

This ensures that HOST_DBG (etc) gets assigned before HOST_CFLAGS
and HOST_CXXFLAGS is created.
backend: .include  much earlier, as per the other directories.

Fixes backend build when using clang++ as the host compiler (e.g., macOS),
because backend host tools are now built with -O.
Inspired by https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255760

Fixes PR toolchain/57014


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.55.2.1 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.9 -r1.9.2.1 src/external/gpl3/gcc/usr.bin/common/Makefile
cvs rdiff -u -r1.8 -r1.8.2.1 \
src/external/gpl3/gcc/usr.bin/common-target/Makefile
cvs rdiff -u -r1.13 -r1.13.2.1 \
src/external/gpl3/gcc/usr.bin/frontend/Makefile
cvs rdiff -u -r1.8 -r1.8.6.1 src/external/gpl3/gcc/usr.bin/libcpp/Makefile
cvs rdiff -u -r1.7 -r1.7.6.1 \
src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile

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

CVS commit: src/distrib/sets/lists/debug

2023-06-03 Thread Taylor R Campbell

Module Name:src
Committed By:   riastradh
Date:   Sat Jun  3 13:20:42 UTC 2023

Modified Files:
src/distrib/sets/lists/debug: shl.mi

Log Message:
ld.elf_so: Fix missing tab in debug/shl.mi in last change.

XXX pullup-10


To generate a diff of this commit:
cvs rdiff -u -r1.310 -r1.311 src/distrib/sets/lists/debug/shl.mi

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

Modified files:

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.310 src/distrib/sets/lists/debug/shl.mi:1.311
--- src/distrib/sets/lists/debug/shl.mi:1.310	Fri Jun  2 19:09:11 2023
+++ src/distrib/sets/lists/debug/shl.mi	Sat Jun  3 13:20:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.310 2023/06/02 19:09:11 riastradh Exp $
+# $NetBSD: shl.mi,v 1.311 2023/06/03 13:20:42 riastradh Exp $
 ./usr/lib/libbfd_g.a		comp-c-debuglib	debuglib,compatfile,binutils
 ./usr/libdata/debug/lib		base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libavl.so.0.0.debug			comp-zfs-debug	debug,dynamicroot,zfs
@@ -371,7 +371,7 @@
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/libh_helper_dso2.so.1.debug	tests-libexec-debug	debug,compattestfile,atf
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/libh_helper_dso3.so.1.debug	tests-libexec-debug	debug,compattestfile,atf
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/libh_helper_ifunc_dso.so.1.debug	tests-libexec-debug	debug,compattestfile,atf
-./usr/libdata/debug/usr/tests/libexec/ld.elf_so/libh_onlyctor_dynamic.so.1.debugtests-libexec-debug	debug,compattestfile,atf
+./usr/libdata/debug/usr/tests/libexec/ld.elf_so/libh_onlyctor_dynamic.so.1.debug	tests-libexec-debug	debug,compattestfile,atf
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/libh_onlydef.so.1.debug		tests-libexec-debug	debug,compattestfile,atf
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/libh_onlyuse_dynamic.so.1.debug	tests-libexec-debug	debug,compattestfile,atf
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/libh_onlyuse_static.so.1.debug	tests-libexec-debug	debug,compattestfile,atf

CVS commit: src/distrib/sets/lists/debug

2023-06-03 Thread Taylor R Campbell

Module Name:src
Committed By:   riastradh
Date:   Sat Jun  3 13:20:42 UTC 2023

Modified Files:
src/distrib/sets/lists/debug: shl.mi

Log Message:
ld.elf_so: Fix missing tab in debug/shl.mi in last change.

XXX pullup-10


To generate a diff of this commit:
cvs rdiff -u -r1.310 -r1.311 src/distrib/sets/lists/debug/shl.mi

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

CVS commit: src/share/man/man5

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 11:13:41 UTC 2023

Modified Files:
src/share/man/man5: mk.conf.5

Log Message:
mk.conf: fix the year


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/share/man/man5/mk.conf.5

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/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.98 src/share/man/man5/mk.conf.5:1.99
--- src/share/man/man5/mk.conf.5:1.98	Thu Jun  1 21:58:05 2023
+++ src/share/man/man5/mk.conf.5	Sat Jun  3 11:13:40 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mk.conf.5,v 1.98 2023/06/01 21:58:05 lukem Exp $
+.\"	$NetBSD: mk.conf.5,v 1.99 2023/06/03 11:13:40 lukem Exp $
 .\"
 .\"  Copyright (c) 1999-2023 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 1, 2022
+.Dd June 3, 2023
 .Dt MK.CONF 5
 .Os
 .\" turn off hyphenation

CVS commit: src/share/man/man5

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 11:13:41 UTC 2023

Modified Files:
src/share/man/man5: mk.conf.5

Log Message:
mk.conf: fix the year


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/share/man/man5/mk.conf.5

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

CVS commit: src/tools/compat

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 09:18:14 UTC 2023

Modified Files:
src/tools/compat: configure

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/tools/compat/configure

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

Modified files:

Index: src/tools/compat/configure
diff -u src/tools/compat/configure:1.102 src/tools/compat/configure:1.103
--- src/tools/compat/configure:1.102	Tue May 30 19:04:42 2023
+++ src/tools/compat/configure	Sat Jun  3 09:18:14 2023
@@ -625,8 +625,14 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 CC_WNO_STRINGOP_TRUNCATION
 CC_WNO_STRINGOP_OVERFLOW
+CC_WNO_RETURN_LOCAL_ADDR
 CC_WNO_MAYBE_UNINITIALIZED
+CC_WNO_IMPLICIT_FALLTHROUGH
 CC_WNO_FORMAT_TRUNCATION
+CC_WNO_FORMAT_OVERFLOW
+CC_WNO_ERROR_ADDRESS_OF_PACKED_MEMBER
+CC_WNO_CAST_FUNCTION_TYPE
+CC_WNO_ADDRESS_OF_PACKED_MEMBER
 CC_NO_CPP_PRECOMP
 ALLOCA
 BSHELL
@@ -6360,6 +6366,190 @@ fi
 
 
 
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$cc_fail_unknown_-Waddress-of-packed-member" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Waddress-of-packed-member" >&5
+$as_echo_n "checking whether C compiler accepts -Waddress-of-packed-member... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS $cc_fail_unknown -Waddress-of-packed-member"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+  CC_WNO_ADDRESS_OF_PACKED_MEMBER=-Wno-address-of-packed-member
+else
+  :
+fi
+
+
+
+
+
+
+
+
+
+
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$cc_fail_unknown_-Wcast-function-type" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wcast-function-type" >&5
+$as_echo_n "checking whether C compiler accepts -Wcast-function-type... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS $cc_fail_unknown -Wcast-function-type"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+  CC_WNO_CAST_FUNCTION_TYPE=-Wno-cast-function-type
+else
+  :
+fi
+
+
+
+
+
+
+
+
+
+
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$cc_fail_unknown_-Werror=address-of-packed-member" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=address-of-packed-member" >&5
+$as_echo_n "checking whether C compiler accepts -Werror=address-of-packed-member... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS $cc_fail_unknown -Werror=address-of-packed-member"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+  CC_WNO_ERROR_ADDRESS_OF_PACKED_MEMBER=-Wno-error=address-of-packed-member
+else
+  :
+fi
+
+
+
+
+
+
+
+
+
+
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$cc_fail_unknown_-Wformat-overflow" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wformat-overflow" >&5
+$as_echo_n "checking whether C compiler accepts -Wformat-overflow... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS $cc_fail_unknown -Wformat-overflow"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+

CVS commit: src/tools/compat

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 09:18:14 UTC 2023

Modified Files:
src/tools/compat: configure

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/tools/compat/configure

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

CVS commit: src/tools/compat

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 09:10:13 UTC 2023

Modified Files:
src/tools/compat: configure.ac defs.mk.in

Log Message:
tools/compat: support all bsd.own.mk disabled warnings

Check the host CC support for all the warnings now in 
and override appropriately in defs.mk.

In general there's a 1:1 mapping, with the special case
CC_WNO_ADDRESS_OF_PACKED_MEMBER which is set from both
@CC_WNO_ADDRESS_OF_PACKED_MEMBER@ (gcc) and
@CC_WNO_ERROR_ADDRESS_OF_PACKED_MEMBER@ (clang).


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/tools/compat/configure.ac
cvs rdiff -u -r1.16 -r1.17 src/tools/compat/defs.mk.in

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

Modified files:

Index: src/tools/compat/configure.ac
diff -u src/tools/compat/configure.ac:1.104 src/tools/compat/configure.ac:1.105
--- src/tools/compat/configure.ac:1.104	Tue May 30 18:54:21 2023
+++ src/tools/compat/configure.ac	Sat Jun  3 09:10:13 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: configure.ac,v 1.104 2023/05/30 18:54:21 lukem Exp $
+#	$NetBSD: configure.ac,v 1.105 2023/06/03 09:10:13 lukem Exp $
 #
 # Autoconf definition file for libnbcompat.
 #
@@ -332,11 +332,16 @@ cc_fail_unknown=
 AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],
  [AS_VAR_APPEND([cc_fail_unknown], [-Werror=unknown-warning-option])])
 
+dnl NB_CC_FLAG(FLAG)
+dnl	Determine if HOST_CC supports FLAG, and
+dnl	sets output variable VAR (derived from FLAG)
+dnl	to FLAG if it is supported.
+dnl
 AC_DEFUN([NB_CC_FLAG], [dnl
 m4_pushdef([NB_FLAG], [$1])
 dnl gcc ignores unknown -Wno-WARN but will fail unknown equivalent -WWARN.
 m4_pushdef([NB_WFLAG], m4_bpatsubst(NB_FLAG, [^-Wno-], [-W]))
-m4_pushdef([NB_VAR], [CC]m4_translit(NB_FLAG, [-a-z], [_A-Z]))
+m4_pushdef([NB_VAR], [CC]m4_translit(NB_FLAG, [-=a-z], [__A-Z]))
 AX_CHECK_COMPILE_FLAG(NB_WFLAG, [AS_VAR_SET(NB_VAR,NB_FLAG)], [], [$cc_fail_unknown])
 AC_SUBST(NB_VAR)
 m4_append([NB_CC_FLAG_VARS], NB_VAR, [ ])
@@ -349,8 +354,14 @@ dnl Disable use of pre-compiled headers 
 NB_CC_FLAG([-no-cpp-precomp])
 
 dnl Detect HOST_CC support for  CC_* warnings
+NB_CC_FLAG([-Wno-address-of-packed-member])
+NB_CC_FLAG([-Wno-cast-function-type])
+NB_CC_FLAG([-Wno-error=address-of-packed-member])
+NB_CC_FLAG([-Wno-format-overflow])
 NB_CC_FLAG([-Wno-format-truncation])
+NB_CC_FLAG([-Wno-implicit-fallthrough])
 NB_CC_FLAG([-Wno-maybe-uninitialized])
+NB_CC_FLAG([-Wno-return-local-addr])
 NB_CC_FLAG([-Wno-stringop-overflow])
 NB_CC_FLAG([-Wno-stringop-truncation])
 
@@ -358,10 +369,8 @@ AC_OUTPUT()
 
 dnl Display results
 dnl
-AC_MSG_NOTICE([= Configuration results =])
-AC_MSG_NOTICE([CC  $CC])
-m4_foreach_w([NB_VAR], NB_CC_FLAG_VARS, [dnl
-AC_MSG_NOTICE(m4_format([%-32s],NB_VAR)[$NB_VAR])
+AC_MSG_NOTICE([= Configuration results =])
+m4_foreach_w([NB_VAR], [CC LIBS ]NB_CC_FLAG_VARS, [dnl
+AC_MSG_NOTICE(m4_format([%-40s],NB_VAR)[$NB_VAR])
 ])
-AC_MSG_NOTICE([LIBS$LIBS])
-AC_MSG_NOTICE([=])
+AC_MSG_NOTICE([])

Index: src/tools/compat/defs.mk.in
diff -u src/tools/compat/defs.mk.in:1.16 src/tools/compat/defs.mk.in:1.17
--- src/tools/compat/defs.mk.in:1.16	Sat Jun  3 09:09:16 2023
+++ src/tools/compat/defs.mk.in	Sat Jun  3 09:10:13 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: defs.mk.in,v 1.16 2023/06/03 09:09:16 lukem Exp $
+#	$NetBSD: defs.mk.in,v 1.17 2023/06/03 09:10:13 lukem Exp $
 #
 # Makefile fragment for building with libnbcompat and associated
 # include files.  It can also be used for building just with
@@ -75,8 +75,13 @@ HOST_CFLAGS+=	@CC_NO_CPP_PRECOMP@
 
 # Override HOST_CC support for  CC_* warnings
 #
+CC_WNO_ADDRESS_OF_PACKED_MEMBER=@CC_WNO_ADDRESS_OF_PACKED_MEMBER@ @CC_WNO_ERROR_ADDRESS_OF_PACKED_MEMBER@
+CC_WNO_CAST_FUNCTION_TYPE=@CC_WNO_CAST_FUNCTION_TYPE@
+CC_WNO_FORMAT_OVERFLOW=@CC_WNO_FORMAT_OVERFLOW@
 CC_WNO_FORMAT_TRUNCATION=@CC_WNO_FORMAT_TRUNCATION@
+CC_WNO_IMPLICIT_FALLTHROUGH=@CC_WNO_IMPLICIT_FALLTHROUGH@
 CC_WNO_MAYBE_UNINITIALIZED=@CC_WNO_MAYBE_UNINITIALIZED@
+CC_WNO_RETURN_LOCAL_ADDR=@CC_WNO_RETURN_LOCAL_ADDR@
 CC_WNO_STRINGOP_OVERFLOW=@CC_WNO_STRINGOP_OVERFLOW@
 CC_WNO_STRINGOP_TRUNCATION=@CC_WNO_STRINGOP_TRUNCATION@

CVS commit: src/tools/compat

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 09:10:13 UTC 2023

Modified Files:
src/tools/compat: configure.ac defs.mk.in

Log Message:
tools/compat: support all bsd.own.mk disabled warnings

Check the host CC support for all the warnings now in 
and override appropriately in defs.mk.

In general there's a 1:1 mapping, with the special case
CC_WNO_ADDRESS_OF_PACKED_MEMBER which is set from both
@CC_WNO_ADDRESS_OF_PACKED_MEMBER@ (gcc) and
@CC_WNO_ERROR_ADDRESS_OF_PACKED_MEMBER@ (clang).


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/tools/compat/configure.ac
cvs rdiff -u -r1.16 -r1.17 src/tools/compat/defs.mk.in

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

CVS commit: src

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 09:09:25 UTC 2023

Modified Files:
src/bin/pax: Makefile
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/lib/netpgp: Makefile
src/crypto/external/bsd/netpgp/lib/verify: Makefile
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssh/bin/ssh-agent: Makefile
src/crypto/external/bsd/openssh/bin/ssh-keygen: Makefile
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/crypto/external/bsd/openssh/lib: Makefile
src/distrib/utils/zcat: Makefile
src/external/apache2/llvm/lib/libLLVMAnalysis: Makefile
src/external/apache2/llvm/librt/libLLVMRuntimeDyld: Makefile
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
src/external/bsd/am-utils/bin/amd: Makefile
src/external/bsd/atf/lib/libatf-c: Makefile
src/external/bsd/fetch/lib: Makefile
src/external/bsd/flex/bin: Makefile
src/external/bsd/ipf: Makefile.inc
src/external/bsd/ipf/bin/ipfstat: Makefile
src/external/bsd/ipf/bin/ipftest: Makefile
src/external/bsd/ipf/bin/ipmon: Makefile
src/external/bsd/iscsi/lib: Makefile
src/external/bsd/libarchive/lib/libarchive: Makefile
src/external/bsd/libpcap/lib: Makefile
src/external/bsd/mdocml/bin/mandoc: Makefile
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/bsd/ntp/bin/ntpq: Makefile
src/external/bsd/ntp/bin/sntp: Makefile
src/external/bsd/ntp/lib/libntp: Makefile
src/external/bsd/ntp/lib/libopts: Makefile
src/external/bsd/openldap/lib/liblber: Makefile
src/external/bsd/openldap/lib/libldap: Makefile.libldap
src/external/bsd/pdisk/bin: Makefile
src/external/bsd/ppp/usr.sbin/pppd: Makefile
src/external/bsd/ppp/usr.sbin/pppstats: Makefile
src/external/bsd/tcpdump/bin: Makefile
src/external/bsd/tmux/usr.bin/tmux: Makefile
src/external/bsd/top/bin: Makefile
src/external/cddl/osnet/lib/libdtrace: Makefile
src/external/cddl/osnet/usr.bin/ctfconvert: Makefile
src/external/cddl/osnet/usr.bin/ctfmerge: Makefile
src/external/gpl2/groff/bin/troff: Makefile
src/external/gpl2/lvm2/lib/libdevmapper: Makefile
src/external/gpl2/lvm2/lib/liblvm: Makefile
src/external/gpl2/xcvs/bin/xcvs: Makefile
src/external/gpl3/gcc: README.warnings
src/external/gpl3/gcc.old: README.warnings
src/external/gpl3/gcc.old/lib/libiberty: Makefile
src/external/gpl3/gcc.old/usr.bin/common-target: Makefile
src/external/gpl3/gcc/lib/libiberty: Makefile
src/external/gpl3/gcc/usr.bin/common-target: Makefile
src/external/mit/lua/lib/liblua: Makefile
src/external/mit/xorg/bin/xauth: Makefile
src/external/mit/xorg/bin/xconsole: Makefile
src/external/mit/xorg/bin/xmh: Makefile
src/external/mit/xorg/lib/libX11: Makefile.ximcp Makefile.xlibi18n
src/external/mit/xorg/lib/libXvMCW: Makefile
src/external/mit/xorg/lib/libxkbfile: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mpl/bind/bin/dnssec/dnssec-verify: Makefile
src/external/mpl/dhcp/bin/relay: Makefile
src/external/mpl/dhcp/bin/server: Makefile
src/external/mpl/dhcp/lib/common: Makefile
src/external/public-domain/sqlite/lib: Makefile
src/external/public-domain/xz/bin/xz: Makefile
src/external/zlib/pigz/bin/pigz: Makefile
src/games/hack: Makefile
src/games/hunt/hunt: Makefile
src/games/hunt/huntd: Makefile
src/games/rogue: Makefile
src/games/tetris: Makefile
src/lib/libc/citrus: Makefile.inc
src/lib/libc/net: Makefile.inc
src/lib/libc/resolv: Makefile.inc
src/lib/libc/rpc: Makefile.inc
src/lib/libedit: Makefile
src/lib/libisns: Makefile
src/lib/libpam/libpam: Makefile
src/lib/libpam/modules/pam_lastlog: Makefile
src/lib/librump: Makefile
src/lib/librumpclient: Makefile
src/lib/librumpres: Makefile
src/lib/librumpuser: Makefile
src/lib/libutil: Makefile
src/lib/libz: Makefile
src/libexec/ftpd: Makefile
src/libexec/lfs_cleanerd: Makefile.inc
src/libexec/rpc.rquotad: Makefile
src/libexec/rpc.rstatd: Makefile
src/libexec/rpc.rusersd: Makefile
src/libexec/rpc.rwalld: Makefile
src/libexec/rpc.sprayd: Makefile
src/sbin/disklabel: Makefile
src/sbin/dump: Makefile
src/sbin/dump_lfs: Makefile
src/sbin/fdisk: Makefile
src/sbin/init: Makefile
src/sbin/iscsictl: Makefile
src/sbin/pppoectl: Makefile
src/sbin/raidctl: Makefile
src/sbin/restore: Makefile

CVS commit: src

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 08:53:01 UTC 2023

Modified Files:
src/external/apache2/llvm/lib/libLLVMInstCombine: Makefile
src/external/apache2/llvm/lib/libLLVMInstrumentation: Makefile
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
src/external/bsd/ipf: Makefile.inc
src/external/bsd/ipf/bin/ipmon: Makefile
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/bsd/tcpdump/bin: Makefile
src/external/bsd/wpa/bin/hostapd: Makefile
src/external/gpl3/gcc: README.warnings
src/external/gpl3/gcc.old: README.warnings
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile
src/lib/libc/net: Makefile.inc
src/libexec/identd: Makefile
src/sbin/dump: Makefile
src/sbin/fsck_ffs: Makefile
src/sbin/fsck_udf: Makefile
src/sbin/fsck_v7fs: Makefile
src/sbin/fsdb: Makefile
src/sbin/newfs: Makefile
src/sbin/newfs_udf: Makefile
src/sbin/newfs_v7fs: Makefile
src/sbin/nvmectl: Makefile
src/share/mk: bsd.kmodule.mk bsd.own.mk
src/sys/arch/bebox/stand/boot: Makefile
src/sys/arch/i386/stand: Makefile.booters
src/sys/arch/i386/stand/boot: Makefile.boot
src/sys/arch/i386/stand/bootxx: Makefile.bootxx
src/sys/arch/i386/stand/efiboot: Makefile.efiboot
src/sys/arch/i386/stand/efiboot/bootx64: Makefile
src/sys/arch/i386/stand/lib: Makefile
src/sys/arch/macppc/stand: Makefile.inc
src/sys/arch/mipsco/stand/installboot: Makefile
src/sys/arch/prep/stand/boot: Makefile
src/sys/arch/sparc/stand/boot: Makefile
src/sys/arch/sparc/stand/bootxx: Makefile
src/sys/arch/sparc/stand/ofwboot: Makefile
src/sys/arch/sun3/conf: Makefile.sun3
src/sys/arch/zaurus/stand: Makefile.inc
src/sys/conf: Makefile.kern.inc copts.mk
src/sys/modules/ffs: Makefile
src/sys/modules/ipl: Makefile
src/sys/modules/npf: Makefile
src/sys/modules/pf: Makefile
src/sys/modules/slcompress: Makefile
src/sys/modules/udf: Makefile
src/sys/modules/v7fs: Makefile
src/sys/rump/fs/lib/libffs: Makefile
src/sys/rump/fs/lib/libmsdos: Makefile
src/sys/rump/fs/lib/libudf: Makefile
src/sys/rump/fs/lib/libv7fs: Makefile
src/sys/rump/fs/lib/libzfs: Makefile
src/sys/rump/net/lib: Makefile.inc
src/sys/stand/efiboot: Makefile.efiboot
src/tests/lib/libc/sys: Makefile
src/usr.bin/kdump: Makefile
src/usr.bin/ktruss: Makefile
src/usr.sbin/bootp/common: Makefile
src/usr.sbin/fstyp: Makefile
src/usr.sbin/installboot: Makefile
src/usr.sbin/makefs/udf: Makefile.inc
src/usr.sbin/map-mbone: Makefile
src/usr.sbin/mrinfo: Makefile
src/usr.sbin/mrouted: Makefile
src/usr.sbin/mtrace: Makefile
src/usr.sbin/ndbootd: Makefile
src/usr.sbin/pf: Makefile.inc
src/usr.sbin/racoon: Makefile

Log Message:
bsd.own.mk: rename to CC_WNO_ADDRESS_OF_PACKED_MEMBER

Provide a single variable
CC_WNO_ADDRESS_OF_PACKED_MEMBER
with options for both clang and gcc, to replace
CLANG_NO_ADDR_OF_PACKED_MEMBER
CC_NO_ADDR_OF_PACKED_MEMBER
GCC_NO_ADDR_OF_PACKED_MEMBER

Using the convention CC_compilerflag, where compilerflag
is based on the full compiler flag name.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/apache2/llvm/lib/libLLVMInstCombine/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/apache2/llvm/lib/libLLVMInstrumentation/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ipf/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ipf/bin/ipmon/Makefile
cvs rdiff -u -r1.29 -r1.30 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/README.warnings
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc.old/README.warnings
cvs rdiff -u -r1.34 -r1.35 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
cvs rdiff -u -r1.92 -r1.93 src/lib/libc/net/Makefile.inc
cvs rdiff -u -r1.19 -r1.20 src/libexec/identd/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sbin/dump/Makefile
cvs rdiff -u -r1.50 -r1.51 src/sbin/fsck_ffs/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sbin/fsck_udf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sbin/fsck_v7fs/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sbin/fsdb/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sbin/newfs/Makefile
cvs rdiff -u -r1.8 -r1.9

CVS commit: src

2023-06-03 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Sat Jun  3 08:53:01 UTC 2023

Modified Files:
src/external/apache2/llvm/lib/libLLVMInstCombine: Makefile
src/external/apache2/llvm/lib/libLLVMInstrumentation: Makefile
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
src/external/bsd/ipf: Makefile.inc
src/external/bsd/ipf/bin/ipmon: Makefile
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/bsd/tcpdump/bin: Makefile
src/external/bsd/wpa/bin/hostapd: Makefile
src/external/gpl3/gcc: README.warnings
src/external/gpl3/gcc.old: README.warnings
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile
src/lib/libc/net: Makefile.inc
src/libexec/identd: Makefile
src/sbin/dump: Makefile
src/sbin/fsck_ffs: Makefile
src/sbin/fsck_udf: Makefile
src/sbin/fsck_v7fs: Makefile
src/sbin/fsdb: Makefile
src/sbin/newfs: Makefile
src/sbin/newfs_udf: Makefile
src/sbin/newfs_v7fs: Makefile
src/sbin/nvmectl: Makefile
src/share/mk: bsd.kmodule.mk bsd.own.mk
src/sys/arch/bebox/stand/boot: Makefile
src/sys/arch/i386/stand: Makefile.booters
src/sys/arch/i386/stand/boot: Makefile.boot
src/sys/arch/i386/stand/bootxx: Makefile.bootxx
src/sys/arch/i386/stand/efiboot: Makefile.efiboot
src/sys/arch/i386/stand/efiboot/bootx64: Makefile
src/sys/arch/i386/stand/lib: Makefile
src/sys/arch/macppc/stand: Makefile.inc
src/sys/arch/mipsco/stand/installboot: Makefile
src/sys/arch/prep/stand/boot: Makefile
src/sys/arch/sparc/stand/boot: Makefile
src/sys/arch/sparc/stand/bootxx: Makefile
src/sys/arch/sparc/stand/ofwboot: Makefile
src/sys/arch/sun3/conf: Makefile.sun3
src/sys/arch/zaurus/stand: Makefile.inc
src/sys/conf: Makefile.kern.inc copts.mk
src/sys/modules/ffs: Makefile
src/sys/modules/ipl: Makefile
src/sys/modules/npf: Makefile
src/sys/modules/pf: Makefile
src/sys/modules/slcompress: Makefile
src/sys/modules/udf: Makefile
src/sys/modules/v7fs: Makefile
src/sys/rump/fs/lib/libffs: Makefile
src/sys/rump/fs/lib/libmsdos: Makefile
src/sys/rump/fs/lib/libudf: Makefile
src/sys/rump/fs/lib/libv7fs: Makefile
src/sys/rump/fs/lib/libzfs: Makefile
src/sys/rump/net/lib: Makefile.inc
src/sys/stand/efiboot: Makefile.efiboot
src/tests/lib/libc/sys: Makefile
src/usr.bin/kdump: Makefile
src/usr.bin/ktruss: Makefile
src/usr.sbin/bootp/common: Makefile
src/usr.sbin/fstyp: Makefile
src/usr.sbin/installboot: Makefile
src/usr.sbin/makefs/udf: Makefile.inc
src/usr.sbin/map-mbone: Makefile
src/usr.sbin/mrinfo: Makefile
src/usr.sbin/mrouted: Makefile
src/usr.sbin/mtrace: Makefile
src/usr.sbin/ndbootd: Makefile
src/usr.sbin/pf: Makefile.inc
src/usr.sbin/racoon: Makefile

Log Message:
bsd.own.mk: rename to CC_WNO_ADDRESS_OF_PACKED_MEMBER

Provide a single variable
CC_WNO_ADDRESS_OF_PACKED_MEMBER
with options for both clang and gcc, to replace
CLANG_NO_ADDR_OF_PACKED_MEMBER
CC_NO_ADDR_OF_PACKED_MEMBER
GCC_NO_ADDR_OF_PACKED_MEMBER

Using the convention CC_compilerflag, where compilerflag
is based on the full compiler flag name.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/apache2/llvm/lib/libLLVMInstCombine/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/apache2/llvm/lib/libLLVMInstrumentation/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ipf/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ipf/bin/ipmon/Makefile
cvs rdiff -u -r1.29 -r1.30 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/README.warnings
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc.old/README.warnings
cvs rdiff -u -r1.34 -r1.35 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
cvs rdiff -u -r1.92 -r1.93 src/lib/libc/net/Makefile.inc
cvs rdiff -u -r1.19 -r1.20 src/libexec/identd/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sbin/dump/Makefile
cvs rdiff -u -r1.50 -r1.51 src/sbin/fsck_ffs/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sbin/fsck_udf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sbin/fsck_v7fs/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sbin/fsdb/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sbin/newfs/Makefile
cvs rdiff -u -r1.8 -r1.9

95 matches

Mail list logo