CVS commit: src/crypto/external/bsd/openssh/bin

2024-06-05 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Wed Jun  5 10:50:37 UTC 2024

Modified Files:
src/crypto/external/bsd/openssh/bin: Makefile.inc

Log Message:
openssh/bin: Use ${EXTERNAL_OPENSSL_SUBDIR} instead of `openssl`

NFC at the moment; for consistency in the future, when
we use `openssl.old` again.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/bin/Makefile.inc

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



CVS commit: src/crypto/external/bsd/openssh/bin

2024-06-05 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Wed Jun  5 10:50:37 UTC 2024

Modified Files:
src/crypto/external/bsd/openssh/bin: Makefile.inc

Log Message:
openssh/bin: Use ${EXTERNAL_OPENSSL_SUBDIR} instead of `openssl`

NFC at the moment; for consistency in the future, when
we use `openssl.old` again.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/bin/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/crypto/external/bsd/openssh/bin/Makefile.inc
diff -u src/crypto/external/bsd/openssh/bin/Makefile.inc:1.4 src/crypto/external/bsd/openssh/bin/Makefile.inc:1.5
--- src/crypto/external/bsd/openssh/bin/Makefile.inc:1.4	Wed Dec 20 17:15:20 2023
+++ src/crypto/external/bsd/openssh/bin/Makefile.inc	Wed Jun  5 10:50:37 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.4 2023/12/20 17:15:20 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2024/06/05 10:50:37 rin Exp $
 
 CPPFLAGS+=-DWITH_OPENSSL
 
@@ -6,7 +6,7 @@ CRYPTOBSD=${NETBSDSRCDIR}/crypto/externa
 
 PROGDPLIBS+= \
 ssh ${CRYPTOBSD}/openssh/lib \
-crypto ${CRYPTOBSD}/openssl/lib/libcrypto \
+crypto ${CRYPTOBSD}/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto \
 crypt ${NETBSDSRCDIR}/lib/libcrypt \
 z ${NETBSDSRCDIR}/lib/libz
 



CVS commit: src/sys/arch

2024-06-05 Thread Nathanial Sloss
Module Name:src
Committed By:   nat
Date:   Wed Jun  5 11:01:47 UTC 2024

Modified Files:
src/sys/arch/mac68k/dev: aed.c
src/sys/arch/macppc/dev: aed.c

Log Message:
Pass event up to adb device.

While here do the same for macppc.

Addresses PR/58303


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/mac68k/dev/aed.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/macppc/dev/aed.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

2024-06-05 Thread Nathanial Sloss
Module Name:src
Committed By:   nat
Date:   Wed Jun  5 11:01:47 UTC 2024

Modified Files:
src/sys/arch/mac68k/dev: aed.c
src/sys/arch/macppc/dev: aed.c

Log Message:
Pass event up to adb device.

While here do the same for macppc.

Addresses PR/58303


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/mac68k/dev/aed.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/macppc/dev/aed.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/mac68k/dev/aed.c
diff -u src/sys/arch/mac68k/dev/aed.c:1.38 src/sys/arch/mac68k/dev/aed.c:1.39
--- src/sys/arch/mac68k/dev/aed.c:1.38	Sun Sep 26 16:36:18 2021
+++ src/sys/arch/mac68k/dev/aed.c	Wed Jun  5 11:01:47 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: aed.c,v 1.38 2021/09/26 16:36:18 thorpej Exp $	*/
+/*	$NetBSD: aed.c,v 1.39 2024/06/05 11:01:47 nat Exp $	*/
 
 /*
  * Copyright (C) 1994	Bradley A. Grantham
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.38 2021/09/26 16:36:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.39 2024/06/05 11:01:47 nat Exp $");
 
 #include "opt_adb.h"
 
@@ -164,6 +164,7 @@ aed_input(adb_event_t *event)
 			aed_dokeyupdown(&new_event);
 		break;
 	case ADBADDR_MS:
+		event->u.m.buttons |= aed_sc->sc_buttons;
 		new_event.u.m.buttons |= aed_sc->sc_buttons;
 		aed_handoff(&new_event);
 		break;

Index: src/sys/arch/macppc/dev/aed.c
diff -u src/sys/arch/macppc/dev/aed.c:1.34 src/sys/arch/macppc/dev/aed.c:1.35
--- src/sys/arch/macppc/dev/aed.c:1.34	Sun Sep 26 16:36:19 2021
+++ src/sys/arch/macppc/dev/aed.c	Wed Jun  5 11:01:47 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: aed.c,v 1.34 2021/09/26 16:36:19 thorpej Exp $	*/
+/*	$NetBSD: aed.c,v 1.35 2024/06/05 11:01:47 nat Exp $	*/
 
 /*
  * Copyright (C) 1994	Bradley A. Grantham
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.34 2021/09/26 16:36:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.35 2024/06/05 11:01:47 nat Exp $");
 
 #include 
 #include 
@@ -167,6 +167,7 @@ aed_input(adb_event_t *event)
 			aed_dokeyupdown(&new_event);
 		break;
 	case ADBADDR_MS:
+		event->u.m.buttons |= aed_sc->sc_buttons;
 		new_event.u.m.buttons |= aed_sc->sc_buttons;
 		aed_handoff(&new_event);
 		break;



CVS commit: src/distrib/sets/lists

2024-06-05 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Jun  5 14:16:31 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: ad.aarch64
src/distrib/sets/lists/debug32: ad.aarch64

Log Message:
Fix some more aarch64 compat set list issues.

- libc_vfp, which implements the arm32 softfloat ABI in terms of CPU
  hardfloat instructions instead of emulation through CPU integer
  instructions, is always built for eabi, never built for eabihf.
  => aarch64 doesn't have a softfloat ABI, so making it conditional
 on softfloat doesn't make sense.
  => eabi is always a softfloat ABI, so this is always built for
 compat eabi.
  => eabihf is always a hardfloat ABI, so this is never built for
 compat eabihf.

- libc++ needs to be there but conditional on libcxx.

- libproc needs to be there but conditional on dtrace.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base32/ad.aarch64
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug32/ad.aarch64

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

2024-06-05 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Jun  5 14:16:31 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: ad.aarch64
src/distrib/sets/lists/debug32: ad.aarch64

Log Message:
Fix some more aarch64 compat set list issues.

- libc_vfp, which implements the arm32 softfloat ABI in terms of CPU
  hardfloat instructions instead of emulation through CPU integer
  instructions, is always built for eabi, never built for eabihf.
  => aarch64 doesn't have a softfloat ABI, so making it conditional
 on softfloat doesn't make sense.
  => eabi is always a softfloat ABI, so this is always built for
 compat eabi.
  => eabihf is always a hardfloat ABI, so this is never built for
 compat eabihf.

- libc++ needs to be there but conditional on libcxx.

- libproc needs to be there but conditional on dtrace.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base32/ad.aarch64
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug32/ad.aarch64

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/base32/ad.aarch64
diff -u src/distrib/sets/lists/base32/ad.aarch64:1.5 src/distrib/sets/lists/base32/ad.aarch64:1.6
--- src/distrib/sets/lists/base32/ad.aarch64:1.5	Mon Jun  3 18:47:23 2024
+++ src/distrib/sets/lists/base32/ad.aarch64	Wed Jun  5 14:16:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.5 2024/06/03 18:47:23 riastradh Exp $
+# $NetBSD: ad.aarch64,v 1.6 2024/06/05 14:16:31 riastradh Exp $
 ./lib/eabi	base-compat-shlib	compat
 ./lib/eabi/npf	base-compat-shlib	compat,npf
 ./lib/eabi/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -143,9 +143,9 @@
 ./usr/lib/eabi/libc.sobase-compat-shlib	compat
 ./usr/lib/eabi/libc.so.12			base-compat-shlib	compat
 ./usr/lib/eabi/libc.so.12.221			base-compat-shlib	compat
-./usr/lib/eabi/libc_vfp.so			base-compat-shlib	compat,softfloat
-./usr/lib/eabi/libc_vfp.so.0			base-compat-shlib	compat,softfloat
-./usr/lib/eabi/libc_vfp.so.0.0			base-compat-shlib	compat,softfloat
+./usr/lib/eabi/libc_vfp.so			base-compat-shlib	compat
+./usr/lib/eabi/libc_vfp.so.0			base-compat-shlib	compat
+./usr/lib/eabi/libc_vfp.so.0.0			base-compat-shlib	compat
 ./usr/lib/eabi/libcbor.so			base-compat-shlib	compat
 ./usr/lib/eabi/libcbor.so.0			base-compat-shlib	compat
 ./usr/lib/eabi/libcbor.so.0.5			base-compat-shlib	compat
@@ -657,9 +657,6 @@
 ./usr/lib/eabihf/libc.sobase-compat-shlib	compat
 ./usr/lib/eabihf/libc.so.12			base-compat-shlib	compat
 ./usr/lib/eabihf/libc.so.12.221			base-compat-shlib	compat
-./usr/lib/eabihf/libc_vfp.so			base-compat-shlib	compat,softfloat
-./usr/lib/eabihf/libc_vfp.so.0			base-compat-shlib	compat,softfloat
-./usr/lib/eabihf/libc_vfp.so.0.0		base-compat-shlib	compat,softfloat
 ./usr/lib/eabihf/libcbor.so			base-compat-shlib	compat
 ./usr/lib/eabihf/libcbor.so.0			base-compat-shlib	compat
 ./usr/lib/eabihf/libcbor.so.0.5			base-compat-shlib	compat

Index: src/distrib/sets/lists/debug32/ad.aarch64
diff -u src/distrib/sets/lists/debug32/ad.aarch64:1.6 src/distrib/sets/lists/debug32/ad.aarch64:1.7
--- src/distrib/sets/lists/debug32/ad.aarch64:1.6	Mon Jun  3 18:47:23 2024
+++ src/distrib/sets/lists/debug32/ad.aarch64	Wed Jun  5 14:16:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.6 2024/06/03 18:47:23 riastradh Exp $
+# $NetBSD: ad.aarch64,v 1.7 2024/06/05 14:16:31 riastradh Exp $
 ./usr/lib/eabi/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabi/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabi/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -371,8 +371,9 @@
 ./usr/libdata/debug/usr/lib/eabi/libbozohttpd.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabi/libbsdmalloc.so.0.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabi/libbz2.so.1.1.debug	comp-sys-debug	debug,compat
+./usr/libdata/debug/usr/lib/eabi/libc++.so.1.0.debug		comp-sys-debug	debug,libcxx
 ./usr/libdata/debug/usr/lib/eabi/libc.so.12.221.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/eabi/libc_vfp.so.0.0.debug	comp-sys-debug	debug,compat,softfloat
+./usr/libdata/debug/usr/lib/eabi/libc_vfp.so.0.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabi/libcbor.so.0.5.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabi/libcom_err.so.8.0.debug	comp-sys-debug	debug,compat,kerberos
 ./usr/libdata/debug/usr/lib/eabi/libcrypt.so.1.0.debug	comp-sys-debug	debug,compat
@@ -447,6 +448,7 @@
 ./usr/libdata/debug/usr/lib/eabi/libperfuse.so.0.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabi/libposix.so.0.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabi/libppath.so.0.0.debug	comp-sys-debug	debug,compat
+./usr/libdata/debug/usr/lib/eabi/libproc.so.1.0.debug	comp-sys-debug	debug,compat,dtrace
 ./usr/libdata/debug/usr/lib/eabi/libprop.so.1.2.debug	comp-sys-debu

CVS commit: src/etc/etc.mac68k

2024-06-05 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Wed Jun  5 15:07:13 UTC 2024

Modified Files:
src/etc/etc.mac68k: Makefile.inc

Log Message:
Exclude debug.tgz and xdebug.tgz from mac68k ISO to save ~320MB.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/etc/etc.mac68k/Makefile.inc

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



CVS commit: src/etc/etc.mac68k

2024-06-05 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Wed Jun  5 15:07:13 UTC 2024

Modified Files:
src/etc/etc.mac68k: Makefile.inc

Log Message:
Exclude debug.tgz and xdebug.tgz from mac68k ISO to save ~320MB.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/etc/etc.mac68k/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/etc/etc.mac68k/Makefile.inc
diff -u src/etc/etc.mac68k/Makefile.inc:1.25 src/etc/etc.mac68k/Makefile.inc:1.26
--- src/etc/etc.mac68k/Makefile.inc:1.25	Fri May 31 20:57:32 2024
+++ src/etc/etc.mac68k/Makefile.inc	Wed Jun  5 15:07:13 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.25 2024/05/31 20:57:32 tsutsui Exp $
+#	$NetBSD: Makefile.inc,v 1.26 2024/06/05 15:07:13 tsutsui Exp $
 #
 #	etc.mac68k/Makefile.inc -- mac68k-specific etc Makefile targets
 #
@@ -20,5 +20,7 @@ snap_md_post:
 # mkisofs arguments to create a hybrid (HFS/Rockridge) CD-ROM image.
 MKISOFS_FLAGS+=	-hfs --macbin \
 	-map ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/extensions.map
+# exclude large debug sets to avoid possible 700MB overflow
+MKISOFS_FLAGS+=	-m debug.tgz -m xdebug.tgz
 
 iso-image: do-iso-image



CVS commit: src/external/mit/xorg/lib

2024-06-05 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Jun  5 15:12:03 UTC 2024

Modified Files:
src/external/mit/xorg/lib: driver.mk

Log Message:
Mesa: Build u_format_unpack_neon.c with -mfpu=neon on clang arm32.

Attempting to address this failure in the clang build, without
breaking anything that's not clang and not arm32:

In file included from 
/home/source/ab/HEAD-llvm/xsrc/external/mit/MesaLib/dist/src/util/format/u_format_unpack_neon.c:35:
/home/builds/ab/HEAD-llvm/evbarm-earmv6hf/202406041020Z-obj/home/source/ab/HEAD-llvm/src/external/apache2/llvm/include/arm_neon.h:32:2:
 error: "NEON support not enabled"
#error "NEON support not enabled"
 ^


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/driver.mk

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



CVS commit: src/external/mit/xorg/lib

2024-06-05 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Jun  5 15:12:03 UTC 2024

Modified Files:
src/external/mit/xorg/lib: driver.mk

Log Message:
Mesa: Build u_format_unpack_neon.c with -mfpu=neon on clang arm32.

Attempting to address this failure in the clang build, without
breaking anything that's not clang and not arm32:

In file included from 
/home/source/ab/HEAD-llvm/xsrc/external/mit/MesaLib/dist/src/util/format/u_format_unpack_neon.c:35:
/home/builds/ab/HEAD-llvm/evbarm-earmv6hf/202406041020Z-obj/home/source/ab/HEAD-llvm/src/external/apache2/llvm/include/arm_neon.h:32:2:
 error: "NEON support not enabled"
#error "NEON support not enabled"
 ^


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/driver.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/mit/xorg/lib/driver.mk
diff -u src/external/mit/xorg/lib/driver.mk:1.6 src/external/mit/xorg/lib/driver.mk:1.7
--- src/external/mit/xorg/lib/driver.mk:1.6	Wed Nov 22 17:48:35 2023
+++ src/external/mit/xorg/lib/driver.mk	Wed Jun  5 15:12:03 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: driver.mk,v 1.6 2023/11/22 17:48:35 rjs Exp $
+#	$NetBSD: driver.mk,v 1.7 2024/06/05 15:12:03 riastradh Exp $
 
 # stuff both dri and gallium drivers need.
 
@@ -82,6 +82,9 @@ SRCS.format= \
 	u_format_zs.c \
 	u_format_table.c
 
+CPUFLAGS.u_format_unpack_neon.c+=	\
+	${${MACHINE_CPU} == "arm" && ${ACTIVE_CC} == "clang":?-mfpu=neon:}
+
 .for _f in ${SRCS.format}
 CPPFLAGS.${_f} +=	-I${X11SRCDIR.Mesa}/src/util/format
 CPPFLAGS.${_f} +=	-I${X11SRCDIR.Mesa}/../src/util/format



CVS commit: src/tests/lib/libcurses/tests

2024-06-05 Thread Valery Ushakov
Module Name:src
Committed By:   uwe
Date:   Wed Jun  5 16:09:59 UTC 2024

Modified Files:
src/tests/lib/libcurses/tests: curs_set

Log Message:
adjust initial cursor state to reflect reality

Missed in PR bin/58090
Fixes PR lib/58313


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/tests/curs_set

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



CVS commit: src/tests/lib/libcurses/tests

2024-06-05 Thread Valery Ushakov
Module Name:src
Committed By:   uwe
Date:   Wed Jun  5 16:09:59 UTC 2024

Modified Files:
src/tests/lib/libcurses/tests: curs_set

Log Message:
adjust initial cursor state to reflect reality

Missed in PR bin/58090
Fixes PR lib/58313


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/tests/curs_set

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/libcurses/tests/curs_set
diff -u src/tests/lib/libcurses/tests/curs_set:1.1 src/tests/lib/libcurses/tests/curs_set:1.2
--- src/tests/lib/libcurses/tests/curs_set:1.1	Sun Apr 10 09:55:10 2011
+++ src/tests/lib/libcurses/tests/curs_set	Wed Jun  5 16:09:59 2024
@@ -1,5 +1,5 @@
 include start
-call 2 curs_set 0
+call 1 curs_set 0
 compare curs_set1.chk
 call 0 curs_set 1
 compare curs_set2.chk



CVS commit: src/distrib/amd64/ramdisks

2024-06-05 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Jun  5 16:37:44 UTC 2024

Modified Files:
src/distrib/amd64/ramdisks: Makefile

Log Message:
ramdisk-zfsroot: Only enable if zfs is enabled.

PR port-amd64/58316
PR port-amd64/57948 (followup pullup)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/amd64/ramdisks/Makefile

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



CVS commit: src/distrib/amd64/ramdisks

2024-06-05 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Jun  5 16:37:44 UTC 2024

Modified Files:
src/distrib/amd64/ramdisks: Makefile

Log Message:
ramdisk-zfsroot: Only enable if zfs is enabled.

PR port-amd64/58316
PR port-amd64/57948 (followup pullup)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/amd64/ramdisks/Makefile

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

Modified files:

Index: src/distrib/amd64/ramdisks/Makefile
diff -u src/distrib/amd64/ramdisks/Makefile:1.5 src/distrib/amd64/ramdisks/Makefile:1.6
--- src/distrib/amd64/ramdisks/Makefile:1.5	Mon Feb 19 17:55:46 2024
+++ src/distrib/amd64/ramdisks/Makefile	Wed Jun  5 16:37:44 2024
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.5 2024/02/19 17:55:46 riastradh Exp $
+#	$NetBSD: Makefile,v 1.6 2024/06/05 16:37:44 riastradh Exp $
 
 SUBDIR=
 SUBDIR+=	ramdisk
 SUBDIR+=	ramdisk-cgdroot
-SUBDIR+=	ramdisk-zfsroot
+SUBDIR+=	${${MKZFS} != "no":?ramdisk-zfsroot:}
 
 TARGETS+=	release
 



CVS commit: src/etc

2024-06-05 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Wed Jun  5 17:20:18 UTC 2024

Modified Files:
src/etc: Makefile

Log Message:
Drop -T (for non-Rock Ridge capable systems) from ${MKISOFS_FLAGS}.

Even old mac68k and macppc don't require it, and somehow TRANS.TBL
files are shown on NetBSD when the ISO images created with both -T
and and -hide-joliet-trans-tbl are mounted by mount_cd9660(8).

Note this also happens with mkisofs(8) from cdrtools-3.02,
but I have not investigated if it's expected behavior.


To generate a diff of this commit:
cvs rdiff -u -r1.471 -r1.472 src/etc/Makefile

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



CVS commit: src/etc

2024-06-05 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Wed Jun  5 17:20:18 UTC 2024

Modified Files:
src/etc: Makefile

Log Message:
Drop -T (for non-Rock Ridge capable systems) from ${MKISOFS_FLAGS}.

Even old mac68k and macppc don't require it, and somehow TRANS.TBL
files are shown on NetBSD when the ISO images created with both -T
and and -hide-joliet-trans-tbl are mounted by mount_cd9660(8).

Note this also happens with mkisofs(8) from cdrtools-3.02,
but I have not investigated if it's expected behavior.


To generate a diff of this commit:
cvs rdiff -u -r1.471 -r1.472 src/etc/Makefile

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

Modified files:

Index: src/etc/Makefile
diff -u src/etc/Makefile:1.471 src/etc/Makefile:1.472
--- src/etc/Makefile:1.471	Fri May 31 20:58:52 2024
+++ src/etc/Makefile	Wed Jun  5 17:20:18 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.471 2024/05/31 20:58:52 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.472 2024/06/05 17:20:18 tsutsui Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -54,7 +54,7 @@ MKISOFS?=	${TOOL_MKHYBRID}
 DISTRIBREV!=	${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh -s
 # ISO 9660 volume ID.  Note that this can only contain [A-Z0-9_].
 ISO_VOLID!=	echo NETBSD_${DISTRIBREV} | tr a-z A-Z
-MKISOFS_FLAGS+= -J -l -hide-joliet-trans-tbl -r -T \
+MKISOFS_FLAGS+= -J -l -r \
 		-V ${ISO_VOLID} \
 		-publisher "The NetBSD Project" \
 		-m "${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom"



CVS commit: src/usr.bin/make

2024-06-05 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Wed Jun  5 22:06:53 UTC 2024

Modified Files:
src/usr.bin/make: hash.c
src/usr.bin/make/unit-tests: varmod-match.exp varmod-match.mk varmod.mk

Log Message:
make: sync comments with reality


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/usr.bin/make/hash.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/varmod-match.exp
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/make/unit-tests/varmod-match.mk
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/varmod.mk

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



CVS commit: src/usr.bin/make

2024-06-05 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Wed Jun  5 22:06:53 UTC 2024

Modified Files:
src/usr.bin/make: hash.c
src/usr.bin/make/unit-tests: varmod-match.exp varmod-match.mk varmod.mk

Log Message:
make: sync comments with reality


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/usr.bin/make/hash.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/varmod-match.exp
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/make/unit-tests/varmod-match.mk
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/varmod.mk

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

Modified files:

Index: src/usr.bin/make/hash.c
diff -u src/usr.bin/make/hash.c:1.77 src/usr.bin/make/hash.c:1.78
--- src/usr.bin/make/hash.c:1.77	Fri May 31 07:11:12 2024
+++ src/usr.bin/make/hash.c	Wed Jun  5 22:06:53 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: hash.c,v 1.77 2024/05/31 07:11:12 rillig Exp $	*/
+/*	$NetBSD: hash.c,v 1.78 2024/06/05 22:06:53 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -74,7 +74,7 @@
 #include "make.h"
 
 /*	"@(#)hash.c	8.1 (Berkeley) 6/6/93"	*/
-MAKE_RCSID("$NetBSD: hash.c,v 1.77 2024/05/31 07:11:12 rillig Exp $");
+MAKE_RCSID("$NetBSD: hash.c,v 1.78 2024/06/05 22:06:53 rillig Exp $");
 
 /*
  * The ratio of # entries to # buckets at which we rebuild the table to
@@ -297,8 +297,8 @@ HashTable_DeleteEntry(HashTable *t, Hash
 }
 
 /*
- * Return the next entry in the hash table, or NULL if the end of the table
- * is reached.
+ * Place the next entry from the hash table in hi->entry, or return false if
+ * the end of the table is reached.
  */
 bool
 HashIter_Next(HashIter *hi)

Index: src/usr.bin/make/unit-tests/varmod-match.exp
diff -u src/usr.bin/make/unit-tests/varmod-match.exp:1.16 src/usr.bin/make/unit-tests/varmod-match.exp:1.17
--- src/usr.bin/make/unit-tests/varmod-match.exp:1.16	Tue Apr 23 22:51:28 2024
+++ src/usr.bin/make/unit-tests/varmod-match.exp	Wed Jun  5 22:06:53 2024
@@ -1,14 +1,14 @@
-make: "varmod-match.mk" line 290: while evaluating variable "WORDS": warning: Unfinished character list in pattern 'a[' of modifier ':M'
-make: "varmod-match.mk" line 298: while evaluating variable "WORDS": warning: Unfinished character list in pattern 'a[^' of modifier ':M'
-make: "varmod-match.mk" line 306: while evaluating variable "WORDS": warning: Unfinished character list in pattern '[-x1-3' of modifier ':M'
-make: "varmod-match.mk" line 314: while evaluating variable "WORDS": warning: Unfinished character list in pattern '*[-x1-3' of modifier ':M'
-make: "varmod-match.mk" line 323: while evaluating variable "WORDS": warning: Unfinished character list in pattern '[^-x1-3' of modifier ':M'
-make: "varmod-match.mk" line 337: while evaluating variable "WORDS": warning: Unfinished character list in pattern '?[\' of modifier ':M'
-make: "varmod-match.mk" line 345: while evaluating variable "WORDS": warning: Unfinished character range in pattern '[x-' of modifier ':M'
-make: "varmod-match.mk" line 357: while evaluating variable "WORDS": warning: Unfinished character range in pattern '[^x-' of modifier ':M'
-make: "varmod-match.mk" line 365: while evaluating variable " : :: ": warning: Unfinished character list in pattern '[' of modifier ':M'
-make: "varmod-match.mk" line 365: while evaluating variable " : :: ": Unknown modifier "]"
-make: "varmod-match.mk" line 365: Malformed conditional (${ ${:U\:} ${:U\:\:} :L:M[:]} != ":")
+make: "varmod-match.mk" line 289: while evaluating variable "WORDS": warning: Unfinished character list in pattern 'a[' of modifier ':M'
+make: "varmod-match.mk" line 297: while evaluating variable "WORDS": warning: Unfinished character list in pattern 'a[^' of modifier ':M'
+make: "varmod-match.mk" line 305: while evaluating variable "WORDS": warning: Unfinished character list in pattern '[-x1-3' of modifier ':M'
+make: "varmod-match.mk" line 313: while evaluating variable "WORDS": warning: Unfinished character list in pattern '*[-x1-3' of modifier ':M'
+make: "varmod-match.mk" line 322: while evaluating variable "WORDS": warning: Unfinished character list in pattern '[^-x1-3' of modifier ':M'
+make: "varmod-match.mk" line 336: while evaluating variable "WORDS": warning: Unfinished character list in pattern '?[\' of modifier ':M'
+make: "varmod-match.mk" line 344: while evaluating variable "WORDS": warning: Unfinished character range in pattern '[x-' of modifier ':M'
+make: "varmod-match.mk" line 356: while evaluating variable "WORDS": warning: Unfinished character range in pattern '[^x-' of modifier ':M'
+make: "varmod-match.mk" line 364: while evaluating variable " : :: ": warning: Unfinished character list in pattern '[' of modifier ':M'
+make: "varmod-match.mk" line 364: while evaluating variable " : :: ": Unknown modifier "]"
+make: "varmod-match.mk" line 364: Malformed conditional (${ ${:U\:} ${:U\:\:} :L:M[:]} != ":")
 make: Fatal err

CVS commit: src/distrib/notes/common

2024-06-05 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Thu Jun  6 00:21:28 UTC 2024

Modified Files:
src/distrib/notes/common: main

Log Message:
In the Release Contents section describing the source/sets/ directory,
remove a reference to pkgsrc sources, which were removed from NetBSD
releases in 2002 with NetBSD-1.6.  Spotted by Mouse in PR install/58067.

Fetching and unpacking pkgsrc manually is covered elsewhere in INSTALL,
so nothing lost here.


To generate a diff of this commit:
cvs rdiff -u -r1.575 -r1.576 src/distrib/notes/common/main

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

Modified files:

Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.575 src/distrib/notes/common/main:1.576
--- src/distrib/notes/common/main:1.575	Mon Mar 25 13:35:28 2024
+++ src/distrib/notes/common/main	Thu Jun  6 00:21:28 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.575 2024/03/25 13:35:28 uwe Exp $
+.\"	$NetBSD: main,v 1.576 2024/06/06 00:21:28 snj Exp $
 .\"
 .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -723,11 +723,7 @@ All the above source sets are located in
 subdirectory of the distribution tree.
 .Pp
 The source sets are distributed as compressed tar files.
-Except for the
-.Sy pkgsrc
-set, which is traditionally unpacked into
-.Pa /usr/pkgsrc ,
-all sets may be unpacked into
+Individual sets may be unpacked into
 .Pa /usr/src
 with the command:
 .Dl # Ic "cd / ; tar -zxpf set_name.\*[setsuffix]"



CVS commit: src/distrib/notes/common

2024-06-05 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Thu Jun  6 00:21:28 UTC 2024

Modified Files:
src/distrib/notes/common: main

Log Message:
In the Release Contents section describing the source/sets/ directory,
remove a reference to pkgsrc sources, which were removed from NetBSD
releases in 2002 with NetBSD-1.6.  Spotted by Mouse in PR install/58067.

Fetching and unpacking pkgsrc manually is covered elsewhere in INSTALL,
so nothing lost here.


To generate a diff of this commit:
cvs rdiff -u -r1.575 -r1.576 src/distrib/notes/common/main

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/usr.bin

2024-06-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Jun  6 05:41:28 UTC 2024

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

Log Message:
support powerpc with gcc 12.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/usr.bin/include/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.71 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.72
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.71	Sun Feb 25 00:28:02 2024
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile	Thu Jun  6 05:41:28 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.71 2024/02/25 00:28:02 mrg Exp $
+#	$NetBSD: Makefile,v 1.72 2024/06/06 05:41:28 mrg Exp $
 
 HOSTPROG_CXX=	1
 LIBISPRIVATE=	yes
@@ -52,6 +52,7 @@ CPPFLAGS.cppbuiltin.cc+=	-DBASEVER="\"${
 CLEANFILES+=	gengenrtl genrtl.h \
 		gengtype gtyp-gen.h gtype-brig.h gtype-desc.cc gtype-desc.h \
 		gtype-c.h gtype-cp.h gtype-f.h gtype-objc.h \
+		gtype-d.h gtype-fortran.h \
 		genflags genflags.h \
 		gencheck tree-check.h \
 		insn-preds.cc genpreds tm-preds.h tm_p.h cs-tm_p.h \
@@ -65,6 +66,8 @@ CLEANFILES+=	gengenrtl genrtl.h \
 # XXX
 #COPTS.varasm.cc=		-Wno-error
 
+.SUFFIXES: .lo .h .c .cc
+
 # XXX Override the normal rule to use HOST_COMPILE.cc
 .c.lo:
 	${_MKTARGET_COMPILE}
@@ -428,6 +431,31 @@ aarch64-builtin-iterators.h: ${DIST}/gcc
 
 CLEANFILES+=	aarch-builtin-iterators.h
 
+.if ${GCC_MACHINE_ARCH} == "powerpc" || ${GCC_MACHINE_ARCH} == "powerpc64" # {
+
+rs6000-gen-builtins.lo: ${HH} ${DIST}/gcc/config/rs6000/rs6000-gen-builtins.cc
+rbtree.lo: ${HH} ${DIST}/gcc/config/rs6000/rbtree.cc
+rs6000-gen-builtins: rs6000-gen-builtins.lo rbtree.lo
+	${_MKTARGET_LINK}
+	${HOST_LINK.cc} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY} ${LDFLAGS.${.TARGET}}
+rs6000-builtins.cc: rs6000-gen-builtins \
+		${DIST}/gcc/config/rs6000/rs6000-builtins.def \
+		${DIST}/gcc/config/rs6000/rs6000-overload.def
+	${_MKTARGET_CREATE}
+	./rs6000-gen-builtins \
+		${DIST}/gcc/config/rs6000/rs6000-builtins.def \
+		${DIST}/gcc/config/rs6000/rs6000-overload.def \
+rs6000-builtins.h rs6000-builtins.cc rs6000-vecdefines.h
+rs6000-builtins.h rs6000-vecdefines.h: rs6000-builtins.cc
+
+CLEANFILES+=	rs6000-builtins.h rs6000-builtins.cc rs6000-vecdefines.h
+CLEANFILES+=	rs6000-gen-builtins rbtree.lo rs6000-gen-builtins.lo
+
+gtype-desc.h: rs6000-builtins.h
+
+.endif # }
+
+
 #
 # Required hard-coded dependancies.
 #

Index: src/external/gpl3/gcc/usr.bin/include/Makefile
diff -u src/external/gpl3/gcc/usr.bin/include/Makefile:1.14 src/external/gpl3/gcc/usr.bin/include/Makefile:1.15
--- src/external/gpl3/gcc/usr.bin/include/Makefile:1.14	Tue Aug  1 05:57:55 2023
+++ src/external/gpl3/gcc/usr.bin/include/Makefile	Thu Jun  6 05:41:28 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2023/08/01 05:57:55 mrg Exp $
+#	$NetBSD: Makefile,v 1.15 2024/06/06 05:41:28 mrg Exp $
 
 .include 
 
@@ -8,7 +8,9 @@ SUBDIR=	sanitizer
 .include "${.CURDIR}/arch/${GCC_MACHINE_ARCH}.mk"
 .endif
 
-INCS= ${G_EXTRA_HEADERS:T}
+# XXX rs6000-vecdefines.h is generated in usr.bin/backend.  we can
+# try to install this from there later perhaps?
+INCS= ${G_EXTRA_HEADERS:T:Nrs6000-vecdefines.h}
 
 # Part of the standard headers, the rest of which we replace.
 INCS+=	stdatomic.h



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

2024-06-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Jun  6 05:41:28 UTC 2024

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

Log Message:
support powerpc with gcc 12.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/usr.bin/include/Makefile

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