CVS commit: src/external/gpl3/gcc/lib

2024-02-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Feb 25 06:07:28 UTC 2024

Modified Files:
src/external/gpl3/gcc/lib: Makefile.sanitizer

Log Message:
sanitizer needs at least i586 on x86 and at least v8 on sparc, unfortunately.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc/lib/Makefile.sanitizer

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/lib/Makefile.sanitizer
diff -u src/external/gpl3/gcc/lib/Makefile.sanitizer:1.17 src/external/gpl3/gcc/lib/Makefile.sanitizer:1.18
--- src/external/gpl3/gcc/lib/Makefile.sanitizer:1.17	Thu Aug  3 01:36:54 2023
+++ src/external/gpl3/gcc/lib/Makefile.sanitizer	Sun Feb 25 06:07:28 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sanitizer,v 1.17 2023/08/03 01:36:54 mrg Exp $
+#	$NetBSD: Makefile.sanitizer,v 1.18 2024/02/25 06:07:28 mrg Exp $
 
 SANITIZER=${GCCDIST}/libsanitizer
 .PATH: ${SANITIZER}/interception ${SANITIZER}/sanitizer_common
@@ -123,3 +123,13 @@ COPTS.sanitizer_symbolizer_report.cc += 
 COPTS.ubsan_diag.cc += -O1
 COPTS.ubsan_init.cc += -O1
 .endif
+
+# XXX GCC 12 sanitizers has higher minimal requirements upon some CPUs.
+# - 32-bit SPARC needs v8 to supply eg __sync_add_and_fetch_4
+# - i386 needs i586 for __sync_val_compare_and_swap_8.
+.if ${MACHINE_ARCH} == "sparc"
+COPTS+= -mcpu=v8
+.endif
+.if ${MACHINE_ARCH} == "i386"
+COPTS+= -march=i586
+.endif



CVS commit: src/external/gpl3/gcc/lib

2024-02-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Feb 25 06:07:28 UTC 2024

Modified Files:
src/external/gpl3/gcc/lib: Makefile.sanitizer

Log Message:
sanitizer needs at least i586 on x86 and at least v8 on sparc, unfortunately.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc/lib/Makefile.sanitizer

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



CVS commit: src/external/gpl3/gcc/lib/libiberty

2024-02-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Feb 25 03:55:44 UTC 2024

Modified Files:
src/external/gpl3/gcc/lib/libiberty: defs.mk

Log Message:
regen.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/external/gpl3/gcc/lib/libiberty/defs.mk

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/lib/libiberty/defs.mk
diff -u src/external/gpl3/gcc/lib/libiberty/defs.mk:1.30 src/external/gpl3/gcc/lib/libiberty/defs.mk:1.31
--- src/external/gpl3/gcc/lib/libiberty/defs.mk:1.30	Mon Jul 31 04:46:22 2023
+++ src/external/gpl3/gcc/lib/libiberty/defs.mk	Sun Feb 25 03:55:44 2024
@@ -1,8 +1,8 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.116 2022/07/22 06:50:26 mrg Exp 
+# Generated from: NetBSD: mknative-gcc,v 1.118 2024/02/21 08:24:46 mrg Exp 
 # Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp 
 #
 G_ALLOCA=
 G_EXTRA_OFILES=
-G_LIBOBJS=mempcpy.o strverscmp.o
+G_LIBOBJS=strverscmp.o
 G_REQUIRED_OFILES=regex.o cplus-dem.o cp-demangle.o md5.o sha1.o alloca.o argv.o bsearch_r.o choose-temp.o concat.o cp-demint.o crc32.o d-demangle.o dwarfnames.o dyn-string.o fdmatch.o fibheap.o filedescriptor.o filename_cmp.o floatformat.o fnmatch.o fopen_unlocked.o getopt.o getopt1.o getpwd.o getruntime.o hashtab.o hex.o lbasename.o lrealpath.o make-relative-prefix.o make-temp-file.o objalloc.o obstack.o partition.o pexecute.o physmem.o pex-common.o pex-one.o pex-unix.o vprintf-support.o rust-demangle.o safe-ctype.o simple-object.o simple-object-coff.o simple-object-elf.o simple-object-mach-o.o simple-object-xcoff.o sort.o spaces.o splay-tree.o stack-limit.o strerror.o strsignal.o timeval-utils.o unlink-if-ordinary.o xasprintf.o xatexit.o xexit.o xmalloc.o xmemdup.o xstrdup.o xstrerror.o xstrndup.o xvasprintf.o



CVS commit: src/external/gpl3/gcc/lib/libiberty

2024-02-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Feb 25 03:55:44 UTC 2024

Modified Files:
src/external/gpl3/gcc/lib/libiberty: defs.mk

Log Message:
regen.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/external/gpl3/gcc/lib/libiberty/defs.mk

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



CVS commit: src/tools/gcc

2024-02-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Feb 25 02:24:19 UTC 2024

Modified Files:
src/tools/gcc: gcc-version.mk

Log Message:
version our GCC 12 as "nb2 20240221" now.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/tools/gcc/gcc-version.mk

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

Modified files:

Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.25 src/tools/gcc/gcc-version.mk:1.26
--- src/tools/gcc/gcc-version.mk:1.25	Sun Oct  8 21:52:34 2023
+++ src/tools/gcc/gcc-version.mk	Sun Feb 25 02:24:19 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: gcc-version.mk,v 1.25 2023/10/08 21:52:34 mrg Exp $
+#	$NetBSD: gcc-version.mk,v 1.26 2024/02/25 02:24:19 mrg Exp $
 
 # common location for tools and native build
 
@@ -6,5 +6,5 @@
 NETBSD_GCC_VERSION=nb3 20231008
 .endif
 .if ${HAVE_GCC} == 12
-NETBSD_GCC_VERSION=nb1 20230729
+NETBSD_GCC_VERSION=nb2 20240221
 .endif



CVS commit: src/tools/gcc

2024-02-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Feb 25 02:24:19 UTC 2024

Modified Files:
src/tools/gcc: gcc-version.mk

Log Message:
version our GCC 12 as "nb2 20240221" now.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/tools/gcc/gcc-version.mk

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



CVS commit: src/external/gpl3/gcc

2024-02-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Feb 25 01:21:06 UTC 2024

Modified Files:
src/external/gpl3/gcc/lib/libgcc/arch/m68000: defs.mk
src/external/gpl3/gcc/lib/libgcc/arch/vax: auto-target.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64eb: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsn64eb: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsn64el: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64: c++config.h
defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax: c++config.h defs.mk
gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64: defs.mk gstdint.h
src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64: auto-host.h
configargs.h
src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64eb: auto-host.h
configargs.h
src/external/gpl3/gcc/usr.bin/gcc/arch/alpha: auto-host.h configargs.h
src/external/gpl3/gcc/usr.bin/gcc/arch/earm: auto-host.h configargs.h
src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb: auto-host.h configargs.h
src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf: auto-host.h configargs.h
src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb: auto-host.h
configargs.h
src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4: 

CVS commit: src/external/gpl3/gcc/dist/libsanitizer/tsan

2024-02-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Feb 25 01:12:16 UTC 2024

Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/tsan: tsan_rtl.h

Log Message:
add some missing alignment.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl.h

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



CVS commit: src/external/gpl3/gcc/dist/libsanitizer/tsan

2024-02-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Feb 25 01:12:16 UTC 2024

Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/tsan: tsan_rtl.h

Log Message:
add some missing alignment.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl.h

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

Modified files:

Index: src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl.h
diff -u src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl.h:1.3 src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl.h:1.4
--- src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl.h:1.3	Sun Jul 30 05:51:42 2023
+++ src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl.h	Sun Feb 25 01:12:16 2024
@@ -132,7 +132,7 @@ struct ScopedGlobalProcessor {
 
 // This struct is stored in TLS.
 struct ThreadState {
-  FastState fast_state;
+  FastState fast_state ALIGNED(SANITIZER_CACHE_LINE_SIZE);
   // Synch epoch represents the threads's epoch before the last synchronization
   // action. It allows to reduce number of shadow state updates.
   // For example, fast_synch_epoch=100, last write to addr X was at epoch=150,



CVS commit: src/external/gpl3/gcc/usr.bin

2024-02-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Feb 25 00:28:02 UTC 2024

Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile Makefile.backend
src/external/gpl3/gcc/usr.bin/backend: Makefile
Added Files:
src/external/gpl3/gcc/usr.bin: Makefile.isl

Log Message:
build and link libisl.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/usr.bin/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/Makefile.backend
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/Makefile.isl
cvs rdiff -u -r1.70 -r1.71 src/external/gpl3/gcc/usr.bin/backend/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/Makefile
diff -u src/external/gpl3/gcc/usr.bin/Makefile:1.14 src/external/gpl3/gcc/usr.bin/Makefile:1.15
--- src/external/gpl3/gcc/usr.bin/Makefile:1.14	Tue Aug  1 05:57:53 2023
+++ src/external/gpl3/gcc/usr.bin/Makefile	Sun Feb 25 00:28:02 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2023/08/01 05:57:53 mrg Exp $
+#	$NetBSD: Makefile,v 1.15 2024/02/25 00:28:02 mrg Exp $
 
 NOOBJ=# defined
 
@@ -13,6 +13,7 @@ GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5
 # We keep libcpp here since it depends upon frontend.
 SUBDIR+=	host-libiberty .WAIT \
 		host-libcpp .WAIT \
+		../../../mit/isl/lib/libisl \
 		backend .WAIT \
 		frontend .WAIT \
 		common common-target .WAIT \

Index: src/external/gpl3/gcc/usr.bin/Makefile.backend
diff -u src/external/gpl3/gcc/usr.bin/Makefile.backend:1.10 src/external/gpl3/gcc/usr.bin/Makefile.backend:1.11
--- src/external/gpl3/gcc/usr.bin/Makefile.backend:1.10	Fri Apr 23 01:56:14 2021
+++ src/external/gpl3/gcc/usr.bin/Makefile.backend	Sun Feb 25 00:28:02 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.backend,v 1.10 2021/04/23 01:56:14 mrg Exp $
+#	$NetBSD: Makefile.backend,v 1.11 2024/02/25 00:28:02 mrg Exp $
 
 .ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKEND_
 _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKEND_=1
@@ -21,6 +21,7 @@ LDADD+=			${BACKENDOBJ}/libbackend.a
 .include "../Makefile.common"
 .include "../Makefile.libiberty"
 .include "../Makefile.prog"
+.include "../Makefile.isl"
 
 # Find our (local) libraries
 LIBGMPDIR!=	cd ${GMPDISTDIR}/lib/libgmp && ${PRINTOBJDIR}

Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.70 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.71
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.70	Mon Aug 14 02:21:22 2023
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile	Sun Feb 25 00:28:02 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.70 2023/08/14 02:21:22 rin Exp $
+#	$NetBSD: Makefile,v 1.71 2024/02/25 00:28:02 mrg Exp $
 
 HOSTPROG_CXX=	1
 LIBISPRIVATE=	yes
@@ -188,6 +188,7 @@ genmatch: genmatch.lo build-errors.lo bu
 CLEANFILES+=	genmatch gimple-match.cc generic-match.cc
 
 .include "${.PARSEDIR}/../../Makefile.version_h"
+.include "${.PARSEDIR}/../Makefile.isl"
 
 tm_p.h: Makefile tm-preds.h
 	${_MKTARGET_CREATE}

Added files:

Index: src/external/gpl3/gcc/usr.bin/Makefile.isl
diff -u /dev/null src/external/gpl3/gcc/usr.bin/Makefile.isl:1.1
--- /dev/null	Sun Feb 25 00:28:03 2024
+++ src/external/gpl3/gcc/usr.bin/Makefile.isl	Sun Feb 25 00:28:02 2024
@@ -0,0 +1,15 @@
+#	$NetBSD: Makefile.isl,v 1.1 2024/02/25 00:28:02 mrg Exp $
+
+.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_LIBISL_
+_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_LIBISL_=1
+
+.include 
+
+LIBISL=		${.CURDIR}/../../../../mit/isl
+LIBISLOBJ!=	cd ${LIBISL}/lib/libisl && ${PRINTOBJDIR}
+DPADD+=		${LIBISLOBJ}/libisl.a
+LDADD+=		${LIBISLOBJ}/libisl.a
+
+CFLAGS+=	-I${LIBISL}/dist/include -I${LIBISL}/include
+
+.endif



CVS commit: src/external/gpl3/gcc/usr.bin

2024-02-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Feb 25 00:28:02 UTC 2024

Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile Makefile.backend
src/external/gpl3/gcc/usr.bin/backend: Makefile
Added Files:
src/external/gpl3/gcc/usr.bin: Makefile.isl

Log Message:
build and link libisl.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/usr.bin/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/Makefile.backend
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/Makefile.isl
cvs rdiff -u -r1.70 -r1.71 src/external/gpl3/gcc/usr.bin/backend/Makefile

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



CVS commit: src/sys/dev/scsipi

2024-02-24 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Feb 24 22:06:50 UTC 2024

Modified Files:
src/sys/dev/scsipi: sd.c

Log Message:
Don't try to discover wedges when the unit isn't online.


To generate a diff of this commit:
cvs rdiff -u -r1.335 -r1.336 src/sys/dev/scsipi/sd.c

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



CVS commit: src/sys/dev/scsipi

2024-02-24 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Feb 24 22:06:50 UTC 2024

Modified Files:
src/sys/dev/scsipi: sd.c

Log Message:
Don't try to discover wedges when the unit isn't online.


To generate a diff of this commit:
cvs rdiff -u -r1.335 -r1.336 src/sys/dev/scsipi/sd.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/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.335 src/sys/dev/scsipi/sd.c:1.336
--- src/sys/dev/scsipi/sd.c:1.335	Sun Aug 28 10:26:37 2022
+++ src/sys/dev/scsipi/sd.c	Sat Feb 24 22:06:49 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: sd.c,v 1.335 2022/08/28 10:26:37 mlelstv Exp $	*/
+/*	$NetBSD: sd.c,v 1.336 2024/02/24 22:06:49 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.335 2022/08/28 10:26:37 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.336 2024/02/24 22:06:49 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_scsi.h"
@@ -351,8 +351,9 @@ sdattach(device_t parent, device_t self,
 	}
 	aprint_normal("\n");
 
-	/* Discover wedges on this disk. */
-	dkwedge_discover(>sc_dkdev);
+	/* Discover wedges on this disk if it is online */
+	if (result == SDGP_RESULT_OK)
+		dkwedge_discover(>sc_dkdev);
 
 	/*
 	 * Establish a shutdown hook so that we can ensure that



CVS commit: src/sys/netinet6

2024-02-24 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Feb 24 21:41:13 UTC 2024

Modified Files:
src/sys/netinet6: icmp6.c raw_ip6.c

Log Message:
Deliver timestamps also to raw sockets.
Fixes PR 57955


To generate a diff of this commit:
cvs rdiff -u -r1.255 -r1.256 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.183 -r1.184 src/sys/netinet6/raw_ip6.c

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



CVS commit: src/sys/netinet6

2024-02-24 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Feb 24 21:41:13 UTC 2024

Modified Files:
src/sys/netinet6: icmp6.c raw_ip6.c

Log Message:
Deliver timestamps also to raw sockets.
Fixes PR 57955


To generate a diff of this commit:
cvs rdiff -u -r1.255 -r1.256 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.183 -r1.184 src/sys/netinet6/raw_ip6.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/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.255 src/sys/netinet6/icmp6.c:1.256
--- src/sys/netinet6/icmp6.c:1.255	Sat Dec  9 15:21:02 2023
+++ src/sys/netinet6/icmp6.c	Sat Feb 24 21:41:13 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: icmp6.c,v 1.255 2023/12/09 15:21:02 pgoyette Exp $	*/
+/*	$NetBSD: icmp6.c,v 1.256 2024/02/24 21:41:13 mlelstv Exp $	*/
 /*	$KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.255 2023/12/09 15:21:02 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.256 2024/02/24 21:41:13 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -1987,7 +1987,8 @@ icmp6_rip6_input(struct mbuf **mp, int o
 		}
 #endif
 		else if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) {
-			if (last->inp_flags & IN6P_CONTROLOPTS)
+			if (last->inp_flags & IN6P_CONTROLOPTS ||
+			SOOPT_TIMESTAMP(last->inp_socket->so_options))
 ip6_savecontrol(last, , ip6, n);
 			/* strip intermediate headers */
 			m_adj(n, off);
@@ -2014,7 +2015,8 @@ icmp6_rip6_input(struct mbuf **mp, int o
 	} else
 #endif
 	if (last) {
-		if (last->inp_flags & IN6P_CONTROLOPTS)
+		if (last->inp_flags & IN6P_CONTROLOPTS ||
+		SOOPT_TIMESTAMP(last->inp_socket->so_options))
 			ip6_savecontrol(last, , ip6, m);
 		/* strip intermediate headers */
 		m_adj(m, off);

Index: src/sys/netinet6/raw_ip6.c
diff -u src/sys/netinet6/raw_ip6.c:1.183 src/sys/netinet6/raw_ip6.c:1.184
--- src/sys/netinet6/raw_ip6.c:1.183	Wed Mar 22 03:17:18 2023
+++ src/sys/netinet6/raw_ip6.c	Sat Feb 24 21:41:13 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip6.c,v 1.183 2023/03/22 03:17:18 ozaki-r Exp $	*/
+/*	$NetBSD: raw_ip6.c,v 1.184 2024/02/24 21:41:13 mlelstv Exp $	*/
 /*	$KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.183 2023/03/22 03:17:18 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.184 2024/02/24 21:41:13 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -140,7 +140,8 @@ rip6_sbappendaddr(struct inpcb *last, st
 {
 	struct mbuf *opts = NULL;
 
-	if (last->inp_flags & IN6P_CONTROLOPTS)
+	if (last->inp_flags & IN6P_CONTROLOPTS ||
+	SOOPT_TIMESTAMP(last->inp_socket->so_options))
 		ip6_savecontrol(last, , ip6, n);
 
 	m_adj(n, hlen);



CVS commit: src/sys/netinet

2024-02-24 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Feb 24 21:39:05 UTC 2024

Modified Files:
src/sys/netinet: if_arp.c

Log Message:
Attribute debug message.
Fixes PR 57959


To generate a diff of this commit:
cvs rdiff -u -r1.311 -r1.312 src/sys/netinet/if_arp.c

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

Modified files:

Index: src/sys/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.311 src/sys/netinet/if_arp.c:1.312
--- src/sys/netinet/if_arp.c:1.311	Tue Nov 15 10:47:39 2022
+++ src/sys/netinet/if_arp.c	Sat Feb 24 21:39:05 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_arp.c,v 1.311 2022/11/15 10:47:39 roy Exp $	*/
+/*	$NetBSD: if_arp.c,v 1.312 2024/02/24 21:39:05 mlelstv Exp $	*/
 
 /*
  * Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.311 2022/11/15 10:47:39 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.312 2024/02/24 21:39:05 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -1355,8 +1355,8 @@ arp_llinfo_output(struct ifnet *ifp, __u
 		if (sip.s_addr == INADDR_ANY) {
 			char ipbuf[INET_ADDRSTRLEN];
 
-			log(LOG_DEBUG, "source can't be "
-			"determined: dst=%s\n",
+			log(LOG_DEBUG, "%s: source can't be "
+			"determined: dst=%s\n", __func__,
 			IN_PRINT(ipbuf, ));
 			return;
 		}



CVS commit: src/sys/netinet

2024-02-24 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Feb 24 21:39:05 UTC 2024

Modified Files:
src/sys/netinet: if_arp.c

Log Message:
Attribute debug message.
Fixes PR 57959


To generate a diff of this commit:
cvs rdiff -u -r1.311 -r1.312 src/sys/netinet/if_arp.c

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



CVS commit: src/lib/libm/src

2024-02-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Feb 24 19:32:09 UTC 2024

Modified Files:
src/lib/libm/src: namespace.h s_atanl.c s_remquo.c s_remquof.c
s_remquol.c

Log Message:
fix some fallout from 32-bit fixes for long double functions.

apply namespace.h to remqou*.  add missing weak aliases for some of them,
and normalise checkf for __weak_alias().

now libm.so seems to only have libc undefined symbols.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libm/src/namespace.h
cvs rdiff -u -r1.4 -r1.5 src/lib/libm/src/s_atanl.c \
src/lib/libm/src/s_remquol.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_remquo.c \
src/lib/libm/src/s_remquof.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/libm/src/namespace.h
diff -u src/lib/libm/src/namespace.h:1.18 src/lib/libm/src/namespace.h:1.19
--- src/lib/libm/src/namespace.h:1.18	Sun Jan 21 18:53:18 2024
+++ src/lib/libm/src/namespace.h	Sat Feb 24 19:32:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: namespace.h,v 1.18 2024/01/21 18:53:18 christos Exp $ */
+/* $NetBSD: namespace.h,v 1.19 2024/02/24 19:32:09 mrg Exp $ */
 
 #define atan2 _atan2
 #define atan2f _atan2f
@@ -37,6 +37,10 @@
 #define asinf _asinf
 #define asinl _asinl
 
+#define remquo _remquo
+#define remquof _remquof
+#define remquol _remquol
+
 #define casin _casin
 #define casinf _casinf
 #define casinl _casinl

Index: src/lib/libm/src/s_atanl.c
diff -u src/lib/libm/src/s_atanl.c:1.4 src/lib/libm/src/s_atanl.c:1.5
--- src/lib/libm/src/s_atanl.c:1.4	Sat Feb 24 15:16:53 2024
+++ src/lib/libm/src/s_atanl.c	Sat Feb 24 19:32:09 2024
@@ -19,7 +19,9 @@
 #include "math.h"
 #include "math_private.h"
 
+#ifdef __weak_alias
 __weak_alias(atanl, _atanl)
+#endif
 
 #ifdef __HAVE_LONG_DOUBLE
 
Index: src/lib/libm/src/s_remquol.c
diff -u src/lib/libm/src/s_remquol.c:1.4 src/lib/libm/src/s_remquol.c:1.5
--- src/lib/libm/src/s_remquol.c:1.4	Sat Feb 24 15:16:53 2024
+++ src/lib/libm/src/s_remquol.c	Sat Feb 24 19:32:09 2024
@@ -10,6 +10,9 @@
  */
 
 #include 
+
+#include "namespace.h"
+
 #include 
 #include 
 #include 

Index: src/lib/libm/src/s_remquo.c
diff -u src/lib/libm/src/s_remquo.c:1.1 src/lib/libm/src/s_remquo.c:1.2
--- src/lib/libm/src/s_remquo.c:1.1	Sun Feb  6 01:53:38 2011
+++ src/lib/libm/src/s_remquo.c	Sat Feb 24 19:32:09 2024
@@ -12,11 +12,17 @@
 
 #include 
 
+#include "namespace.h"
+
 #include 
 
 #include "math.h"
 #include "math_private.h"
 
+#ifdef __weak_alias
+__weak_alias(remquo, _remquo)
+#endif
+
 static const double Zero[] = {0.0, -0.0,};
 
 /*
Index: src/lib/libm/src/s_remquof.c
diff -u src/lib/libm/src/s_remquof.c:1.1 src/lib/libm/src/s_remquof.c:1.2
--- src/lib/libm/src/s_remquof.c:1.1	Sun Feb  6 01:53:38 2011
+++ src/lib/libm/src/s_remquof.c	Sat Feb 24 19:32:09 2024
@@ -12,9 +12,15 @@
 
 #include 
 
+#include "namespace.h"
+
 #include "math.h"
 #include "math_private.h"
 
+#ifdef __weak_alias
+__weak_alias(remquof, _remquof)
+#endif
+
 static const float Zero[] = {0.0, -0.0,};
 
 /*



CVS commit: src/lib/libm/src

2024-02-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Feb 24 19:32:09 UTC 2024

Modified Files:
src/lib/libm/src: namespace.h s_atanl.c s_remquo.c s_remquof.c
s_remquol.c

Log Message:
fix some fallout from 32-bit fixes for long double functions.

apply namespace.h to remqou*.  add missing weak aliases for some of them,
and normalise checkf for __weak_alias().

now libm.so seems to only have libc undefined symbols.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libm/src/namespace.h
cvs rdiff -u -r1.4 -r1.5 src/lib/libm/src/s_atanl.c \
src/lib/libm/src/s_remquol.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_remquo.c \
src/lib/libm/src/s_remquof.c

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



CVS commit: src/sys/arch/hp300/stand/mkboot

2024-02-24 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 24 15:34:47 UTC 2024

Modified Files:
src/sys/arch/hp300/stand/mkboot: Makefile mkboot.c

Log Message:
avoid stringop truncation, fix copyright string to prevent assembler warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/mkboot/Makefile
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp300/stand/mkboot/mkboot.c

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



CVS commit: src/sys/arch/hp300/stand/mkboot

2024-02-24 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 24 15:34:47 UTC 2024

Modified Files:
src/sys/arch/hp300/stand/mkboot: Makefile mkboot.c

Log Message:
avoid stringop truncation, fix copyright string to prevent assembler warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/mkboot/Makefile
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp300/stand/mkboot/mkboot.c

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

Modified files:

Index: src/sys/arch/hp300/stand/mkboot/Makefile
diff -u src/sys/arch/hp300/stand/mkboot/Makefile:1.12 src/sys/arch/hp300/stand/mkboot/Makefile:1.13
--- src/sys/arch/hp300/stand/mkboot/Makefile:1.12	Tue Feb 20 11:53:22 2024
+++ src/sys/arch/hp300/stand/mkboot/Makefile	Sat Feb 24 10:34:47 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2024/02/20 16:53:22 christos Exp $
+#	$NetBSD: Makefile,v 1.13 2024/02/24 15:34:47 christos Exp $
 
 WARNS=5
 NOMAN=		# defined
@@ -6,6 +6,4 @@ NOMAN=		# defined
 PROG=		mkboot
 SRCS=		mkboot.c
 
-COPTS.mkboot.c	+=	-Wno-error=stringop-truncation
-
 .include 

Index: src/sys/arch/hp300/stand/mkboot/mkboot.c
diff -u src/sys/arch/hp300/stand/mkboot/mkboot.c:1.14 src/sys/arch/hp300/stand/mkboot/mkboot.c:1.15
--- src/sys/arch/hp300/stand/mkboot/mkboot.c:1.14	Tue Feb 20 11:53:22 2024
+++ src/sys/arch/hp300/stand/mkboot/mkboot.c	Sat Feb 24 10:34:47 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkboot.c,v 1.14 2024/02/20 16:53:22 christos Exp $	*/
+/*	$NetBSD: mkboot.c,v 1.15 2024/02/24 15:34:47 christos Exp $	*/
 
 /*
  * Copyright (c) 1990, 1993
@@ -38,16 +38,15 @@
 #include 
 
 #ifndef lint
-__COPYRIGHT(
-"@(#) Copyright (c) 1990, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n");
+__COPYRIGHT("@(#) Copyright (c) 1990, 1993\
+The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 
 #ifndef lint
 #ifdef notdef
 static char sccsid[] = "@(#)mkboot.c	7.2 (Berkeley) 12/16/90";
 #endif
-__RCSID("$NetBSD: mkboot.c,v 1.14 2024/02/20 16:53:22 christos Exp $");
+__RCSID("$NetBSD: mkboot.c,v 1.15 2024/02/24 15:34:47 christos Exp $");
 #endif /* not lint */
 
 #include 
@@ -91,6 +90,10 @@ char	*lifname(char *);
 int	 putfile(char *, int);
 void	 usage(void);
 
+#define CLEAR(a, b, c)	\
+__CTASSERT(sizeof(b) - 1 == c); \
+memcpy((a), (b), (c))
+
 /*
  * Old Format:
  *	sector 0:	LIF volume header (40 bytes)
@@ -152,7 +155,7 @@ main(int argc, char **argv)
 	if ((to = open(argv[0], O_WRONLY | O_TRUNC | O_CREAT, 0644)) == -1)
 		err(1, "Can't open `%s'", argv[0]);
 	/* clear possibly unused directory entries */
-	strncpy(lifd[1].dir_name, "  ", sizeof(lifd[1].dir_name));
+	CLEAR(lifd[1].dir_name, "  ", sizeof(lifd[1].dir_name));
 	lifd[1].dir_type = htobe16(-1);
 	lifd[1].dir_addr = htobe32(0);
 	lifd[1].dir_length = htobe32(0);
@@ -161,7 +164,7 @@ main(int argc, char **argv)
 	lifd[7] = lifd[6] = lifd[5] = lifd[4] = lifd[3] = lifd[2] = lifd[1];
 	/* record volume info */
 	lifv.vol_id = htobe16(VOL_ID);
-	strncpy(lifv.vol_label, "BOOT43", sizeof(lifv.vol_label));
+	CLEAR(lifv.vol_label, "BOOT43", sizeof(lifv.vol_label));
 	lifv.vol_addr = htobe32(btolifs(LIF_DIRSTART));
 	lifv.vol_oct = htobe16(VOL_OCT);
 	lifv.vol_dirsize = htobe32(btolifs(LIF_DIRSIZE));



Re: CVS commit: [netbsd-10] src

2024-02-24 Thread Takahiro Kambe
In message <20240224130740.b946ff...@cvs.netbsd.org>
on Sat, 24 Feb 2024 13:07:40 +,
"Martin Husemann"  wrote:
> Module Name:  src
> Committed By: martin
> Date: Sat Feb 24 13:07:35 UTC 2024
> 
> Modified Files:
>   src/doc [netbsd-10]: 3RDPARTY
...

It requires below change to build.

diff --git a/distrib/sets/lists/base/shl.mi b/distrib/sets/lists/base/shl.mi
index 95842b5f9f..a36b687897 100644
--- a/distrib/sets/lists/base/shl.mi
+++ b/distrib/sets/lists/base/shl.mi
@@ -915,8 +915,8 @@
 ./usr/lib/libumem.so.0 base-zfs-shlib  
compatfile,zfs
 ./usr/lib/libumem.so.0.0   base-zfs-shlib  
compatfile,zfs
 ./usr/lib/libunbound.sobase-sys-shlib  
compatfile,unbound
-./usr/lib/libunbound.so.8  base-sys-shlib  
compatfile,unbound
-./usr/lib/libunbound.so.8.0base-sys-shlib  
compatfile,unbound
+./usr/lib/libunbound.so.9  base-sys-shlib  
compatfile,unbound
+./usr/lib/libunbound.so.9.0base-sys-shlib  
compatfile,unbound
 ./usr/lib/libusbhid.so base-sys-shlib  
compatfile
 ./usr/lib/libusbhid.so.1   base-sys-shlib  
compatfile
 ./usr/lib/libusbhid.so.1.0 base-sys-shlib  
compatfile

-- 
Takahiro Kambe 


CVS commit: src/lib/libm/src

2024-02-24 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 24 15:16:53 UTC 2024

Modified Files:
src/lib/libm/src: b_tgammal.c e_acoshl.c e_acosl.c e_asinl.c e_atanhl.c
s_asinhl.c s_atanl.c s_cospil.c s_erfl.c s_exp2l.c s_fabsl.c
s_llrintl.c s_logl.c s_lrintl.c s_nearbyint.c s_remquol.c
s_sincosl.c s_sinpil.c s_tanhl.c s_tanpil.c

Log Message:
add missing symbols for non long double architectures.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libm/src/b_tgammal.c \
src/lib/libm/src/e_acoshl.c src/lib/libm/src/e_acosl.c \
src/lib/libm/src/e_asinl.c src/lib/libm/src/e_atanhl.c \
src/lib/libm/src/s_asinhl.c src/lib/libm/src/s_cospil.c \
src/lib/libm/src/s_erfl.c src/lib/libm/src/s_exp2l.c \
src/lib/libm/src/s_sincosl.c src/lib/libm/src/s_sinpil.c \
src/lib/libm/src/s_tanhl.c src/lib/libm/src/s_tanpil.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libm/src/s_atanl.c \
src/lib/libm/src/s_llrintl.c src/lib/libm/src/s_logl.c \
src/lib/libm/src/s_lrintl.c src/lib/libm/src/s_remquol.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libm/src/s_fabsl.c \
src/lib/libm/src/s_nearbyint.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/libm/src/b_tgammal.c
diff -u src/lib/libm/src/b_tgammal.c:1.2 src/lib/libm/src/b_tgammal.c:1.3
--- src/lib/libm/src/b_tgammal.c:1.2	Tue Jan 23 10:45:07 2024
+++ src/lib/libm/src/b_tgammal.c	Sat Feb 24 10:16:53 2024
@@ -1,4 +1,4 @@
-/* 	$NetBSD: b_tgammal.c,v 1.2 2024/01/23 15:45:07 christos Exp $	*/
+/* 	$NetBSD: b_tgammal.c,v 1.3 2024/02/24 15:16:53 christos Exp $	*/
 
 /*-
  * Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 #include 
 #if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: b_tgammal.c,v 1.2 2024/01/23 15:45:07 christos Exp $");
+__RCSID("$NetBSD: b_tgammal.c,v 1.3 2024/02/24 15:16:53 christos Exp $");
 #endif
 
 #include "namespace.h"
@@ -38,13 +38,12 @@ __RCSID("$NetBSD: b_tgammal.c,v 1.2 2024
 #include 
 #include 
 
-
-#ifdef __HAVE_LONG_DOUBLE
-
 #ifdef __weak_alias
 __weak_alias(tgammal,_tgammal)
 #endif
 
+#ifdef __HAVE_LONG_DOUBLE
+
 #if LDBL_MANT_DIG == 64
 #include "../ld80/b_tgammal.c"
 #elif LDBL_MANT_DIG == 113
@@ -55,8 +54,10 @@ __weak_alias(tgammal,_tgammal)
 
 #else
 
-#ifdef __weak_alias
-__weak_alias(tgammal, tgamma)
-#endif
+long double 
+tgammal(long double x)
+{  
+	return tgamma(x);
+}
 
 #endif
Index: src/lib/libm/src/e_acoshl.c
diff -u src/lib/libm/src/e_acoshl.c:1.2 src/lib/libm/src/e_acoshl.c:1.3
--- src/lib/libm/src/e_acoshl.c:1.2	Sat Jan 27 00:50:42 2024
+++ src/lib/libm/src/e_acoshl.c	Sat Feb 24 10:16:53 2024
@@ -22,9 +22,10 @@
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __HAVE_LONG_DOUBLE
 __weak_alias(acoshl, _acoshl)
 
+#ifdef __HAVE_LONG_DOUBLE
+
 /*
  * See e_acosh.c for complete comments.
  *
@@ -92,6 +93,9 @@ acoshl(long double x)
 	}
 }
 #else
-
-__weak_alias(acoshl, acosh)
+long double
+acoshl(long double x)
+{
+	return acosh(x);
+}
 #endif
Index: src/lib/libm/src/e_acosl.c
diff -u src/lib/libm/src/e_acosl.c:1.2 src/lib/libm/src/e_acosl.c:1.3
--- src/lib/libm/src/e_acosl.c:1.2	Sat Jan 27 00:50:42 2024
+++ src/lib/libm/src/e_acosl.c	Sat Feb 24 10:16:53 2024
@@ -24,9 +24,10 @@
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __HAVE_LONG_DOUBLE
 __weak_alias(acosl, _acosl)
 
+#ifdef __HAVE_LONG_DOUBLE
+
 #if LDBL_MANT_DIG == 64
 #include "../ld80/invtrig.h"
 #elif LDBL_MANT_DIG == 113
@@ -99,5 +100,9 @@ acosl(long double x)
 	}
 }
 #else
-__weak_alias(acosl, acos)
+long double
+acosl(long double x)
+{
+	return acos(x);
+}
 #endif
Index: src/lib/libm/src/e_asinl.c
diff -u src/lib/libm/src/e_asinl.c:1.2 src/lib/libm/src/e_asinl.c:1.3
--- src/lib/libm/src/e_asinl.c:1.2	Sat Jan 27 00:50:42 2024
+++ src/lib/libm/src/e_asinl.c	Sat Feb 24 10:16:53 2024
@@ -24,10 +24,10 @@
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __HAVE_LONG_DOUBLE
-
 __weak_alias(asinl, _asinl)
 
+#ifdef __HAVE_LONG_DOUBLE
+
 #if LDBL_MANT_DIG == 64
 #include "../ld80/invtrig.h"
 #elif LDBL_MANT_DIG == 113
@@ -90,5 +90,9 @@ asinl(long double x)
 	if(expsign>0) return t; else return -t;
 }
 #else
-__weak_alias(asinl, _asin)
+long double
+asinl(long double x)
+{
+	return asin(x);
+}
 #endif
Index: src/lib/libm/src/e_atanhl.c
diff -u src/lib/libm/src/e_atanhl.c:1.2 src/lib/libm/src/e_atanhl.c:1.3
--- src/lib/libm/src/e_atanhl.c:1.2	Sat Jan 27 00:50:42 2024
+++ src/lib/libm/src/e_atanhl.c	Sat Feb 24 10:16:53 2024
@@ -22,8 +22,9 @@
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __HAVE_LONG_DOUBLE
 __weak_alias(atanhl, _atanhl)
+
+#ifdef __HAVE_LONG_DOUBLE
 /*
  * See e_atanh.c for complete comments.
  *
@@ -76,5 +77,9 @@ atanhl(long double x)
 	RETURNI((hx & 0x8000) == 0 ? t : -t);
 }
 #else
-__weak_alias(atanhl, atanh)
+long double
+atanhl(long double x)
+{
+	return atanh(x);
+}
 #endif
Index: src/lib/libm/src/s_asinhl.c

CVS commit: src/lib/libm/src

2024-02-24 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 24 15:16:53 UTC 2024

Modified Files:
src/lib/libm/src: b_tgammal.c e_acoshl.c e_acosl.c e_asinl.c e_atanhl.c
s_asinhl.c s_atanl.c s_cospil.c s_erfl.c s_exp2l.c s_fabsl.c
s_llrintl.c s_logl.c s_lrintl.c s_nearbyint.c s_remquol.c
s_sincosl.c s_sinpil.c s_tanhl.c s_tanpil.c

Log Message:
add missing symbols for non long double architectures.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libm/src/b_tgammal.c \
src/lib/libm/src/e_acoshl.c src/lib/libm/src/e_acosl.c \
src/lib/libm/src/e_asinl.c src/lib/libm/src/e_atanhl.c \
src/lib/libm/src/s_asinhl.c src/lib/libm/src/s_cospil.c \
src/lib/libm/src/s_erfl.c src/lib/libm/src/s_exp2l.c \
src/lib/libm/src/s_sincosl.c src/lib/libm/src/s_sinpil.c \
src/lib/libm/src/s_tanhl.c src/lib/libm/src/s_tanpil.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libm/src/s_atanl.c \
src/lib/libm/src/s_llrintl.c src/lib/libm/src/s_logl.c \
src/lib/libm/src/s_lrintl.c src/lib/libm/src/s_remquol.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libm/src/s_fabsl.c \
src/lib/libm/src/s_nearbyint.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/doc

2024-02-24 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 24 13:11:46 UTC 2024

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

Log Message:
Tickets #608 and #609


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.200 -r1.1.2.201 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.200 src/doc/CHANGES-10.0:1.1.2.201
--- src/doc/CHANGES-10.0:1.1.2.200	Fri Feb 23 19:48:51 2024
+++ src/doc/CHANGES-10.0	Sat Feb 24 13:11:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-10.0,v 1.1.2.200 2024/02/23 19:48:51 martin Exp $
+# $NetBSD: CHANGES-10.0,v 1.1.2.201 2024/02/24 13:11:46 martin Exp $
 
 A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16
 until the 10.0 release:
@@ -15651,3 +15651,1271 @@ sys/dev/pci/if_wmreg.h1.131
 	  multiqueue system
 	[msaitoh, ticket #607]
 
+external/bsd/nsd/dist/doc/NSD-VERIFY-MODS   up to 1.1.1.1
+external/bsd/nsd/dist/util/proxy_protocol.c up to 1.1.1.1
+external/bsd/nsd/dist/util/proxy_protocol.h up to 1.1.1.1
+external/bsd/nsd/dist/contrib/autocomplete_nsd-control.bash up to 1.1.1.1
+external/bsd/nsd/dist/SECURITY.md   up to 1.1.1.1
+external/bsd/nsd/dist/udbradtree.c  delete
+external/bsd/nsd/dist/udbradtree.h  delete
+external/bsd/nsd/dist/udbzone.c delete
+external/bsd/nsd/dist/udbzone.h delete
+external/bsd/nsd/dist/.github/FUNDING.yml   delete
+external/bsd/nsd/dist/contrib/nsd.socketdelete
+external/bsd/nsd/Makefile.inc   up to 1.8
+external/bsd/nsd/dist/Makefile.in   up to 1.1.1.9
+external/bsd/nsd/dist/README.md up to 1.1.1.4
+external/bsd/nsd/dist/acx_nlnetlabs.m4  up to 1.1.1.4
+external/bsd/nsd/dist/answer.c  up to 1.1.1.2
+external/bsd/nsd/dist/answer.h  up to 1.1.1.2
+external/bsd/nsd/dist/axfr.cup to 1.1.1.5
+external/bsd/nsd/dist/axfr.hup to 1.1.1.3
+external/bsd/nsd/dist/bitset.h  up to 1.1.1.2
+external/bsd/nsd/dist/buffer.h  up to 1.1.1.2
+external/bsd/nsd/dist/config.h.in   up to 1.1.1.9
+external/bsd/nsd/dist/configlexer.c up to 1.9
+external/bsd/nsd/dist/configlexer.lex   up to 1.1.1.8
+external/bsd/nsd/dist/configparser.cup to 1.9
+external/bsd/nsd/dist/configparser.hup to 1.9
+external/bsd/nsd/dist/configparser.yup to 1.1.1.8
+external/bsd/nsd/dist/configure up to 1.3
+external/bsd/nsd/dist/configure.ac  up to 1.6
+external/bsd/nsd/dist/dbaccess.cup to 1.1.1.6
+external/bsd/nsd/dist/dbcreate.cup to 1.1.1.6
+external/bsd/nsd/dist/difffile.cup to 1.1.1.8
+external/bsd/nsd/dist/difffile.hup to 1.1.1.4
+external/bsd/nsd/dist/dname.h   up to 1.1.1.2
+external/bsd/nsd/dist/dns.h up to 1.1.1.6
+external/bsd/nsd/dist/edns.cup to 1.1.1.4
+external/bsd/nsd/dist/edns.hup to 1.1.1.3
+external/bsd/nsd/dist/ipc.c up to 1.1.1.8
+external/bsd/nsd/dist/ixfr.cup to 1.1.1.2
+external/bsd/nsd/dist/ixfr.hup to 1.1.1.2
+external/bsd/nsd/dist/ixfrcreate.c  up to 1.1.1.2
+external/bsd/nsd/dist/ixfrcreate.h  up to 1.1.1.2
+external/bsd/nsd/dist/namedb.h  up to 1.1.1.5
+external/bsd/nsd/dist/netio.h   up to 1.1.1.2
+external/bsd/nsd/dist/nsd-checkconf.8.inup to 1.1.1.9
+external/bsd/nsd/dist/nsd-checkconf.c   up to 1.1.1.8
+external/bsd/nsd/dist/nsd-checkzone.8.inup to 1.1.1.9
+external/bsd/nsd/dist/nsd-checkzone.c   up to 1.1.1.6
+external/bsd/nsd/dist/nsd-control.8.in  up to 1.1.1.9
+external/bsd/nsd/dist/nsd-control.c up to 1.1.1.9
+external/bsd/nsd/dist/nsd-mem.c up to 1.1.1.5
+external/bsd/nsd/dist/nsd.8.in  up to 1.1.1.9
+external/bsd/nsd/dist/nsd.c up to 1.1.1.9
+external/bsd/nsd/dist/nsd.conf.5.in up to 1.1.1.9
+external/bsd/nsd/dist/nsd.conf.sample.inup to 1.1.1.8
+external/bsd/nsd/dist/nsd.h up to 1.1.1.8
+external/bsd/nsd/dist/nsec3.c   up to 1.1.1.7
+external/bsd/nsd/dist/nsec3.h   up to 1.1.1.4
+external/bsd/nsd/dist/options.c up to 1.5
+external/bsd/nsd/dist/options.h up to 1.1.1.9
+external/bsd/nsd/dist/packet.h  up to 1.1.1.5
+external/bsd/nsd/dist/popen3.h  up to 1.1.1.3
+external/bsd/nsd/dist/query.c   up to 1.1.1.8
+external/bsd/nsd/dist/query.h   up to 1.1.1.5
+external/bsd/nsd/dist/rbtree.h 

CVS commit: [netbsd-10] src/doc

2024-02-24 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 24 13:11:46 UTC 2024

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

Log Message:
Tickets #608 and #609


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.200 -r1.1.2.201 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/sys/arch/evbarm

2024-02-24 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 24 13:10:18 UTC 2024

Modified Files:
src/sys/arch/evbarm/kobo [netbsd-10]: kobo_usb.c
src/sys/arch/evbarm/netwalker [netbsd-10]: netwalker_usb.c

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

sys/arch/evbarm/netwalker/netwalker_usb.c: revision 1.9
sys/arch/evbarm/kobo/kobo_usb.c: revision 1.4

sc_init_md_hook expects two params since interface change in imxusbvar.h rev 1.7
thus adjust kobo_usb_init() and netwalker_usb_init() functions accordingly.

Fixes build for KOBO and NETWALKER(_MD) kernel configs.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.28.1 src/sys/arch/evbarm/kobo/kobo_usb.c
cvs rdiff -u -r1.8 -r1.8.24.1 src/sys/arch/evbarm/netwalker/netwalker_usb.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/arch/evbarm

2024-02-24 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 24 13:10:18 UTC 2024

Modified Files:
src/sys/arch/evbarm/kobo [netbsd-10]: kobo_usb.c
src/sys/arch/evbarm/netwalker [netbsd-10]: netwalker_usb.c

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

sys/arch/evbarm/netwalker/netwalker_usb.c: revision 1.9
sys/arch/evbarm/kobo/kobo_usb.c: revision 1.4

sc_init_md_hook expects two params since interface change in imxusbvar.h rev 1.7
thus adjust kobo_usb_init() and netwalker_usb_init() functions accordingly.

Fixes build for KOBO and NETWALKER(_MD) kernel configs.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.28.1 src/sys/arch/evbarm/kobo/kobo_usb.c
cvs rdiff -u -r1.8 -r1.8.24.1 src/sys/arch/evbarm/netwalker/netwalker_usb.c

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

Modified files:

Index: src/sys/arch/evbarm/kobo/kobo_usb.c
diff -u src/sys/arch/evbarm/kobo/kobo_usb.c:1.3 src/sys/arch/evbarm/kobo/kobo_usb.c:1.3.28.1
--- src/sys/arch/evbarm/kobo/kobo_usb.c:1.3	Wed Jul 24 11:20:55 2019
+++ src/sys/arch/evbarm/kobo/kobo_usb.c	Sat Feb 24 13:10:18 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: kobo_usb.c,v 1.3 2019/07/24 11:20:55 hkenken Exp $	*/
+/*	$NetBSD: kobo_usb.c,v 1.3.28.1 2024/02/24 13:10:18 martin Exp $	*/
 
 /*
  * Copyright (c) 2012  Genetec Corporation.  All rights reserved.
@@ -27,7 +27,7 @@
  *
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kobo_usb.c,v 1.3 2019/07/24 11:20:55 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobo_usb.c,v 1.3.28.1 2024/02/24 13:10:18 martin Exp $");
 
 #include "opt_imx.h"
 
@@ -64,7 +64,7 @@ struct kobo_usbc_softc {
 
 static int	imxusbc_match(device_t, cfdata_t, void *);
 static void	imxusbc_attach(device_t, device_t, void *);
-static void	kobo_usb_init(struct imxehci_softc *);
+static void	kobo_usb_init(struct imxehci_softc *, uintptr_t);
 
 static void	init_otg(struct imxehci_softc *);
 static void	init_h1(struct imxehci_softc *);
@@ -105,7 +105,7 @@ imxusbc_attach(device_t parent, device_t
 }
 
 static void
-kobo_usb_init(struct imxehci_softc *sc)
+kobo_usb_init(struct imxehci_softc *sc, uintptr_t data)
 {
 	switch (sc->sc_unit) {
 	case 0:	/* OTG controller */

Index: src/sys/arch/evbarm/netwalker/netwalker_usb.c
diff -u src/sys/arch/evbarm/netwalker/netwalker_usb.c:1.8 src/sys/arch/evbarm/netwalker/netwalker_usb.c:1.8.24.1
--- src/sys/arch/evbarm/netwalker/netwalker_usb.c:1.8	Wed Jan 15 10:25:47 2020
+++ src/sys/arch/evbarm/netwalker/netwalker_usb.c	Sat Feb 24 13:10:18 2024
@@ -25,7 +25,7 @@
  *
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: netwalker_usb.c,v 1.8 2020/01/15 10:25:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwalker_usb.c,v 1.8.24.1 2024/02/24 13:10:18 martin Exp $");
 
 #include "locators.h"
 
@@ -61,7 +61,7 @@ struct netwalker_usbc_softc {
 
 static int	imxusbc_match(device_t, cfdata_t, void *);
 static void	imxusbc_attach(device_t, device_t, void *);
-static void	netwalker_usb_init(struct imxehci_softc *);
+static void	netwalker_usb_init(struct imxehci_softc *, uintptr_t);
 
 static void	init_otg(struct imxehci_softc *);
 static void	init_h1(struct imxehci_softc *);
@@ -103,7 +103,7 @@ imxusbc_attach(device_t parent, device_t
 }
 
 static void
-netwalker_usb_init(struct imxehci_softc *sc)
+netwalker_usb_init(struct imxehci_softc *sc, uintptr_t data)
 {
 	switch (sc->sc_unit) {
 	case 0:	/* OTG controller */



CVS commit: src/tests/lib/libutil

2024-02-24 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Feb 24 13:00:00 UTC 2024

Modified Files:
src/tests/lib/libutil: t_snprintb.c

Log Message:
tests/snprintb: clean up tests

Always write the value to be formatted in hexadecimal, to make it easily
distinguishable from the buffer size and maximum line length.

Use consistent wording in the comments of the test cases. Be stricter
about mistakes in a format.

Fix some wrong numbers in the snprintb_m tests for limited line length.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/tests/lib/libutil/t_snprintb.c

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



CVS commit: src/tests/lib/libutil

2024-02-24 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Feb 24 13:00:00 UTC 2024

Modified Files:
src/tests/lib/libutil: t_snprintb.c

Log Message:
tests/snprintb: clean up tests

Always write the value to be formatted in hexadecimal, to make it easily
distinguishable from the buffer size and maximum line length.

Use consistent wording in the comments of the test cases. Be stricter
about mistakes in a format.

Fix some wrong numbers in the snprintb_m tests for limited line length.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/tests/lib/libutil/t_snprintb.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/lib/libutil/t_snprintb.c
diff -u src/tests/lib/libutil/t_snprintb.c:1.28 src/tests/lib/libutil/t_snprintb.c:1.29
--- src/tests/lib/libutil/t_snprintb.c:1.28	Sat Feb 24 12:40:00 2024
+++ src/tests/lib/libutil/t_snprintb.c	Sat Feb 24 13:00:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: t_snprintb.c,v 1.28 2024/02/24 12:40:00 rillig Exp $ */
+/* $NetBSD: t_snprintb.c,v 1.29 2024/02/24 13:00:00 rillig Exp $ */
 
 /*
  * Copyright (c) 2002, 2004, 2008, 2010, 2024 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include 
 __COPYRIGHT("@(#) Copyright (c) 2008, 2010, 2024\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_snprintb.c,v 1.28 2024/02/24 12:40:00 rillig Exp $");
+__RCSID("$NetBSD: t_snprintb.c,v 1.29 2024/02/24 13:00:00 rillig Exp $");
 
 #include 
 #include 
@@ -44,15 +44,16 @@ __RCSID("$NetBSD: t_snprintb.c,v 1.28 20
 static const char *
 vis_arr(const char *arr, size_t arrsize)
 {
-	static char buf[6][1024];
+	static char buf[3][1024];
 	static size_t i;
 
 	i = (i + 1) % (sizeof(buf) / sizeof(buf[0]));
-	buf[i][0] = '"';
 	int rv = strnvisx(buf[i] + 1, sizeof(buf[i]) - 2, arr, arrsize,
 	VIS_WHITE | VIS_OCTAL);
-	ATF_REQUIRE_MSG(rv >= 0, "strnvisx failed for size %zu", arrsize);
-	strcpy(buf[i] + 1 + rv, "\"");
+	ATF_REQUIRE_MSG(rv >= 0, "buffer too small for size %zu", arrsize);
+	buf[i][0] = '"';
+	buf[i][1 + rv] = '"';
+	buf[i][1 + rv + 1] = '\0';
 	return buf[i];
 }
 
@@ -73,12 +74,12 @@ check_snprintb_m(const char *file, size_
 		file, line);
 	if (bufsize == 0)
 		want_bufsize = 0;
+	memset(buf, 0x5a, sizeof(buf));
 
-	memset(buf, 'Z', sizeof(buf));
 	int rv = snprintb_m(buf, bufsize, bitfmt, val, line_max);
 
 	size_t have_bufsize = sizeof(buf);
-	while (have_bufsize > 0 && buf[have_bufsize - 1] == 'Z')
+	while (have_bufsize > 0 && buf[have_bufsize - 1] == 0x5a)
 		have_bufsize--;
 	if (rv > 0 && (unsigned)rv < have_bufsize
 	&& buf[rv - 1] == '\0' && buf[rv] == '\0')
@@ -122,7 +123,7 @@ check_snprintb_m(const char *file, size_
 	h_snprintb_m_len(bufsize, bitfmt, val, 0, want_rv, want_buf)
 
 #define	h_snprintb_error(bitfmt, want_buf)\
-	h_snprintb_m_len(1024, bitfmt, 0, 0, -1, want_buf)
+	h_snprintb_m_len(1024, bitfmt, 0x00, 0, -1, want_buf)
 
 #define	h_snprintb_m(bitfmt, val, line_max, want_buf)			\
 	h_snprintb_m_len(1024, bitfmt, val, line_max,			\
@@ -141,7 +142,7 @@ ATF_TC_BODY(snprintb, tc)
 	// The value 0 does not get a leading '0'.
 	h_snprintb(
 	"\010",
-	0,
+	0x00,
 	"0");
 
 	// style and number base, old style, octal, nonzero value
@@ -155,7 +156,7 @@ ATF_TC_BODY(snprintb, tc)
 	// style and number base, old style, decimal, zero value
 	h_snprintb(
 	"\012",
-	0,
+	0x00,
 	"0");
 
 	// style and number base, old style, decimal, nonzero value
@@ -169,7 +170,7 @@ ATF_TC_BODY(snprintb, tc)
 	// The value 0 does not get a leading '0x'.
 	h_snprintb(
 	"\020",
-	0,
+	0x00,
 	"0");
 
 	// style and number base, old style, hexadecimal, nonzero value
@@ -200,7 +201,7 @@ ATF_TC_BODY(snprintb, tc)
 	// The value 0 does not get a leading '0'.
 	h_snprintb(
 	"\177\010",
-	0,
+	0x00,
 	"0");
 
 	// style and number base, new style, octal, nonzero value
@@ -214,7 +215,7 @@ ATF_TC_BODY(snprintb, tc)
 	// style and number base, new style, decimal, zero value
 	h_snprintb(
 	"\177\012",
-	0,
+	0x00,
 	"0");
 
 	// style and number base, new style, decimal, nonzero value
@@ -228,7 +229,7 @@ ATF_TC_BODY(snprintb, tc)
 	// The value 0 does not get a leading '0x'.
 	h_snprintb(
 	"\177\020",
-	0,
+	0x00,
 	"0");
 
 	// style and number base, new style, hexadecimal, nonzero value
@@ -278,7 +279,7 @@ ATF_TC_BODY(snprintb, tc)
 	"\020"
 	"\001bit1"
 	"\041bit33",
-	0x1,
+	0x01,
 	"0x1");
 
 	// old style, repeated bit numbers
@@ -289,14 +290,14 @@ ATF_TC_BODY(snprintb, tc)
 	"\020"
 	"\001once"
 	"\001again",
-	0x1,
+	0x01,
 	"0x1");
 
 	// old style, non-printable description
 	//
 	// The characters ' ' and '\t' are interpreted as bit numbers,
-	// not as part of the description; the visual arrangement is
-	// misleading.
+	// not as part of the description; the visual arrangement in this
+	

CVS commit: src/common/lib/libutil

2024-02-24 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Feb 24 12:44:11 UTC 2024

Modified Files:
src/common/lib/libutil: snprintb.c

Log Message:
snprintb: clean up

Use consistent data types for buffer positions and lengths, to avoid
type casts.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/common/lib/libutil/snprintb.c

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



CVS commit: src/common/lib/libutil

2024-02-24 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Feb 24 12:44:11 UTC 2024

Modified Files:
src/common/lib/libutil: snprintb.c

Log Message:
snprintb: clean up

Use consistent data types for buffer positions and lengths, to avoid
type casts.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/common/lib/libutil/snprintb.c

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

Modified files:

Index: src/common/lib/libutil/snprintb.c
diff -u src/common/lib/libutil/snprintb.c:1.40 src/common/lib/libutil/snprintb.c:1.41
--- src/common/lib/libutil/snprintb.c:1.40	Sat Feb 24 12:40:00 2024
+++ src/common/lib/libutil/snprintb.c	Sat Feb 24 12:44:11 2024
@@ -1,7 +1,7 @@
-/*	$NetBSD: snprintb.c,v 1.40 2024/02/24 12:40:00 rillig Exp $	*/
+/*	$NetBSD: snprintb.c,v 1.41 2024/02/24 12:44:11 rillig Exp $	*/
 
 /*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * Copyright (c) 2002, 2024 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,12 +26,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
- * snprintb: print an interpreted bitmask to a buffer
- *
- * => returns the length of the buffer that would be required to print the
- *string minus the terminating NUL.
- */
 #ifndef _STANDALONE
 # ifndef _KERNEL
 
@@ -40,8 +34,8 @@
 #  endif
 
 #  include 
-#  if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: snprintb.c,v 1.40 2024/02/24 12:40:00 rillig Exp $");
+#  if defined(LIBC_SCCS)
+__RCSID("$NetBSD: snprintb.c,v 1.41 2024/02/24 12:44:11 rillig Exp $");
 #  endif
 
 #  include 
@@ -51,7 +45,7 @@ __RCSID("$NetBSD: snprintb.c,v 1.40 2024
 #  include 
 # else /* ! _KERNEL */
 #  include 
-__KERNEL_RCSID(0, "$NetBSD: snprintb.c,v 1.40 2024/02/24 12:40:00 rillig Exp $");
+__KERNEL_RCSID(0, "$NetBSD: snprintb.c,v 1.41 2024/02/24 12:44:11 rillig Exp $");
 #  include 
 #  include 
 #  include 
@@ -67,10 +61,10 @@ typedef struct {
 	size_t const line_max;
 
 	const char *const num_fmt;
-	unsigned total_len;
-	unsigned line_pos;
-	unsigned comma_pos;
-	char sep;
+	size_t total_len;
+	size_t line_pos;
+	size_t comma_pos;
+	int in_angle_brackets;
 } state;
 
 static void
@@ -94,39 +88,39 @@ store_num(state *s, const char *fmt, uin
 }
 
 static void
-put_eol(state *s)
+store_eol(state *s)
 {
 	if (s->total_len - s->line_pos > s->line_max) {
-		s->total_len = (unsigned)(s->line_pos + s->line_max - 1);
+		s->total_len = s->line_pos + s->line_max - 1;
 		store(s, '#');
 	}
 	store(s, '\0');
 	s->line_pos = s->total_len;
 	s->comma_pos = 0;
-	s->sep = '<';
+	s->in_angle_brackets = 0;
 }
 
 static void
-put_sep(state *s)
+store_delimiter(state *s)
 {
-	if (s->sep == ',') {
+	if (s->in_angle_brackets) {
 		s->comma_pos = s->total_len;
 		store(s, ',');
 	} else {
 		store(s, '<');
-		s->sep = ',';
+		s->in_angle_brackets = 1;
 	}
 }
 
 static void
-wrap_if_necessary(state *s, const char *bitfmt)
+maybe_wrap_line(state *s, const char *bitfmt)
 {
 	if (s->line_max > 0
 	&& s->comma_pos > 0
 	&& s->total_len - s->line_pos >= s->line_max) {
 		s->total_len = s->comma_pos;
 		store(s, '>');
-		put_eol(s);
+		store_eol(s);
 		store_num(s, s->num_fmt, s->val);
 		s->bitfmt = bitfmt;
 	}
@@ -141,10 +135,10 @@ old_style(state *s)
 		if (bit > ' ')
 			return -1;
 		if (s->val & (1U << (bit - 1))) {
-			put_sep(s);
+			store_delimiter(s);
 			while ((uint8_t)*++s->bitfmt > ' ')
 store(s, *s->bitfmt);
-			wrap_if_necessary(s, cur_bitfmt);
+			maybe_wrap_line(s, cur_bitfmt);
 		} else
 			while ((uint8_t)*++s->bitfmt > ' ')
 continue;
@@ -170,10 +164,10 @@ new_style(state *s)
 			s->bitfmt += 2;
 			if (((s->val >> b_bit) & 1) == 0)
 goto skip_description;
-			put_sep(s);
+			store_delimiter(s);
 			while (*s->bitfmt++ != '\0')
 store(s, s->bitfmt[-1]);
-			wrap_if_necessary(s, cur_bitfmt);
+			maybe_wrap_line(s, cur_bitfmt);
 			break;
 		case 'f':
 		case 'F':
@@ -189,14 +183,14 @@ new_style(state *s)
 			if (f_width < 64)
 field &= ((uint64_t) 1 << f_width) - 1;
 			s->bitfmt += 3;
-			put_sep(s);
+			store_delimiter(s);
 			if (kind == 'F')
 goto skip_description;
 			while (*s->bitfmt++ != '\0')
 store(s, s->bitfmt[-1]);
 			store(s, '=');
 			store_num(s, s->num_fmt, field);
-			wrap_if_necessary(s, cur_bitfmt);
+			maybe_wrap_line(s, cur_bitfmt);
 			break;
 		case '=':
 		case ':':
@@ -209,7 +203,7 @@ new_style(state *s)
 store(s, '=');
 			while (*s->bitfmt++ != '\0')
 store(s, s->bitfmt[-1]);
-			wrap_if_necessary(s, prev_bitfmt);
+			maybe_wrap_line(s, prev_bitfmt);
 			break;
 		case '*':
 			s->bitfmt++;
@@ -218,7 +212,7 @@ new_style(state *s)
 			matched = 1;
 			if (store_num(s, s->bitfmt, field) < 0)
 return -1;
-			wrap_if_necessary(s, prev_bitfmt);
+			maybe_wrap_line(s, prev_bitfmt);
 			goto skip_description;
 		default:
 			s->bitfmt += 2;
@@ -235,7 +229,7 @@ static void
 finish_buffer(state 

CVS commit: src

2024-02-24 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Feb 24 12:40:00 UTC 2024

Modified Files:
src/common/lib/libutil: snprintb.c
src/tests/lib/libutil: t_snprintb.c

Log Message:
snprintb: allow non-ASCII descriptions on all platforms

Previously, these descriptions were only allowed on platforms where
plain 'char' is unsigned. On platforms where plain 'char' is signed,
they invoked undefined behavior or terminated the output early.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/common/lib/libutil/snprintb.c
cvs rdiff -u -r1.27 -r1.28 src/tests/lib/libutil/t_snprintb.c

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

Modified files:

Index: src/common/lib/libutil/snprintb.c
diff -u src/common/lib/libutil/snprintb.c:1.39 src/common/lib/libutil/snprintb.c:1.40
--- src/common/lib/libutil/snprintb.c:1.39	Thu Feb 22 21:04:23 2024
+++ src/common/lib/libutil/snprintb.c	Sat Feb 24 12:40:00 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: snprintb.c,v 1.39 2024/02/22 21:04:23 rillig Exp $	*/
+/*	$NetBSD: snprintb.c,v 1.40 2024/02/24 12:40:00 rillig Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 
 #  include 
 #  if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: snprintb.c,v 1.39 2024/02/22 21:04:23 rillig Exp $");
+__RCSID("$NetBSD: snprintb.c,v 1.40 2024/02/24 12:40:00 rillig Exp $");
 #  endif
 
 #  include 
@@ -51,7 +51,7 @@ __RCSID("$NetBSD: snprintb.c,v 1.39 2024
 #  include 
 # else /* ! _KERNEL */
 #  include 
-__KERNEL_RCSID(0, "$NetBSD: snprintb.c,v 1.39 2024/02/22 21:04:23 rillig Exp $");
+__KERNEL_RCSID(0, "$NetBSD: snprintb.c,v 1.40 2024/02/24 12:40:00 rillig Exp $");
 #  include 
 #  include 
 #  include 
@@ -142,11 +142,11 @@ old_style(state *s)
 			return -1;
 		if (s->val & (1U << (bit - 1))) {
 			put_sep(s);
-			while (*++s->bitfmt > ' ')
+			while ((uint8_t)*++s->bitfmt > ' ')
 store(s, *s->bitfmt);
 			wrap_if_necessary(s, cur_bitfmt);
 		} else
-			while (*++s->bitfmt > ' ')
+			while ((uint8_t)*++s->bitfmt > ' ')
 continue;
 	}
 	return 0;

Index: src/tests/lib/libutil/t_snprintb.c
diff -u src/tests/lib/libutil/t_snprintb.c:1.27 src/tests/lib/libutil/t_snprintb.c:1.28
--- src/tests/lib/libutil/t_snprintb.c:1.27	Thu Feb 22 21:04:24 2024
+++ src/tests/lib/libutil/t_snprintb.c	Sat Feb 24 12:40:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: t_snprintb.c,v 1.27 2024/02/22 21:04:24 rillig Exp $ */
+/* $NetBSD: t_snprintb.c,v 1.28 2024/02/24 12:40:00 rillig Exp $ */
 
 /*
  * Copyright (c) 2002, 2004, 2008, 2010, 2024 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include 
 __COPYRIGHT("@(#) Copyright (c) 2008, 2010, 2024\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_snprintb.c,v 1.27 2024/02/22 21:04:24 rillig Exp $");
+__RCSID("$NetBSD: t_snprintb.c,v 1.28 2024/02/24 12:40:00 rillig Exp $");
 
 #include 
 #include 
@@ -300,9 +300,10 @@ ATF_TC_BODY(snprintb, tc)
 	h_snprintb(
 	"\020"
 	"\001least significant"
-	"\002horizontal\ttab",
+	"\002horizontal\ttab"
+	"\003\xC3\xA4",
 	0xff,
-	"0xff");
+	"0xff");
 
 	// old style, empty description
 	//



CVS commit: src

2024-02-24 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Feb 24 12:40:00 UTC 2024

Modified Files:
src/common/lib/libutil: snprintb.c
src/tests/lib/libutil: t_snprintb.c

Log Message:
snprintb: allow non-ASCII descriptions on all platforms

Previously, these descriptions were only allowed on platforms where
plain 'char' is unsigned. On platforms where plain 'char' is signed,
they invoked undefined behavior or terminated the output early.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/common/lib/libutil/snprintb.c
cvs rdiff -u -r1.27 -r1.28 src/tests/lib/libutil/t_snprintb.c

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



CVS commit: src/sys/arch/arm/xscale

2024-02-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sat Feb 24 12:04:16 UTC 2024

Modified Files:
src/sys/arch/arm/xscale: pxa2x0_rtc.c

Log Message:
Declare dt variable in PXARTC_DEBUG guarded blocks, since declarations were
removed in general one (likely as unused).

Fix dt.dt_year format specifier from %02d to expected %02lld.

Pass ch (todr_chip_handle_t), not sc (pxartc_softc) to rtc_wristwatch_gettime().

Fixes PXARTC_DEBUG enabled build (tested on zaurus).


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/xscale/pxa2x0_rtc.c

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

Modified files:

Index: src/sys/arch/arm/xscale/pxa2x0_rtc.c
diff -u src/sys/arch/arm/xscale/pxa2x0_rtc.c:1.7 src/sys/arch/arm/xscale/pxa2x0_rtc.c:1.8
--- src/sys/arch/arm/xscale/pxa2x0_rtc.c:1.7	Thu Jan  2 22:27:15 2020
+++ src/sys/arch/arm/xscale/pxa2x0_rtc.c	Sat Feb 24 12:04:16 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_rtc.c,v 1.7 2020/01/02 22:27:15 thorpej Exp $	*/
+/*	$NetBSD: pxa2x0_rtc.c,v 1.8 2024/02/24 12:04:16 andvar Exp $	*/
 
 /*
  * Copyright (c) 2007 NONAKA Kimihiro 
@@ -22,7 +22,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_rtc.c,v 1.7 2020/01/02 22:27:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_rtc.c,v 1.8 2024/02/24 12:04:16 andvar Exp $");
 
 #include 
 #include 
@@ -123,10 +123,11 @@ pxartc_todr_gettime(todr_chip_handle_t c
 	tv->tv_sec = bus_space_read_4(sc->sc_iot, sc->sc_ioh, RTC_RCNR);
 	tv->tv_usec = 0;
 #ifdef PXARTC_DEBUG
+	struct clock_ymdhms dt;
 	DPRINTF(("%s: RCNR = %08llx\n", device_xname(sc->sc_dev),
 	tv->tv_sec));
 	clock_secs_to_ymdhms(tv->tv_sec, );
-	DPRINTF(("%s: %02d/%02d/%02d %02d:%02d:%02d\n",
+	DPRINTF(("%s: %02lld/%02d/%02d %02d:%02d:%02d\n",
 	device_xname(sc->sc_dev),
 	dt.dt_year, dt.dt_mon, dt.dt_day,
 	dt.dt_hour, dt.dt_min, dt.dt_sec));
@@ -140,10 +141,11 @@ pxartc_todr_settime(todr_chip_handle_t c
 	struct pxartc_softc *sc = ch->cookie;
 
 #ifdef PXARTC_DEBUG
+	struct clock_ymdhms dt;
 	DPRINTF(("%s: RCNR = %08llx\n", device_xname(sc->sc_dev),
 	tv->tv_sec));
 	clock_secs_to_ymdhms(tv->tv_sec, );
-	DPRINTF(("%s: %02d/%02d/%02d %02d:%02d:%02d\n",
+	DPRINTF(("%s: %02lld/%02d/%02d %02d:%02d:%02d\n",
 	device_xname(sc->sc_dev),
 	dt.dt_year, dt.dt_mon, dt.dt_day,
 	dt.dt_hour, dt.dt_min, dt.dt_sec));
@@ -157,7 +159,7 @@ pxartc_todr_settime(todr_chip_handle_t c
 		DPRINTF(("%s: new RCNR = %08x\n", device_xname(sc->sc_dev),
 		cntr));
 		clock_secs_to_ymdhms(cntr, );
-		DPRINTF(("%s: %02d/%02d/%02d %02d:%02d:%02d\n",
+		DPRINTF(("%s: %02lld/%02d/%02d %02d:%02d:%02d\n",
 		device_xname(sc->sc_dev),
 		dt.dt_year, dt.dt_mon, dt.dt_day,
 		dt.dt_hour, dt.dt_min, dt.dt_sec));
@@ -191,7 +193,7 @@ pxartc_wristwatch_gettime(todr_chip_hand
 	dt->dt_mon = (yearr >> RYCR_MONTH_SHIFT) & RYCR_MONTH_MASK;
 	dt->dt_year = (yearr >> RYCR_YEAR_SHIFT) & RYCR_YEAR_MASK;
 
-	DPRINTF(("%s: %02d/%02d/%02d %02d:%02d:%02d\n",
+	DPRINTF(("%s: %02lld/%02d/%02d %02d:%02d:%02d\n",
 	device_xname(sc->sc_dev),
 	dt->dt_year, dt->dt_mon, dt->dt_day,
 	dt->dt_hour, dt->dt_min, dt->dt_sec));
@@ -210,7 +212,7 @@ pxartc_wristwatch_settime(todr_chip_hand
 	DPRINTF(("%s: pxartc_wristwatch_settime()\n",
 		 device_xname(sc->sc_dev)));
 
-	DPRINTF(("%s: %02d/%02d/%02d %02d:%02d:%02d\n",
+	DPRINTF(("%s: %02lld/%02d/%02d %02d:%02d:%02d\n",
 	device_xname(sc->sc_dev),
 	dt->dt_year, dt->dt_mon, dt->dt_day,
 	dt->dt_hour, dt->dt_min, dt->dt_sec));
@@ -242,7 +244,7 @@ pxartc_wristwatch_settime(todr_chip_hand
 #ifdef PXARTC_DEBUG
 	{
 		struct clock_ymdhms dummy;
-		pxartc_wristwatch_gettime(sc, );
+		pxartc_wristwatch_gettime(ch, );
 	}
 #endif
 



CVS commit: src/sys/arch/arm/xscale

2024-02-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sat Feb 24 12:04:16 UTC 2024

Modified Files:
src/sys/arch/arm/xscale: pxa2x0_rtc.c

Log Message:
Declare dt variable in PXARTC_DEBUG guarded blocks, since declarations were
removed in general one (likely as unused).

Fix dt.dt_year format specifier from %02d to expected %02lld.

Pass ch (todr_chip_handle_t), not sc (pxartc_softc) to rtc_wristwatch_gettime().

Fixes PXARTC_DEBUG enabled build (tested on zaurus).


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/xscale/pxa2x0_rtc.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/seq

2024-02-24 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Feb 24 10:10:05 UTC 2024

Modified Files:
src/usr.bin/seq: seq.c

Log Message:
Chose better number format.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/seq/seq.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/seq/seq.c
diff -u src/usr.bin/seq/seq.c:1.12 src/usr.bin/seq/seq.c:1.13
--- src/usr.bin/seq/seq.c:1.12	Sat Mar 20 22:10:17 2021
+++ src/usr.bin/seq/seq.c	Sat Feb 24 10:10:04 2024
@@ -31,7 +31,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 2005\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: seq.c,v 1.12 2021/03/20 22:10:17 cheusov Exp $");
+__RCSID("$NetBSD: seq.c,v 1.13 2024/02/24 10:10:04 mlelstv Exp $");
 #endif /* not lint */
 
 #include 
@@ -56,6 +56,8 @@ __RCSID("$NetBSD: seq.c,v 1.12 2021/03/2
 
 const char *decimal_point = ".";	/* default */
 char default_format[] = { "%g" };	/* default */
+char default_format_fmt[] = { "%%.%uf" };
+#define MAXPRECISION 40
 
 /* Prototypes */
 
@@ -65,9 +67,29 @@ int decimal_places(const char *);
 int numeric(const char *);
 int valid_format(const char *);
 
-char *generate_format(double, double, double, int, char);
+unsigned get_precision(const char *, unsigned);
+char *generate_format(double, double, double, int, char, char *);
 char *unescape(char *);
 
+unsigned
+get_precision(const char *number, unsigned minprec)
+{
+	const char *p;
+	unsigned prec;
+
+	p = strstr(number, decimal_point);
+	if (p) {
+		prec = strlen(number) - (p - number);
+		if (prec > 0)
+			prec -= 1;
+		if (prec > MAXPRECISION)
+			prec = MAXPRECISION;
+	} else
+		prec = 0;
+
+	return prec < minprec ? minprec : prec;
+}
+
 /*
  * The seq command will print out a numeric sequence from 1, the default,
  * to a user specified upper limit by 1.  The lower bound and increment
@@ -79,6 +101,7 @@ main(int argc, char *argv[])
 {
 	int c = 0, errflg = 0;
 	int equalize = 0;
+	unsigned prec;
 	double first = 1.0;
 	double last = 0.0;
 	double incr = 0.0;
@@ -87,6 +110,8 @@ main(int argc, char *argv[])
 	const char *sep = "\n";
 	const char *term = "\n";
 	char pad = ZERO;
+	char buf[6]; /* %.MAXPRECISIONf */
+
 
 	/* Determine the locale's decimal point. */
 	locale = localeconv();
@@ -136,12 +161,16 @@ main(int argc, char *argv[])
 	}
 
 	last = e_atof(argv[argc - 1]);
+	prec = get_precision(argv[argc - 1], 0);
 
-	if (argc > 1)
+	if (argc > 1) {
 		first = e_atof(argv[0]);
+		prec = get_precision(argv[0], prec);
+	}
 	
 	if (argc > 2) {
 		incr = e_atof(argv[1]);
+		prec = get_precision(argv[1], prec);
 		/* Plan 9/GNU don't do zero */
 		if (incr == 0.0)
 			errx(1, "zero %screment", (first < last)? "in" : "de");
@@ -167,8 +196,15 @@ main(int argc, char *argv[])
 	 * XXX to be bug for bug compatible with Plan 9 add a
 		 * newline if none found at the end of the format string.
 		 */
-	} else
-		fmt = generate_format(first, incr, last, equalize, pad);
+	} else {
+		if (prec == 0)
+			fmt = default_format;
+		else {
+			sprintf(buf, default_format_fmt, prec);
+			fmt = buf;
+		}
+		fmt = generate_format(first, incr, last, equalize, pad, fmt);
+	}
 
 	if (incr > 0) {
 		printf(fmt, first);
@@ -428,14 +464,15 @@ decimal_places(const char *number)
  * when "%g" prints as "%e" (this way no width adjustments are made)
  */
 char *
-generate_format(double first, double incr, double last, int equalize, char pad)
+generate_format(double first, double incr, double last,
+int equalize, char pad, char *deffmt)
 {
 	static char buf[256];
 	char cc = '\0';
 	int precision, width1, width2, places;
 
 	if (equalize == 0)
-		return (default_format);
+		return deffmt;
 
 	/* figure out "last" value printed */
 	if (first > last)
@@ -443,12 +480,12 @@ generate_format(double first, double inc
 	else
 		last = first + incr * floor((last - first) / incr);
 
-	sprintf(buf, "%g", incr);
+	sprintf(buf, deffmt, incr);
 	if (strchr(buf, 'e'))
 		cc = 'e';
 	precision = decimal_places(buf);
 
-	width1 = sprintf(buf, "%g", first);
+	width1 = sprintf(buf, deffmt, first);
 	if (strchr(buf, 'e'))
 		cc = 'e';
 	if ((places = decimal_places(buf)))
@@ -456,7 +493,7 @@ generate_format(double first, double inc
 
 	precision = MAX(places, precision);
 
-	width2 = sprintf(buf, "%g", last);
+	width2 = sprintf(buf, deffmt, last);
 	if (strchr(buf, 'e'))
 		cc = 'e';
 	if ((places = decimal_places(buf)))



CVS commit: src/usr.bin/seq

2024-02-24 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Feb 24 10:10:05 UTC 2024

Modified Files:
src/usr.bin/seq: seq.c

Log Message:
Chose better number format.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/seq/seq.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/netstat

2024-02-24 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Feb 24 09:53:26 UTC 2024

Modified Files:
src/usr.bin/netstat: mbuf.c

Log Message:
Don't truncate mo_descr output and protect against missing terminating NUL.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/netstat/mbuf.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/netstat/mbuf.c
diff -u src/usr.bin/netstat/mbuf.c:1.35 src/usr.bin/netstat/mbuf.c:1.36
--- src/usr.bin/netstat/mbuf.c:1.35	Thu Sep  1 10:10:20 2022
+++ src/usr.bin/netstat/mbuf.c	Sat Feb 24 09:53:26 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbuf.c,v 1.35 2022/09/01 10:10:20 msaitoh Exp $	*/
+/*	$NetBSD: mbuf.c,v 1.36 2024/02/24 09:53:26 mlelstv Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "from: @(#)mbuf.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: mbuf.c,v 1.35 2022/09/01 10:10:20 msaitoh Exp $");
+__RCSID("$NetBSD: mbuf.c,v 1.36 2024/02/24 09:53:26 mlelstv Exp $");
 #endif
 #endif /* not lint */
 
@@ -225,7 +225,7 @@ dump_drain:
 
 	for (mo = (void *) data, lines = 0; len >= sizeof(*mo);
 	len -= sizeof(*mo), mo++) {
-		char buf[32];
+		char buf[34];
 		if (vflag == 1 &&
 		mo->mo_counter[MOWNER_COUNTER_CLAIMS] == 0 &&
 		mo->mo_counter[MOWNER_COUNTER_EXT_CLAIMS] == 0 &&
@@ -239,7 +239,7 @@ dump_drain:
 		mo->mo_counter[MOWNER_COUNTER_CLUSTER_CLAIMS] ==
 		mo->mo_counter[MOWNER_COUNTER_CLUSTER_RELEASES])
 			continue;
-		snprintf(buf, sizeof(buf), "%16.16s %-13s",
+		snprintf(buf, sizeof(buf), "%16.16s %-13.16s",
 		mo->mo_name, mo->mo_descr);
 		if ((lines % 24) == 0 || lines > 24) {
 			printf("%30s %-8s %10s %10s %10s\n",



CVS commit: src/usr.bin/netstat

2024-02-24 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Feb 24 09:53:26 UTC 2024

Modified Files:
src/usr.bin/netstat: mbuf.c

Log Message:
Don't truncate mo_descr output and protect against missing terminating NUL.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/netstat/mbuf.c

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



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

2024-02-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sat Feb 24 08:56:07 UTC 2024

Modified Files:
src/sys/arch/evbarm/conf: README.evbarm

Log Message:
Remove OMAP5EVM kernel config from README.evbarm, it was retired a while ago.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/conf/README.evbarm

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

Modified files:

Index: src/sys/arch/evbarm/conf/README.evbarm
diff -u src/sys/arch/evbarm/conf/README.evbarm:1.39 src/sys/arch/evbarm/conf/README.evbarm:1.40
--- src/sys/arch/evbarm/conf/README.evbarm:1.39	Sat Oct 29 13:24:35 2022
+++ src/sys/arch/evbarm/conf/README.evbarm	Sat Feb 24 08:56:07 2024
@@ -1,4 +1,4 @@
-$NetBSD: README.evbarm,v 1.39 2022/10/29 13:24:35 jmcneill Exp $
+$NetBSD: README.evbarm,v 1.40 2024/02/24 08:56:07 andvar Exp $
 
 config		date		boards
 ---
@@ -39,7 +39,6 @@ MV2120		2011/07/20	HP Media Vault MV2011
 NAPPI		2002/07/15	Netwise APlication Platform Board
 NETWALKER	2010/11/13	Sharp NetWalker
 NSLU2		2006/02/28	Linksys NSLU2 (a.k.a. "Slug")
-OMAP5EVM	2013/07/16	TI OMAP 5 based boards
 OPENBLOCKS_A6	2012/08/01	Plat'Home. OpenBlockS A6
 OPENBLOCKS_AX3	2013/09/30	Plat'Home. OpenBlockS AX3
 OPENRD		2012/08/10	open-rd.org Marvell Orion board



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

2024-02-24 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sat Feb 24 08:56:07 UTC 2024

Modified Files:
src/sys/arch/evbarm/conf: README.evbarm

Log Message:
Remove OMAP5EVM kernel config from README.evbarm, it was retired a while ago.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/conf/README.evbarm

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