CVS commit: src/share/mk

2022-12-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Dec 14 12:30:01 UTC 2022

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

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.1288 -r1.1289 src/share/mk/bsd.own.mk

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



CVS commit: src/share/mk

2022-12-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Dec 14 12:30:01 UTC 2022

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

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.1288 -r1.1289 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1288 src/share/mk/bsd.own.mk:1.1289
--- src/share/mk/bsd.own.mk:1.1288	Sun Aug 21 07:10:03 2022
+++ src/share/mk/bsd.own.mk	Wed Dec 14 12:30:01 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1288 2022/08/21 07:10:03 lukem Exp $
+#	$NetBSD: bsd.own.mk,v 1.1289 2022/12/14 12:30:01 skrll Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -123,7 +123,7 @@ EXTERNAL_GDB_SUBDIR=		/does/not/exist
 
 #
 # What OpenSSL is used?
-# 
+#
 HAVE_OPENSSL?=  11
 
 .if ${HAVE_OPENSSL} == 11
@@ -873,7 +873,7 @@ NOPROFILE=	# defined
 GCC_NO_FORMAT_TRUNCATION=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-format-truncation :}
 GCC_NO_FORMAT_OVERFLOW=		${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-format-overflow :}
 GCC_NO_STRINGOP_OVERFLOW=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-stringop-overflow :}
-GCC_NO_IMPLICIT_FALLTHRU=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-implicit-fallthrough :} 
+GCC_NO_IMPLICIT_FALLTHRU=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-implicit-fallthrough :}
 GCC_NO_STRINGOP_TRUNCATION=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-stringop-truncation :}
 GCC_NO_CAST_FUNCTION_TYPE=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-cast-function-type :}
 GCC_NO_ADDR_OF_PACKED_MEMBER=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-address-of-packed-member :}
@@ -1320,7 +1320,7 @@ ${var}?=	${${var}.${MACHINE_ARCH}:U${${v
 
 .if ${MACHINE_ARCH} == "i386" || \
 ${MACHINE_ARCH} == "x86_64" || \
-${MACHINE_ARCH} == "sparc" 
+${MACHINE_ARCH} == "sparc"
 MKSLJIT=	yes
 .endif
 
@@ -1432,7 +1432,7 @@ MKLIBCXX:=	yes
 #
 COPY?=		-c
 .if ${MKUPDATE} == "no"
-PRESERVE?=	
+PRESERVE?=
 .else
 PRESERVE?=	-p
 .endif
@@ -1450,7 +1450,7 @@ INSTPRIV.unpriv=
 .endif
 INSTPRIV?=	${INSTPRIV.unpriv} -N ${NETBSDSRCDIR}/etc
 .endif
-STRIPFLAG?=	
+STRIPFLAG?=
 
 INSTALL_DIR?=		${INSTALL} ${INSTPRIV} -d
 INSTALL_FILE?=		${INSTALL} ${INSTPRIV} ${COPY} ${PRESERVE} ${RENAME}
@@ -1523,7 +1523,7 @@ ${var}?= no
 USE_XZ_SETS?= yes
 .else
 USE_XZ_SETS?= no
-.endif 
+.endif
 
 #
 # TOOL_GZIP and friends.  These might refer to TOOL_PIGZ or to the host gzip.
@@ -1646,7 +1646,7 @@ EXTRA_DRIVERS=
 .if ${HAVE_XORG_SERVER_VER} == "120"
 X11SRCDIR.xf86-video-modesetting=${X11SRCDIR.xorg-server}/hw/xfree86/drivers/modesetting
 .else
-EXTRA_DRIVERS=	modesetting 
+EXTRA_DRIVERS=	modesetting
 .endif
 
 .for _v in \
@@ -1697,7 +1697,7 @@ MAKEDIRTARGET=\
 #	2	Describe what is occurring and echo the actual command
 #	3	Ignore the effect of the "@" prefix in make commands
 #	4	Trace shell commands using the shell's -x flag
-#		
+#
 MAKEVERBOSE?=		2
 
 .if ${MAKEVERBOSE} == 0



CVS commit: src/external/gpl3/binutils/dist/bfd

2022-12-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Dec 14 12:31:16 UTC 2022

Modified Files:
src/external/gpl3/binutils/dist/bfd: config.bfd

Log Message:
Reduce diff to upstream. NFCI.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/external/gpl3/binutils/dist/bfd/config.bfd

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



CVS commit: src/external/gpl3/binutils/dist/bfd

2022-12-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Dec 14 12:31:16 UTC 2022

Modified Files:
src/external/gpl3/binutils/dist/bfd: config.bfd

Log Message:
Reduce diff to upstream. NFCI.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/external/gpl3/binutils/dist/bfd/config.bfd

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/binutils/dist/bfd/config.bfd
diff -u src/external/gpl3/binutils/dist/bfd/config.bfd:1.33 src/external/gpl3/binutils/dist/bfd/config.bfd:1.34
--- src/external/gpl3/binutils/dist/bfd/config.bfd:1.33	Sat Aug  8 19:26:09 2020
+++ src/external/gpl3/binutils/dist/bfd/config.bfd	Wed Dec 14 12:31:15 2022
@@ -1198,14 +1198,6 @@ case "${targ}" in
 targ_underscore=yes
 ;;
 
-#ifdef BFD64 
-  riscv*-*-*)
-targ_defvec=riscv_elf64_vec
-targ_selvecs="riscv_elf32_vec riscv_elf64_vec"
-want64=true  
-;;
-#endif   
-
   rx-*-elf)
 targ_defvec=rx_elf32_le_vec
 targ_selvecs="rx_elf32_be_vec rx_elf32_le_vec rx_elf32_be_ns_vec"



CVS commit: src/sys/arch/macppc/macppc

2022-12-14 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Wed Dec 14 13:04:24 UTC 2022

Modified Files:
src/sys/arch/macppc/macppc: locore.S

Log Message:
Explicitly zero SPRG0 before doing anything else - it's used to store a pointer
to struct cpuinfo, this way we can catch attempts to use it before it's set
up properly


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/macppc/macppc/locore.S

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

Modified files:

Index: src/sys/arch/macppc/macppc/locore.S
diff -u src/sys/arch/macppc/macppc/locore.S:1.79 src/sys/arch/macppc/macppc/locore.S:1.80
--- src/sys/arch/macppc/macppc/locore.S:1.79	Fri Feb 26 02:18:56 2021
+++ src/sys/arch/macppc/macppc/locore.S	Wed Dec 14 13:04:24 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.79 2021/02/26 02:18:56 thorpej Exp $	*/
+/*	$NetBSD: locore.S,v 1.80 2022/12/14 13:04:24 macallan Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -92,6 +92,9 @@ __start:
 	mr	%r13,%r6
 	mr	%r14,%r7
 
+	li	%r0,0
+	mtsprg0	%r0
+
 	bl	_C_LABEL(ofwinit)		/* init OF */
 
 	li	%r0,0



CVS commit: src/sys/arch/macppc/macppc

2022-12-14 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Wed Dec 14 13:04:24 UTC 2022

Modified Files:
src/sys/arch/macppc/macppc: locore.S

Log Message:
Explicitly zero SPRG0 before doing anything else - it's used to store a pointer
to struct cpuinfo, this way we can catch attempts to use it before it's set
up properly


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/macppc/macppc/locore.S

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



CVS commit: src/sys/arch/powerpc/oea

2022-12-14 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Wed Dec 14 13:19:05 UTC 2022

Modified Files:
src/sys/arch/powerpc/oea: ofw_autoconf.c

Log Message:
if we have the ROM font, make it available to wsdisplay
needs testing on non-macppc


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/oea/ofw_autoconf.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/powerpc/oea

2022-12-14 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Wed Dec 14 13:19:05 UTC 2022

Modified Files:
src/sys/arch/powerpc/oea: ofw_autoconf.c

Log Message:
if we have the ROM font, make it available to wsdisplay
needs testing on non-macppc


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/oea/ofw_autoconf.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/powerpc/oea/ofw_autoconf.c
diff -u src/sys/arch/powerpc/oea/ofw_autoconf.c:1.24 src/sys/arch/powerpc/oea/ofw_autoconf.c:1.25
--- src/sys/arch/powerpc/oea/ofw_autoconf.c:1.24	Wed Nov 27 21:07:32 2019
+++ src/sys/arch/powerpc/oea/ofw_autoconf.c	Wed Dec 14 13:19:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_autoconf.c,v 1.24 2019/11/27 21:07:32 joerg Exp $ */
+/* $NetBSD: ofw_autoconf.c,v 1.25 2022/12/14 13:19:04 macallan Exp $ */
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
  * Copyright (C) 1995, 1996 TooLs GmbH.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.24 2019/11/27 21:07:32 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.25 2022/12/14 13:19:04 macallan Exp $");
 
 #ifdef ofppc
 #include "gtpci.h"
@@ -61,6 +61,11 @@ __KERNEL_RCSID(0, "$NetBSD: ofw_autoconf
 #include 
 #include 
 
+#include 
+#include 
+#include 
+#include 
+
 #include 
 
 #include 
@@ -77,6 +82,7 @@ static void canonicalize_bootpath(void);
 void
 cpu_configure(void)
 {
+	rascons_add_rom_font();
 	init_interrupt();
 	canonicalize_bootpath();
 



CVS commit: [netbsd-9] src/usr.sbin/sysinst

2022-12-14 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Dec 14 15:36:52 UTC 2022

Modified Files:
src/usr.sbin/sysinst [netbsd-9]: bsddisklabel.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #1553):

usr.sbin/sysinst/bsddisklabel.c: revision 1.67

A little less (confusing) magic: adjust the size of / when adding /usr
only if / has not beenn manually resized.


To generate a diff of this commit:
cvs rdiff -u -r1.23.2.11 -r1.23.2.12 src/usr.sbin/sysinst/bsddisklabel.c

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



CVS commit: [netbsd-9] src/usr.sbin/sysinst

2022-12-14 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Dec 14 15:36:52 UTC 2022

Modified Files:
src/usr.sbin/sysinst [netbsd-9]: bsddisklabel.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #1553):

usr.sbin/sysinst/bsddisklabel.c: revision 1.67

A little less (confusing) magic: adjust the size of / when adding /usr
only if / has not beenn manually resized.


To generate a diff of this commit:
cvs rdiff -u -r1.23.2.11 -r1.23.2.12 src/usr.sbin/sysinst/bsddisklabel.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.sbin/sysinst/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.23.2.11 src/usr.sbin/sysinst/bsddisklabel.c:1.23.2.12
--- src/usr.sbin/sysinst/bsddisklabel.c:1.23.2.11	Thu Oct 15 19:36:50 2020
+++ src/usr.sbin/sysinst/bsddisklabel.c	Wed Dec 14 15:36:52 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: bsddisklabel.c,v 1.23.2.11 2020/10/15 19:36:50 bouyer Exp $	*/
+/*	$NetBSD: bsddisklabel.c,v 1.23.2.12 2022/12/14 15:36:52 snj Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -653,18 +653,23 @@ set_ptn_size(menudesc *m, void *arg)
 }
 			}
 			/* Remove space for /usr from / */
-			if (root < pset->num && pset->infos[i].cur_part_id ==
-			NO_PART) {
-				pset->infos[root].size -= p->def_size;
+			if (root < pset->num &&
+			 pset->infos[root].cur_part_id == NO_PART &&
+			 pset->infos[root].size ==
+	pset->infos[root].def_size) {
+/*
+ * root partition does not yet exist and
+ * has default size
+ */
+pset->infos[root].size -= p->def_size;
 pset->cur_free_space += p->def_size;
 			}
-			/* hack to add free space to default sized /usr */
-			if (strcmp(answer, dflt) == 0) {
-size = p->def_size;
-pset->infos[root].flags &= ~PUIFLAG_EXTEND;
-p->flags |= PUIFLAG_EXTEND;
-goto adjust_free;
-			}
+			/*
+			 * hack to add free space to /usr if
+			 * previously / got it
+			 */
+			if (pset->infos[root].flags & PUIFLAG_EXTEND)
+extend = true;
 		}
 		if (new_size_val < 0)
 			continue;
@@ -687,7 +692,6 @@ set_ptn_size(menudesc *m, void *arg)
 	}
 	if (p->limit != 0 && size > p->limit)
 		size = p->limit;
-adjust_free:
 	if ((p->flags & (PUIFLG_IS_OUTER|PUIFLG_JUST_MOUNTPOINT)) == 0)
 		pset->cur_free_space += p->size - size;
 	p->size = is_percent ? -size : size;
@@ -1205,6 +1209,7 @@ fill_defaults(struct partition_usage_set
 			wanted->infos[root].limit;
 		}
 	}
+	wanted->infos[root].def_size = wanted->infos[root].size;
 }
 
 /*



CVS commit: [netbsd-9] src/usr.sbin/sysinst/arch

2022-12-14 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Dec 14 15:39:46 UTC 2022

Modified Files:
src/usr.sbin/sysinst/arch/amiga [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/atari [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/dummy [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/sparc [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/sparc64 [netbsd-9]: md.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #1554):

usr.sbin/sysinst/arch/amiga/md.c: revision 1.10
usr.sbin/sysinst/arch/atari/md.c: revision 1.10
usr.sbin/sysinst/arch/dummy/md.c: revision 1.8
usr.sbin/sysinst/arch/sparc/md.c: revision 1.8
usr.sbin/sysinst/arch/sparc64/md.c: revision 1.8

Add set_default_sizemult() calls to some architectures obviously
lacking it.


To generate a diff of this commit:
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 src/usr.sbin/sysinst/arch/amiga/md.c
cvs rdiff -u -r1.6.2.2 -r1.6.2.3 src/usr.sbin/sysinst/arch/atari/md.c
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 src/usr.sbin/sysinst/arch/dummy/md.c
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 src/usr.sbin/sysinst/arch/sparc/md.c
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 src/usr.sbin/sysinst/arch/sparc64/md.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.sbin/sysinst/arch/amiga/md.c
diff -u src/usr.sbin/sysinst/arch/amiga/md.c:1.5.2.2 src/usr.sbin/sysinst/arch/amiga/md.c:1.5.2.3
--- src/usr.sbin/sysinst/arch/amiga/md.c:1.5.2.2	Wed Feb  2 04:25:38 2022
+++ src/usr.sbin/sysinst/arch/amiga/md.c	Wed Dec 14 15:39:45 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.5.2.2 2022/02/02 04:25:38 msaitoh Exp $ */
+/*	$NetBSD: md.c,v 1.5.2.3 2022/12/14 15:39:45 snj Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -59,6 +59,7 @@ md_init_set_status(int flags)
 bool
 md_get_info(struct install_partition_desc *install)
 {
+	set_default_sizemult(pm->diskdev, MEG, pm->sectorsize);
 	return true;
 }
 

Index: src/usr.sbin/sysinst/arch/atari/md.c
diff -u src/usr.sbin/sysinst/arch/atari/md.c:1.6.2.2 src/usr.sbin/sysinst/arch/atari/md.c:1.6.2.3
--- src/usr.sbin/sysinst/arch/atari/md.c:1.6.2.2	Wed Feb  2 04:25:38 2022
+++ src/usr.sbin/sysinst/arch/atari/md.c	Wed Dec 14 15:39:45 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.6.2.2 2022/02/02 04:25:38 msaitoh Exp $ */
+/*	$NetBSD: md.c,v 1.6.2.3 2022/12/14 15:39:45 snj Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -59,6 +59,7 @@ md_init_set_status(int flags)
 bool
 md_get_info(struct install_partition_desc *install)
 {
+	set_default_sizemult(pm->diskdev, MEG, pm->sectorsize);
 	return true;
 }
 

Index: src/usr.sbin/sysinst/arch/dummy/md.c
diff -u src/usr.sbin/sysinst/arch/dummy/md.c:1.5.2.2 src/usr.sbin/sysinst/arch/dummy/md.c:1.5.2.3
--- src/usr.sbin/sysinst/arch/dummy/md.c:1.5.2.2	Wed Feb  2 04:25:38 2022
+++ src/usr.sbin/sysinst/arch/dummy/md.c	Wed Dec 14 15:39:46 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.5.2.2 2022/02/02 04:25:38 msaitoh Exp $	*/
+/*	$NetBSD: md.c,v 1.5.2.3 2022/12/14 15:39:46 snj Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -52,6 +52,7 @@ md_init_set_status(int flags)
 bool
 md_get_info(struct install_partition_desc *desc)
 {
+	set_default_sizemult(pm->diskdev, MEG, pm->sectorsize);
 	return true;
 }
 

Index: src/usr.sbin/sysinst/arch/sparc/md.c
diff -u src/usr.sbin/sysinst/arch/sparc/md.c:1.5.2.2 src/usr.sbin/sysinst/arch/sparc/md.c:1.5.2.3
--- src/usr.sbin/sysinst/arch/sparc/md.c:1.5.2.2	Wed Feb  2 04:25:40 2022
+++ src/usr.sbin/sysinst/arch/sparc/md.c	Wed Dec 14 15:39:46 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.5.2.2 2022/02/02 04:25:40 msaitoh Exp $	*/
+/*	$NetBSD: md.c,v 1.5.2.3 2022/12/14 15:39:46 snj Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -67,6 +67,7 @@ md_init_set_status(int flags)
 bool
 md_get_info(struct install_partition_desc *install)
 {
+	set_default_sizemult(pm->diskdev, MEG, pm->sectorsize);
 	return true;
 }
 

Index: src/usr.sbin/sysinst/arch/sparc64/md.c
diff -u src/usr.sbin/sysinst/arch/sparc64/md.c:1.5.2.2 src/usr.sbin/sysinst/arch/sparc64/md.c:1.5.2.3
--- src/usr.sbin/sysinst/arch/sparc64/md.c:1.5.2.2	Wed Feb  2 04:25:36 2022
+++ src/usr.sbin/sysinst/arch/sparc64/md.c	Wed Dec 14 15:39:46 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.5.2.2 2022/02/02 04:25:36 msaitoh Exp $	*/
+/*	$NetBSD: md.c,v 1.5.2.3 2022/12/14 15:39:46 snj Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -68,6 +68,8 @@ md_init_set_status(int flags)
 bool
 md_get_info(struct install_partition_desc *install)
 {
+
+	set_default_sizemult(pm->diskdev, MEG, pm->sectorsize);
 	return true;
 }
 



CVS commit: [netbsd-9] src/usr.sbin/sysinst/arch

2022-12-14 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Dec 14 15:39:46 UTC 2022

Modified Files:
src/usr.sbin/sysinst/arch/amiga [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/atari [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/dummy [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/sparc [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/sparc64 [netbsd-9]: md.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #1554):

usr.sbin/sysinst/arch/amiga/md.c: revision 1.10
usr.sbin/sysinst/arch/atari/md.c: revision 1.10
usr.sbin/sysinst/arch/dummy/md.c: revision 1.8
usr.sbin/sysinst/arch/sparc/md.c: revision 1.8
usr.sbin/sysinst/arch/sparc64/md.c: revision 1.8

Add set_default_sizemult() calls to some architectures obviously
lacking it.


To generate a diff of this commit:
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 src/usr.sbin/sysinst/arch/amiga/md.c
cvs rdiff -u -r1.6.2.2 -r1.6.2.3 src/usr.sbin/sysinst/arch/atari/md.c
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 src/usr.sbin/sysinst/arch/dummy/md.c
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 src/usr.sbin/sysinst/arch/sparc/md.c
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 src/usr.sbin/sysinst/arch/sparc64/md.c

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



CVS commit: [netbsd-9] src/doc

2022-12-14 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Dec 14 15:41:43 UTC 2022

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

Log Message:
155[34]


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

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



CVS commit: [netbsd-9] src/doc

2022-12-14 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Dec 14 15:41:43 UTC 2022

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

Log Message:
155[34]


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

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

Modified files:

Index: src/doc/CHANGES-9.4
diff -u src/doc/CHANGES-9.4:1.1.2.30 src/doc/CHANGES-9.4:1.1.2.31
--- src/doc/CHANGES-9.4:1.1.2.30	Tue Dec  6 19:27:34 2022
+++ src/doc/CHANGES-9.4	Wed Dec 14 15:41:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.4,v 1.1.2.30 2022/12/06 19:27:34 martin Exp $
+# $NetBSD: CHANGES-9.4,v 1.1.2.31 2022/12/14 15:41:43 snj Exp $
 
 A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4
 release:
@@ -457,3 +457,19 @@ sys/arch/hp300/stand/common/rd.c		1.12-1
 	- Make MI raid(4) work on HP-IB rd(4) disks.
 	[tsutsui, ticket #1552]
 
+usr.sbin/sysinst/bsddisklabel.c			1.67
+
+	sysinst: avoid confusion when adding a /usr partition after
+	manually sizing the / partition.
+	[martin, ticket #1553]
+
+usr.sbin/sysinst/arch/amiga/md.c		1.10
+usr.sbin/sysinst/arch/atari/md.c		1.10
+usr.sbin/sysinst/arch/dummy/md.c		1.8
+usr.sbin/sysinst/arch/sparc/md.c		1.8
+usr.sbin/sysinst/arch/sparc64/md.c		1.8
+
+	sysinst: properly set default disk size unit on more
+	architectures.
+	[martin, ticket #1554]
+



CVS commit: src/external/gpl3

2022-12-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Dec 14 18:59:04 UTC 2022

Modified Files:
src/external/gpl3/binutils/lib/libbfd: Makefile
src/external/gpl3/gdb/lib/libbfd: Makefile

Log Message:
Sprinkle some sorting. NFCI.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/gpl3/binutils/lib/libbfd/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gdb/lib/libbfd/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/binutils/lib/libbfd/Makefile
diff -u src/external/gpl3/binutils/lib/libbfd/Makefile:1.23 src/external/gpl3/binutils/lib/libbfd/Makefile:1.24
--- src/external/gpl3/binutils/lib/libbfd/Makefile:1.23	Tue Apr 13 04:58:59 2021
+++ src/external/gpl3/binutils/lib/libbfd/Makefile	Wed Dec 14 18:59:04 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2021/04/13 04:58:59 mrg Exp $
+#	$NetBSD: Makefile,v 1.24 2022/12/14 18:59:04 skrll Exp $
 
 NOLINKLIB=	# defined
 NOLINT=		# defined
@@ -54,12 +54,16 @@ GSRCS=		${G_libbfd_la_OBJECTS:libbfd.lo=
 SRCS=		${GSRCS:.lo=.c}
 
 DPSRCS+=	elf32-target.h elf64-target.h targmatch.h \
-		elf32-ia64.c elf64-ia64.c peigen.c pepigen.c \
-		elf32-riscv.c elf64-riscv.c elf32-aarch64.c elf64-aarch64.c \
+		elf32-aarch64.c elf64-aarch64.c \
+		elf32-ia64.c elf64-ia64.c \
+		elf32-riscv.c elf64-riscv.c \
+		peigen.c pepigen.c \
 		pex64igen.c
 CLEANFILES+=	elf32-target.h elf64-target.h targmatch.h \
-		elf32-ia64.c elf64-ia64.c peigen.c pepigen.c \
-		elf32-riscv.c elf64-riscv.c elf32-aarch64.c elf64-aarch64.c \
+		elf32-aarch64.c elf64-aarch64.c \
+		elf32-ia64.c elf64-ia64.c \
+		elf32-riscv.c elf64-riscv.c \
+		peigen.c pepigen.c \
 		pex64igen.c
 
 TEXINFO=	bfd.texinfo
@@ -88,27 +92,27 @@ elf64-target.h: elfxx-target.h
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/64/g < $> > $@
 
-elf32-ia64.c: elfnn-ia64.c
+elf32-aarch64.c: elfnn-aarch64.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/32/g < $> > $@
 
-elf64-ia64.c: elfnn-ia64.c
+elf64-aarch64.c: elfnn-aarch64.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/64/g < $> > $@
 
-elf32-riscv.c: elfnn-riscv.c
+elf32-ia64.c: elfnn-ia64.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/32/g < $> > $@
 
-elf64-riscv.c: elfnn-riscv.c
+elf64-ia64.c: elfnn-ia64.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/64/g < $> > $@
 
-elf32-aarch64.c: elfnn-aarch64.c
+elf32-riscv.c: elfnn-riscv.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/32/g < $> > $@
 
-elf64-aarch64.c: elfnn-aarch64.c
+elf64-riscv.c: elfnn-riscv.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/64/g < $> > $@
 

Index: src/external/gpl3/gdb/lib/libbfd/Makefile
diff -u src/external/gpl3/gdb/lib/libbfd/Makefile:1.12 src/external/gpl3/gdb/lib/libbfd/Makefile:1.13
--- src/external/gpl3/gdb/lib/libbfd/Makefile:1.12	Mon Dec  7 08:24:09 2020
+++ src/external/gpl3/gdb/lib/libbfd/Makefile	Wed Dec 14 18:59:03 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2020/12/07 08:24:09 rin Exp $
+#	$NetBSD: Makefile,v 1.13 2022/12/14 18:59:03 skrll Exp $
 
 .include 
 .include "../Makefile.inc"
@@ -20,10 +20,12 @@ GSRCS=		${G_libbfd_la_OBJECTS:libbfd.lo=
 SRCS=		${GSRCS:.lo=.c}
 
 DPSRCS+=	elf32-target.h elf64-target.h targmatch.h \
-		elf32-ia64.c elf64-ia64.c elf64-aarch64.c elf32-aarch64.c \
+		elf32-aarch64.c elf64-aarch64.c \
+		elf32-ia64.c elf64-ia64.c \
 		peigen.c pex64igen.c
 CLEANFILES+=	elf32-target.h elf64-target.h targmatch.h \
-		elf32-ia64.c elf64-ia64.c elf64-aarch64.c elf32-aarch64.c \
+		elf32-aarch64.c elf64-aarch64.c \
+		elf32-ia64.c elf64-ia64.c \
 		peigen.c pex64igen.c
 
 .PATH: ${DIST}/bfd
@@ -47,14 +49,6 @@ elf64-target.h: elfxx-target.h
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/64/g < $> > $@
 
-elf32-ia64.c: elfxx-ia64.c
-	${_MKTARGET_CREATE}
-	${TOOL_SED} -e s/NN/32/g < $> > $@
-
-elf64-ia64.c: elfxx-ia64.c
-	${_MKTARGET_CREATE}
-	${TOOL_SED} -e s/NN/64/g < $> > $@
-
 elf64-aarch64.c: elfnn-aarch64.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/64/g < $> > $@
@@ -63,6 +57,14 @@ elf32-aarch64.c: elfnn-aarch64.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/32/g < $> > $@
 
+elf32-ia64.c: elfxx-ia64.c
+	${_MKTARGET_CREATE}
+	${TOOL_SED} -e s/NN/32/g < $> > $@
+
+elf64-ia64.c: elfxx-ia64.c
+	${_MKTARGET_CREATE}
+	${TOOL_SED} -e s/NN/64/g < $> > $@
+
 peigen.c: peXXigen.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/XX/pe/g < $> > $@



CVS commit: src/external/gpl3

2022-12-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Dec 14 18:59:04 UTC 2022

Modified Files:
src/external/gpl3/binutils/lib/libbfd: Makefile
src/external/gpl3/gdb/lib/libbfd: Makefile

Log Message:
Sprinkle some sorting. NFCI.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/gpl3/binutils/lib/libbfd/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gdb/lib/libbfd/Makefile

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