CVS commit: src/usr.bin/indent

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat May 20 02:47:35 UTC 2023

Modified Files:
src/usr.bin/indent: debug.c indent.c indent.h

Log Message:
indent: add debug logging for brace indentation

No functional change outside debug mode, as the initialization of
di_stack[0] was redundant.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/indent/debug.c
cvs rdiff -u -r1.295 -r1.296 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.151 -r1.152 src/usr.bin/indent/indent.h

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

Modified files:

Index: src/usr.bin/indent/debug.c
diff -u src/usr.bin/indent/debug.c:1.14 src/usr.bin/indent/debug.c:1.15
--- src/usr.bin/indent/debug.c:1.14	Thu May 18 05:33:27 2023
+++ src/usr.bin/indent/debug.c	Sat May 20 02:47:35 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: debug.c,v 1.14 2023/05/18 05:33:27 rillig Exp $	*/
+/*	$NetBSD: debug.c,v 1.15 2023/05/20 02:47:35 rillig Exp $	*/
 
 /*-
  * Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: debug.c,v 1.14 2023/05/18 05:33:27 rillig Exp $");
+__RCSID("$NetBSD: debug.c,v 1.15 2023/05/20 02:47:35 rillig Exp $");
 
 #include 
 
@@ -208,11 +208,10 @@ debug_buffers(void)
 static bool
 ps_paren_has_changed(const struct parser_state *prev_ps)
 {
-	const paren_level_props *prev = prev_ps->paren, *curr = ps.paren;
-
 	if (prev_ps->nparen != ps.nparen)
 		return true;
 
+	const paren_level_props *prev = prev_ps->paren, *curr = ps.paren;
 	for (int i = 0; i < ps.nparen; i++)
 		if (curr[i].indent != prev[i].indent
 		|| curr[i].cast != prev[i].cast)
@@ -237,6 +236,32 @@ debug_ps_paren(const struct parser_state
 	debug_println("");
 }
 
+static bool
+ps_di_stack_has_changed(const struct parser_state *prev_ps)
+{
+	if (prev_ps->decl_level != ps.decl_level)
+		return true;
+	for (int i = 0; i < ps.decl_level; i++)
+		if (prev_ps->di_stack[i] != ps.di_stack[i])
+			return true;
+	return false;
+}
+
+static void
+debug_ps_di_stack(const struct parser_state *prev_ps)
+{
+	bool changed = ps_di_stack_has_changed(prev_ps);
+	if (!debug_full_parser_state && !changed)
+		return;
+
+	debug_printf("%s ps.di_stack:", changed ? "->" : "  ");
+	for (int i = 0; i < ps.decl_level; i++)
+		debug_printf(" %d", ps.di_stack[i]);
+	if (ps.decl_level == 0)
+		debug_printf(" none");
+	debug_println("");
+}
+
 void
 debug_parser_state(lexer_symbol lsym)
 {
@@ -274,6 +299,7 @@ debug_parser_state(lexer_symbol lsym)
 	debug_ps_int(ind_level_follow);
 
 	debug_ps_int(decl_level);
+	debug_ps_di_stack(&prev_ps);
 	debug_ps_bool(decl_on_line);
 	debug_ps_bool(in_decl);
 	debug_ps_enum(declaration, declaration_name);
@@ -282,7 +308,6 @@ debug_parser_state(lexer_symbol lsym)
 	debug_ps_enum(in_enum, in_enum_name);
 	debug_ps_bool(decl_indent_done);
 	debug_ps_int(decl_ind);
-	// No debug output for di_stack.
 	debug_ps_bool(tabs_to_var);
 
 	debug_ps_bool(in_stmt_or_decl);

Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.295 src/usr.bin/indent/indent.c:1.296
--- src/usr.bin/indent/indent.c:1.295	Thu May 18 07:13:05 2023
+++ src/usr.bin/indent/indent.c	Sat May 20 02:47:35 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: indent.c,v 1.295 2023/05/18 07:13:05 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.296 2023/05/20 02:47:35 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: indent.c,v 1.295 2023/05/18 07:13:05 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.296 2023/05/20 02:47:35 rillig Exp $");
 
 #include 
 #include 
@@ -1009,9 +1009,6 @@ process_preprocessing(void)
 static int
 indent(void)
 {
-
-	ps.di_stack[ps.decl_level = 0] = 0;
-
 	for (;;) {		/* loop until we reach eof */
 		lexer_symbol lsym = lexi();
 

Index: src/usr.bin/indent/indent.h
diff -u src/usr.bin/indent/indent.h:1.151 src/usr.bin/indent/indent.h:1.152
--- src/usr.bin/indent/indent.h:1.151	Sat May 20 00:17:56 2023
+++ src/usr.bin/indent/indent.h	Sat May 20 02:47:35 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: indent.h,v 1.151 2023/05/20 00:17:56 rillig Exp $	*/
+/*	$NetBSD: indent.h,v 1.152 2023/05/20 02:47:35 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -328,10 +328,10 @@ extern struct parser_state {
  * the middle of a statement */
 	int decl_level;		/* current nesting level for a structure
  * declaration or an initializer */
+	int di_stack[20];	/* a stack of structure indentation levels */
 	bool decl_indent_done;	/* whether the indentation for a declaration
  * has been added to the code buffer. */
 	int decl_ind;		/* current indentation for declarations */
-	int di_stack[20];	/* a stack of structure indentation levels */
 	bool tabs_to_var;	/* true if using tabs to indent to var name */
 
 	enum {

CVS commit: src/usr.bin/indent

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat May 20 02:47:35 UTC 2023

Modified Files:
src/usr.bin/indent: debug.c indent.c indent.h

Log Message:
indent: add debug logging for brace indentation

No functional change outside debug mode, as the initialization of
di_stack[0] was redundant.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/indent/debug.c
cvs rdiff -u -r1.295 -r1.296 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.151 -r1.152 src/usr.bin/indent/indent.h

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

CVS commit: src/usr.bin/indent

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat May 20 01:28:14 UTC 2023

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

Log Message:
indent: clean up lexing of word tokens

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.201 src/usr.bin/indent/lexi.c

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

Modified files:

Index: src/usr.bin/indent/lexi.c
diff -u src/usr.bin/indent/lexi.c:1.200 src/usr.bin/indent/lexi.c:1.201
--- src/usr.bin/indent/lexi.c:1.200	Sat May 20 00:17:56 2023
+++ src/usr.bin/indent/lexi.c	Sat May 20 01:28:14 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: lexi.c,v 1.200 2023/05/20 00:17:56 rillig Exp $	*/
+/*	$NetBSD: lexi.c,v 1.201 2023/05/20 01:28:14 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: lexi.c,v 1.200 2023/05/20 00:17:56 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.201 2023/05/20 01:28:14 rillig Exp $");
 
 #include 
 #include 
@@ -383,22 +383,21 @@ lexi_alnum(void)
 	token.len--;
 	const struct keyword *kw = bsearch(token.st, keywords,
 	array_length(keywords), sizeof(keywords[0]), cmp_keyword_by_name);
-	bool is_type = false;
-	if (kw == NULL) {
-		if (is_typename()) {
-			is_type = true;
-			ps.next_unary = true;
-			if (ps.in_enum == in_enum_enum)
-ps.in_enum = in_enum_type;
+	lexer_symbol lsym = lsym_word;
+	if (kw != NULL) {
+		if (kw->lsym == lsym_type)
+			lsym = lsym_type_in_parentheses;
+		ps.next_unary = true;
+		if (kw->lsym == lsym_tag || kw->lsym == lsym_type)
 			goto found_typename;
-		}
+		return kw->lsym;
+	}
 
-	} else {		/* we have a keyword */
-		is_type = kw->lsym == lsym_type;
+	if (is_typename()) {
+		lsym = lsym_type_in_parentheses;
 		ps.next_unary = true;
-		if (kw->lsym != lsym_tag && kw->lsym != lsym_type)
-			return kw->lsym;
-
+		if (ps.in_enum == in_enum_enum)
+			ps.in_enum = in_enum_type;
 found_typename:
 		if (ps.nparen > 0) {
 			/* inside parentheses: cast, param list, offsetof or
@@ -433,7 +432,7 @@ found_typename:
 		return lsym_type_outside_parentheses;
 	}
 
-	return is_type ? lsym_type_in_parentheses : lsym_word;
+	return lsym;
 }
 
 static bool

CVS commit: src/usr.bin/indent

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat May 20 01:28:14 UTC 2023

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

Log Message:
indent: clean up lexing of word tokens

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.201 src/usr.bin/indent/lexi.c

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

CVS commit: src/sbin/chown

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sat May 20 00:54:15 UTC 2023

Modified Files:
src/sbin/chown: chown.8

Log Message:
dd -d to the Synopsis


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sbin/chown/chown.8

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

CVS commit: src/sbin/chown

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sat May 20 00:54:15 UTC 2023

Modified Files:
src/sbin/chown: chown.8

Log Message:
dd -d to the Synopsis


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sbin/chown/chown.8

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

Modified files:

Index: src/sbin/chown/chown.8
diff -u src/sbin/chown/chown.8:1.13 src/sbin/chown/chown.8:1.14
--- src/sbin/chown/chown.8:1.13	Thu May  4 17:07:56 2023
+++ src/sbin/chown/chown.8	Sat May 20 00:54:15 2023
@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\" from: @(#)chown.8	8.3 (Berkeley) 3/31/94
-.\"	$NetBSD: chown.8,v 1.13 2023/05/04 17:07:56 pgoyette Exp $
+.\"	$NetBSD: chown.8,v 1.14 2023/05/20 00:54:15 pgoyette Exp $
 .\"
-.Dd May 1, 2023
+.Dd May 19, 2023
 .Dt CHOWN 8
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Fl R
 .Op Fl H | Fl L | Fl P
 .Oc
-.Op Fl fhv
+.Op Fl dfhv
 .Ar owner Ns Op Ar :group
 .Ar
 .Nm
@@ -48,7 +48,7 @@
 .Fl R
 .Op Fl H | Fl L | Fl P
 .Oc
-.Op Fl fhv
+.Op Fl dfhv
 .Ar :group
 .Ar
 .Nm
@@ -56,7 +56,7 @@
 .Fl R
 .Op Fl H | Fl L | Fl P
 .Oc
-.Op Fl fhv
+.Op Fl dfhv
 .Fl Fl reference=rfile
 .Ar
 .Sh DESCRIPTION

CVS commit: src/usr.bin/indent

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat May 20 00:17:56 UTC 2023

Modified Files:
src/usr.bin/indent: indent.h lexi.c

Log Message:
indent: separate detection of function definitions from lexing '*'

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/usr.bin/indent/indent.h
cvs rdiff -u -r1.199 -r1.200 src/usr.bin/indent/lexi.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/indent

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat May 20 00:17:56 UTC 2023

Modified Files:
src/usr.bin/indent: indent.h lexi.c

Log Message:
indent: separate detection of function definitions from lexing '*'

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/usr.bin/indent/indent.h
cvs rdiff -u -r1.199 -r1.200 src/usr.bin/indent/lexi.c

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

Modified files:

Index: src/usr.bin/indent/indent.h
diff -u src/usr.bin/indent/indent.h:1.150 src/usr.bin/indent/indent.h:1.151
--- src/usr.bin/indent/indent.h:1.150	Thu May 18 08:09:28 2023
+++ src/usr.bin/indent/indent.h	Sat May 20 00:17:56 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: indent.h,v 1.150 2023/05/18 08:09:28 rillig Exp $	*/
+/*	$NetBSD: indent.h,v 1.151 2023/05/20 00:17:56 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -286,7 +286,13 @@ extern struct parser_state {
 	int quest_level;	/* when this is positive, we have seen a '?'
  * without the matching ':' in a '?:'
  * expression */
-	bool is_function_definition;
+	bool is_function_definition;	/* starts either at the 'name(' from a
+	 * function definition if it occurs at
+	 * the beginning of a line, or at the
+	 * first '*' from inside a declaration
+	 * when the line starts with words
+	 * followed by a '('; ends at the end
+	 * of that line */
 	bool block_init;	/* whether inside a block initialization */
 	int block_init_level;	/* the level of brace nesting in an
  * initialization */

Index: src/usr.bin/indent/lexi.c
diff -u src/usr.bin/indent/lexi.c:1.199 src/usr.bin/indent/lexi.c:1.200
--- src/usr.bin/indent/lexi.c:1.199	Thu May 18 05:33:27 2023
+++ src/usr.bin/indent/lexi.c	Sat May 20 00:17:56 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: lexi.c,v 1.199 2023/05/18 05:33:27 rillig Exp $	*/
+/*	$NetBSD: lexi.c,v 1.200 2023/05/20 00:17:56 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: lexi.c,v 1.199 2023/05/18 05:33:27 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.200 2023/05/20 00:17:56 rillig Exp $");
 
 #include 
 #include 
@@ -447,6 +447,22 @@ is_asterisk_unary(void)
 	return ps.in_decl && ps.nparen > 0;
 }
 
+static bool
+probably_in_function_definition(void)
+{
+	for (const char *tp = inp.st; *tp != '\n';) {
+		if (ch_isspace(*tp))
+			tp++;
+		else if (is_identifier_start(*tp)) {
+			tp++;
+			while (is_identifier_part(*tp))
+tp++;
+		} else
+			return *tp == '(';
+	}
+	return false;
+}
+
 static void
 lex_asterisk_unary(void)
 {
@@ -456,21 +472,8 @@ lex_asterisk_unary(void)
 		inp_skip();
 	}
 
-	if (ps.in_decl) {
-		for (const char *tp = inp.st; *tp != '\n';) {
-			if (ch_isspace(*tp))
-tp++;
-			else if (is_identifier_start(*tp)) {
-tp++;
-while (is_identifier_part(*tp))
-	tp++;
-			} else {
-if (*tp == '(')
-	ps.is_function_definition = true;
-break;
-			}
-		}
-	}
+	if (ps.in_decl && probably_in_function_definition())
+		ps.is_function_definition = true;
 }
 
 static void

CVS commit: src/external/gpl3

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Fri May 19 23:28:22 UTC 2023

Modified Files:
src/external/gpl3/gcc.old/usr.bin/backend: Makefile
src/external/gpl3/gcc.old/usr.bin/common: Makefile
src/external/gpl3/gcc.old/usr.bin/common-target: Makefile
src/external/gpl3/gcc.old/usr.bin/frontend: Makefile
src/external/gpl3/gcc.old/usr.bin/libcpp: Makefile
src/external/gpl3/gcc.old/usr.bin/libdecnumber: Makefile
src/external/gpl3/gcc/usr.bin/backend: Makefile
src/external/gpl3/gcc/usr.bin/common: Makefile
src/external/gpl3/gcc/usr.bin/common-target: Makefile
src/external/gpl3/gcc/usr.bin/frontend: Makefile
src/external/gpl3/gcc/usr.bin/libcpp: Makefile
src/external/gpl3/gcc/usr.bin/libdecnumber: Makefile

Log Message:
gcc: fix build with clang++ HOST_CXX

Define HOSTPROG_CXX before .include anything that brings in bsd.own.mk.
This ensures that HOST_DBG (etc) gets assigned before HOST_CFLAGS
and HOST_CXXFLAGS is created.

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

Note that gcc.old/Makefile.prog may be mis-used because it defines HOSTPROG_CXX
and this Makefile fragment is included after bsd.*.mk in other Makefiles,
but they seem to build ok so leaving it alone for now.

Fixes PR toolchain/57014


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc.old/usr.bin/backend/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc.old/usr.bin/common/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gcc.old/usr.bin/common-target/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc.old/usr.bin/frontend/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc.old/usr.bin/libcpp/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gcc.old/usr.bin/libdecnumber/Makefile
cvs rdiff -u -r1.66 -r1.67 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/usr.bin/common/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gcc/usr.bin/common-target/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/usr.bin/frontend/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/usr.bin/libcpp/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile

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

Modified files:

Index: src/external/gpl3/gcc.old/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc.old/usr.bin/backend/Makefile:1.16 src/external/gpl3/gcc.old/usr.bin/backend/Makefile:1.17
--- src/external/gpl3/gcc.old/usr.bin/backend/Makefile:1.16	Mon Feb 20 02:12:29 2023
+++ src/external/gpl3/gcc.old/usr.bin/backend/Makefile	Fri May 19 23:28:21 2023
@@ -1,7 +1,11 @@
-#	$NetBSD: Makefile,v 1.16 2023/02/20 02:12:29 mrg Exp $
+#	$NetBSD: Makefile,v 1.17 2023/05/19 23:28:21 lukem Exp $
 
+HOSTPROG_CXX=	1
 LIBISPRIVATE=	yes
 
+# For ../Makefile.inc and bsd.own.mk
+.include 
+
 LIB=		backend
 
 SRCS=		${G_OBJS:S,analyzer/,,} ${G_out_file:T} regsub.c
@@ -28,10 +32,6 @@ CPPFLAGS.lto-streamer-in.c+=	-DTARGET_MA
 
 HOST_CXXFLAGS+=	-std=gnu++98
 
-HOSTPROG_CXX=	1
-
-.include 
-
 HOST_LIBIBERTYOBJ!=	cd ${.CURDIR}/../host-libiberty && ${PRINTOBJDIR}
 
 .include 

Index: src/external/gpl3/gcc.old/usr.bin/common/Makefile
diff -u src/external/gpl3/gcc.old/usr.bin/common/Makefile:1.10 src/external/gpl3/gcc.old/usr.bin/common/Makefile:1.11
--- src/external/gpl3/gcc.old/usr.bin/common/Makefile:1.10	Mon Feb 20 02:12:29 2023
+++ src/external/gpl3/gcc.old/usr.bin/common/Makefile	Fri May 19 23:28:21 2023
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.10 2023/02/20 02:12:29 mrg Exp $
+#	$NetBSD: Makefile,v 1.11 2023/05/19 23:28:21 lukem Exp $
 
+HOSTPROG_CXX=	1
 LIBISPRIVATE=	yes
 
 # For ../Makefile.inc and bsd.own.mk
@@ -21,8 +22,6 @@ CPPFLAGS+=	-I${GCCARCH} -I${BACKENDOBJ} 
 MKPIC:=		no
 MKPICLIB:=	no
 
-HOSTPROG_CXX=	1
-
 COPTS.diagnostic.c=	-Wno-stack-protector
 COPTS.intl.c=		-Wno-stack-protector
 

Index: src/external/gpl3/gcc.old/usr.bin/common-target/Makefile
diff -u src/external/gpl3/gcc.old/usr.bin/common-target/Makefile:1.9 src/external/gpl3/gcc.old/usr.bin/common-target/Makefile:1.10
--- src/external/gpl3/gcc.old/usr.bin/common-target/Makefile:1.9	Mon Feb 20 02:12:29 2023
+++ src/external/gpl3/gcc.old/usr.bin/common-target/Makefile	Fri May 19 23:28:21 2023
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.9 2023/02/20 02:12:29 mrg Exp $
+#	$NetBSD: Makefile,v 1.10 2023/05/19 23:28:21 lukem Exp $
 
+HOSTPROG_CXX=	1
 LIBISPRIVATE=	yes
 
 # For ../Makefile.inc and bsd.own.mk
@@ -43,8 +44,6 @@ HOST_CPPFLAGS+=	-DGENERATOR_FILE
 MKPIC:=		no
 MKPICLIB:=	no
 
-HOSTPROG_CXX=	1
-
 .include 
 
 # Force using C++ for this

Index: src/external/gpl3/gcc

CVS commit: src/external/gpl3

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Fri May 19 23:28:22 UTC 2023

Modified Files:
src/external/gpl3/gcc.old/usr.bin/backend: Makefile
src/external/gpl3/gcc.old/usr.bin/common: Makefile
src/external/gpl3/gcc.old/usr.bin/common-target: Makefile
src/external/gpl3/gcc.old/usr.bin/frontend: Makefile
src/external/gpl3/gcc.old/usr.bin/libcpp: Makefile
src/external/gpl3/gcc.old/usr.bin/libdecnumber: Makefile
src/external/gpl3/gcc/usr.bin/backend: Makefile
src/external/gpl3/gcc/usr.bin/common: Makefile
src/external/gpl3/gcc/usr.bin/common-target: Makefile
src/external/gpl3/gcc/usr.bin/frontend: Makefile
src/external/gpl3/gcc/usr.bin/libcpp: Makefile
src/external/gpl3/gcc/usr.bin/libdecnumber: Makefile

Log Message:
gcc: fix build with clang++ HOST_CXX

Define HOSTPROG_CXX before .include anything that brings in bsd.own.mk.
This ensures that HOST_DBG (etc) gets assigned before HOST_CFLAGS
and HOST_CXXFLAGS is created.

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

Note that gcc.old/Makefile.prog may be mis-used because it defines HOSTPROG_CXX
and this Makefile fragment is included after bsd.*.mk in other Makefiles,
but they seem to build ok so leaving it alone for now.

Fixes PR toolchain/57014


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc.old/usr.bin/backend/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc.old/usr.bin/common/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gcc.old/usr.bin/common-target/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc.old/usr.bin/frontend/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc.old/usr.bin/libcpp/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gcc.old/usr.bin/libdecnumber/Makefile
cvs rdiff -u -r1.66 -r1.67 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/usr.bin/common/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gcc/usr.bin/common-target/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/usr.bin/frontend/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/usr.bin/libcpp/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile

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

CVS commit: src/usr.bin/chflags

[Valery Ushakov]

Module Name:src
Committed By:   uwe
Date:   Fri May 19 19:50:59 UTC 2023

Modified Files:
src/usr.bin/chflags: chflags.1

Log Message:
chflags(1): minor markup fixes


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/chflags/chflags.1

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/chflags/chflags.1
diff -u src/usr.bin/chflags/chflags.1:1.27 src/usr.bin/chflags/chflags.1:1.28
--- src/usr.bin/chflags/chflags.1:1.27	Fri May 19 16:14:00 2023
+++ src/usr.bin/chflags/chflags.1	Fri May 19 19:50:59 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: chflags.1,v 1.27 2023/05/19 16:14:00 jschauma Exp $
+.\"	$NetBSD: chflags.1,v 1.28 2023/05/19 19:50:59 uwe Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -57,7 +57,7 @@ as specified by the
 operand.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width Fl
 .It Fl d
 If the change requested would not alter the
 flags currently set for
@@ -67,12 +67,12 @@ then attempt no change operation.
 If the
 .Fl R
 option is specified, symbolic links on the command line are followed.
-(Symbolic links encountered in the tree traversal are not followed.)
+Symbolic links encountered in the tree traversal are not followed.
 .It Fl h
 If the
 .Ar file
 or a file encountered during directory traversal is a symbolic link,
-the file flags of the link itself is changed.
+the file flags of the link itself are changed.
 .It Fl L
 If the
 .Fl R
@@ -84,33 +84,32 @@ option is specified, no symbolic links a
 .It Fl R
 Change the file flags for the file hierarchies rooted
 in the
-.Ar files
+.Ar file\^ Ns s
 instead of just the
-.Ar files
+.Ar file\^ Ns s
 themselves.
 .El
 .Pp
 Flags are a comma separated list of keywords.
 The following keywords are currently defined:
-.Bl -column -offset indent "Keyword   " "system append-only" "Permission"
+.\" XXX: list the actual chflags(2) macro names
+.Bl -column -offset indent ".Sy Keyword" "system append-only"
 .It Sy Keyword Ta Sy Flag Ta Sy Permission
-.It arch Ta archived Ta super-user only
-.It opaque Ta opaque Ta owner or super-user
-.It nodump Ta nodump Ta owner or super-user
-.It sappnd Ta system append-only Ta super-user only
-.It schg Ta system immutable Ta super-user only
-.It uappnd Ta user append-only Ta owner or super-user
-.It uchg Ta user immutable Ta owner or super-user
+.It Li arch Ta archived Ta super-user only
+.It Li opaque Ta opaque Ta owner or super-user
+.It Li nodump Ta nodump Ta owner or super-user
+.It Li sappnd Ta system append-only Ta super-user only
+.It Li schg Ta system immutable Ta super-user only
+.It Li uappnd Ta user append-only Ta owner or super-user
+.It Li uchg Ta user immutable Ta owner or super-user
 .El
 .Pp
 Putting the letters
-.Dq no
-before an option causes the flag to be turned off.
-For example:
-.Bl -tag -offset indent -width "nouchg"
-.It nouchg
-the immutable bit should be cleared
-.El
+.Sq Cm no
+before a keyword causes the flag to be turned off.
+For example,
+.Li nouchg
+requests the immutable bit should be cleared.
 .Pp
 The
 .Fl H ,
@@ -138,7 +137,7 @@ devices to be changed except by the supe
 .Pp
 Note that the ability to clear certain flags is
 dependent on the current kernel
-.Em securelevel .
+.Va securelevel .
 See
 .Xr secmodel_securelevel 9
 for details.

CVS commit: src/usr.bin/chflags

[Valery Ushakov]

Module Name:src
Committed By:   uwe
Date:   Fri May 19 19:50:59 UTC 2023

Modified Files:
src/usr.bin/chflags: chflags.1

Log Message:
chflags(1): minor markup fixes


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/chflags/chflags.1

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/openssl/lib/liblegacy

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri May 19 18:45:53 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile

Log Message:
vax-inate (does not have _pic, .a is pic)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/liblegacy/Makefile

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/openssl/lib/liblegacy

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri May 19 18:45:53 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile

Log Message:
vax-inate (does not have _pic, .a is pic)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/liblegacy/Makefile

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/openssl/lib/liblegacy/Makefile
diff -u src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.4 src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.5
--- src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.4	Wed May 17 15:09:42 2023
+++ src/crypto/external/bsd/openssl/lib/liblegacy/Makefile	Fri May 19 14:45:52 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2023/05/17 19:09:42 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2023/05/19 18:45:52 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -76,7 +76,11 @@ libinstall::
 
 LDFLAGS+=-Wl,--version-script=${.CURDIR}/${LIB}.map
 
+.if ${MKPICLIB} == "yes"
 LIBDPLIBS+= common_pic ${.CURDIR}/../libcommon
+.else
+LIBDPLIBS+= common ${.CURDIR}/../libcommon
+.endif
 LIBDPLIBS+= crypto ${.CURDIR}/../libcrypto
 
 .include 

Re: CVS commit: src/usr.sbin/installboot

[Luke Mewburn]

On 23-05-17 01:35, Valery Ushakov wrote:
  | Module Name:src
  | Committed By:   uwe
  | Date:   Wed May 17 01:35:00 UTC 2023
  | 
  | Modified Files:
  | src/usr.sbin/installboot: installboot.8
  | 
  | Log Message:
  | installboot(8): fix up markup
  | 
  | Don't overuse .Sy - when everything is highlighted, nothing is.  Use
  | .Ic for options &c to get correct PostScript output (both are bold in
  | plain text).
  | 
  | Use Aq Ar inside .Pa, as both Pa and Ar are rendered as underscored
  | text in plain text output, and the distinction is lost.
  | 
  | Don't set examples in bold, but give them .Pp space around - they are
  | much easier to read this way.
  | 
  | Use consistent -width in FILES.

Thanks for this; much better.

Re: CVS commit: src

[Hauke Fath]

On Sat, 20 May 2023 03:13:19 +1000, Luke Mewburn wrote:
>   | Arguably fixes PR toolchain/42166
> 
> I think you meant toolchain/41266.

Argh! Of course! Mis-typed once, and my fingers stuck with it.

Cheerio,
Hauke

-- 
Hauke Fath
Linnéweg 7
64342 Seeheim-Jugenheim
Germany

Re: CVS commit: src

[Luke Mewburn]

On 23-05-19 14:47, Hauke Fath wrote:
  | Module Name:src
  | Committed By:   hauke
  | Date:   Fri May 19 14:47:16 UTC 2023
  | 
  | Modified Files:
  | src/distrib/cdrom: Makefile
  | src/etc/etc.mac68k: Makefile.inc
  | 
  | Log Message:
  | Creating Type&Creator mappings for .bin (macbinary encoded) files,
  | mkisofs changes files, then turns around and complains they have been
  | changed.
  | 
  | This is a self-inflicted wound, so demote the error to a warning.
  | 
  | Reported upstream as 
.
  | 
  | Arguably fixes PR toolchain/42166

I think you meant toolchain/41266.


  | Request pull-ups to netbsd-{8,9,10}.
  | 
  | XXX What about macppc?
  | 
  | 
  | To generate a diff of this commit:
  | cvs rdiff -u -r1.52 -r1.53 src/distrib/cdrom/Makefile
  | cvs rdiff -u -r1.23 -r1.24 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/distrib/cdrom/Makefile
  | diff -u src/distrib/cdrom/Makefile:1.52 src/distrib/cdrom/Makefile:1.53
  | --- src/distrib/cdrom/Makefile:1.52 Wed Jan 24 09:04:40 2018
  | +++ src/distrib/cdrom/Makefile  Fri May 19 14:47:16 2023
  | @@ -1,4 +1,4 @@
  | -# $NetBSD: Makefile,v 1.52 2018/01/24 09:04:40 skrll Exp $
  | +# $NetBSD: Makefile,v 1.53 2023/05/19 14:47:16 hauke Exp $
  |  #
  |  # Consult "*.conf" for the configuration variables; this Makefile is 
typically
  |  # not edited for basic configuration changes.
  | @@ -288,7 +288,7 @@ MKISOFS_ARGS.${image}+= -b ${BOOTFILE.am
  |  MKISOFS_ARGS.${image}+= -b ${BOOTFILE.amd64} -c boot.catalog
  |  .endif
  |  .endif
  | -
  | +
  |  # Mac (mac68k, macppc)
  |  
  |  .if !empty(ports:Mmacppc)
  | @@ -299,7 +299,7 @@ MKISOFS_ARGS.${image}+= -hfs -part -hide
  |  UUDECODE_FILES=${BOOTHFS}
  |  .include 
  |  .elif defined(USE_APPLE_ISO) || !empty(ports:Mmac68k)
  | -MKISOFS_ARGS.${image}+=-apple --macbin -map ${.CURDIR}/hfsmap.lst
  | +MKISOFS_ARGS.${image}+=-apple --macbin -data-change-warn -map 
${.CURDIR}/hfsmap.lst
  |  .endif
  |  
  |  # Sun (sparc, sparc64, sun3)
  | 
  | Index: src/etc/etc.mac68k/Makefile.inc
  | diff -u src/etc/etc.mac68k/Makefile.inc:1.23 
src/etc/etc.mac68k/Makefile.inc:1.24
  | --- src/etc/etc.mac68k/Makefile.inc:1.23Fri Jul 26 11:38:21 2019
  | +++ src/etc/etc.mac68k/Makefile.inc Fri May 19 14:47:16 2023
  | @@ -1,4 +1,4 @@
  | -#  $NetBSD: Makefile.inc,v 1.23 2019/07/26 11:38:21 rin Exp $
  | +#  $NetBSD: Makefile.inc,v 1.24 2023/05/19 14:47:16 hauke Exp $
  |  #
  |  #  etc.mac68k/Makefile.inc -- mac68k-specific etc Makefile targets
  |  #
  | @@ -18,7 +18,7 @@ snap_md_post:
  |  
  |  # For "make iso-image"
  |  # mkisofs arguments to create a hybrid (HFS/Rockridge) CD-ROM image.
  | -MKISOFS_FLAGS+=-hfs --macbin \
  | +MKISOFS_FLAGS+=-hfs --macbin -data-change-warn \
  | -map ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/extensions.map
  |  
  |  iso-image: do-iso-image
  | 

CVS commit: src/usr.bin/chflags

[Jan Schaumann]

Module Name:src
Committed By:   jschauma
Date:   Fri May 19 16:14:00 UTC 2023

Modified Files:
src/usr.bin/chflags: chflags.1

Log Message:
We mention secmodel_securelevel(9) in the details, so might as well add it to
SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/chflags/chflags.1

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/chflags/chflags.1
diff -u src/usr.bin/chflags/chflags.1:1.26 src/usr.bin/chflags/chflags.1:1.27
--- src/usr.bin/chflags/chflags.1:1.26	Thu May 18 19:08:16 2023
+++ src/usr.bin/chflags/chflags.1	Fri May 19 16:14:00 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: chflags.1,v 1.26 2023/05/18 19:08:16 jschauma Exp $
+.\"	$NetBSD: chflags.1,v 1.27 2023/05/19 16:14:00 jschauma Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
 .\"
-.Dd May 18, 2023
+.Dd May 19, 2023
 .Dt CHFLAGS 1
 .Os
 .Sh NAME
@@ -152,4 +152,5 @@ for details.
 .Xr fts 3 ,
 .Xr symlink 7 ,
 .Xr dump 8 ,
-.Xr init 8
+.Xr init 8 ,
+.Xr secmodel_securelevel 9

CVS commit: src/usr.bin/chflags

[Jan Schaumann]

Module Name:src
Committed By:   jschauma
Date:   Fri May 19 16:14:00 UTC 2023

Modified Files:
src/usr.bin/chflags: chflags.1

Log Message:
We mention secmodel_securelevel(9) in the details, so might as well add it to
SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/chflags/chflags.1

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

CVS commit: src/sys/dev

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Fri May 19 15:42:43 UTC 2023

Modified Files:
src/sys/dev: vnd.c

Log Message:
Neither limit the number of requests for the page daemon.
Otherwise you may deadlock when the backend needs to allocate
memory and the page daemon needs to flush dirty vnd buffers.

See PR 57421 for details.


To generate a diff of this commit:
cvs rdiff -u -r1.288 -r1.289 src/sys/dev/vnd.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/vnd.c
diff -u src/sys/dev/vnd.c:1.288 src/sys/dev/vnd.c:1.289
--- src/sys/dev/vnd.c:1.288	Tue Mar 14 12:55:43 2023
+++ src/sys/dev/vnd.c	Fri May 19 15:42:43 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnd.c,v 1.288 2023/03/14 12:55:43 hannken Exp $	*/
+/*	$NetBSD: vnd.c,v 1.289 2023/05/19 15:42:43 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008, 2020 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.288 2023/03/14 12:55:43 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.289 2023/05/19 15:42:43 mlelstv Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vnd.h"
@@ -123,6 +123,8 @@ __KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.28
 #include 
 #include 
 
+#include 
+
 #include 
 
 #include 
@@ -559,7 +561,7 @@ vndstrategy(struct buf *bp)
 		 * thread to add requests, as a wedge on vnd queues
 		 * requests with biodone() -> dkstart() -> vndstrategy().
 		 */
-		if (curlwp != vnd->sc_kthread) {
+		if (curlwp != vnd->sc_kthread && curlwp != uvm.pagedaemon_lwp) {
 			while (vnd->sc_pending >= VND_MAXPENDING(vnd))
 tsleep(&vnd->sc_pending, PRIBIO, "vndpc", 0);
 		}

CVS commit: src/sys/dev

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Fri May 19 15:42:43 UTC 2023

Modified Files:
src/sys/dev: vnd.c

Log Message:
Neither limit the number of requests for the page daemon.
Otherwise you may deadlock when the backend needs to allocate
memory and the page daemon needs to flush dirty vnd buffers.

See PR 57421 for details.


To generate a diff of this commit:
cvs rdiff -u -r1.288 -r1.289 src/sys/dev/vnd.c

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

CVS commit: src

[Hauke Fath]

Module Name:src
Committed By:   hauke
Date:   Fri May 19 14:47:16 UTC 2023

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

Log Message:
Creating Type&Creator mappings for .bin (macbinary encoded) files,
mkisofs changes files, then turns around and complains they have been
changed.

This is a self-inflicted wound, so demote the error to a warning.

Reported upstream as .

Arguably fixes PR toolchain/42166

Request pull-ups to netbsd-{8,9,10}.

XXX What about macppc?


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/distrib/cdrom/Makefile
cvs rdiff -u -r1.23 -r1.24 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/distrib/cdrom/Makefile
diff -u src/distrib/cdrom/Makefile:1.52 src/distrib/cdrom/Makefile:1.53
--- src/distrib/cdrom/Makefile:1.52	Wed Jan 24 09:04:40 2018
+++ src/distrib/cdrom/Makefile	Fri May 19 14:47:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2018/01/24 09:04:40 skrll Exp $
+# $NetBSD: Makefile,v 1.53 2023/05/19 14:47:16 hauke Exp $
 #
 # Consult "*.conf" for the configuration variables; this Makefile is typically
 # not edited for basic configuration changes.
@@ -288,7 +288,7 @@ MKISOFS_ARGS.${image}+=	-b ${BOOTFILE.am
 MKISOFS_ARGS.${image}+= -b ${BOOTFILE.amd64} -c boot.catalog
 .endif
 .endif
-
+
 # Mac (mac68k, macppc)
 
 .if !empty(ports:Mmacppc)
@@ -299,7 +299,7 @@ MKISOFS_ARGS.${image}+=	-hfs -part -hide
 UUDECODE_FILES=	${BOOTHFS}
 .include 
 .elif defined(USE_APPLE_ISO) || !empty(ports:Mmac68k)
-MKISOFS_ARGS.${image}+=	-apple --macbin -map ${.CURDIR}/hfsmap.lst
+MKISOFS_ARGS.${image}+=	-apple --macbin -data-change-warn -map ${.CURDIR}/hfsmap.lst
 .endif
 
 # Sun (sparc, sparc64, sun3)

Index: src/etc/etc.mac68k/Makefile.inc
diff -u src/etc/etc.mac68k/Makefile.inc:1.23 src/etc/etc.mac68k/Makefile.inc:1.24
--- src/etc/etc.mac68k/Makefile.inc:1.23	Fri Jul 26 11:38:21 2019
+++ src/etc/etc.mac68k/Makefile.inc	Fri May 19 14:47:16 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.23 2019/07/26 11:38:21 rin Exp $
+#	$NetBSD: Makefile.inc,v 1.24 2023/05/19 14:47:16 hauke Exp $
 #
 #	etc.mac68k/Makefile.inc -- mac68k-specific etc Makefile targets
 #
@@ -18,7 +18,7 @@ snap_md_post:
 
 # For "make iso-image"
 # mkisofs arguments to create a hybrid (HFS/Rockridge) CD-ROM image.
-MKISOFS_FLAGS+=	-hfs --macbin \
+MKISOFS_FLAGS+=	-hfs --macbin -data-change-warn \
 	-map ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/extensions.map
 
 iso-image: do-iso-image

CVS commit: src

[Hauke Fath]

Module Name:src
Committed By:   hauke
Date:   Fri May 19 14:47:16 UTC 2023

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

Log Message:
Creating Type&Creator mappings for .bin (macbinary encoded) files,
mkisofs changes files, then turns around and complains they have been
changed.

This is a self-inflicted wound, so demote the error to a warning.

Reported upstream as .

Arguably fixes PR toolchain/42166

Request pull-ups to netbsd-{8,9,10}.

XXX What about macppc?


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/distrib/cdrom/Makefile
cvs rdiff -u -r1.23 -r1.24 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/distrib/sets/lists/base

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri May 19 11:43:20 UTC 2023

Modified Files:
src/distrib/sets/lists/base: ad.riscv
Removed Files:
src/distrib/sets/lists/base: md.riskv64

Log Message:
we should only need this one


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/base/ad.riscv
cvs rdiff -u -r1.1 -r0 src/distrib/sets/lists/base/md.riskv64

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/base/ad.riscv
diff -u src/distrib/sets/lists/base/ad.riscv:1.24 src/distrib/sets/lists/base/ad.riscv:1.25
--- src/distrib/sets/lists/base/ad.riscv:1.24	Wed May 17 20:28:37 2023
+++ src/distrib/sets/lists/base/ad.riscv	Fri May 19 07:43:20 2023
@@ -1,10 +1,10 @@
-# $NetBSD: ad.riscv,v 1.24 2023/05/18 00:28:37 christos Exp $
+# $NetBSD: ad.riscv,v 1.25 2023/05/19 11:43:20 christos Exp $
 ./libexec/ld.elf_so-rv32			base-compat-shlib	compat,pic,arch64
 ./usr/libexec/ld.elf_so-rv32			base-compat-shlib	compat,pic,arch64
-./usr/lib/r32/opensslbase-crypto-usr		compat
-./usr/lib/r32/openssl/engines			base-crypto-usr		compat
-./usr/lib/r32/openssl/modules			base-crypto-usr		compat
-./usr/lib/r32/openssl/modules/legacy.so		base-crypto-usr		compat,pic,openssl=30
+./usr/lib/rv32/opensslbase-crypto-usr		compat
+./usr/lib/rv32/openssl/engines			base-crypto-usr		compat
+./usr/lib/rv32/openssl/modules			base-crypto-usr		compat
+./usr/lib/rv32/openssl/modules/legacy.so	base-crypto-usr		compat,pic,openssl=30
 ./usr/mdec/bootriscv64.efi			base-sysutil-bin	uefi,arch64
 ./usr/share/sysinst/catalog/sysinstmsgs.de	base-util-share
 ./usr/share/sysinst/catalog/sysinstmsgs.es	base-util-share

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri May 19 11:43:20 UTC 2023

Modified Files:
src/distrib/sets/lists/base: ad.riscv
Removed Files:
src/distrib/sets/lists/base: md.riskv64

Log Message:
we should only need this one


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/base/ad.riscv
cvs rdiff -u -r1.1 -r0 src/distrib/sets/lists/base/md.riskv64

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

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Fri May 19 10:42:34 UTC 2023

Modified Files:
src/external/gpl3/gcc.old/usr.bin/host-libcpp: Makefile
src/external/gpl3/gcc/usr.bin/host-libcpp: Makefile
src/tools: Makefile.gnuhost

Log Message:
Fix passing -j NNN to gmake

Use a more restrictive pattern to extract -j NNN from MAKEFLAGS
into GMAKE_J_ARGS, to avoid false positives when the source directory
has "-j" in the path (e.g "amd64-job-12" or "src-j").
Previously this could pass either -"-j" or "-j BIGNUM" to gmake
and result in "vfork: Resource temporarily unavailable" failures.

PR misc/54456


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gcc.old/usr.bin/host-libcpp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile
cvs rdiff -u -r1.55 -r1.56 src/tools/Makefile.gnuhost

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

CVS commit: src

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Fri May 19 10:42:34 UTC 2023

Modified Files:
src/external/gpl3/gcc.old/usr.bin/host-libcpp: Makefile
src/external/gpl3/gcc/usr.bin/host-libcpp: Makefile
src/tools: Makefile.gnuhost

Log Message:
Fix passing -j NNN to gmake

Use a more restrictive pattern to extract -j NNN from MAKEFLAGS
into GMAKE_J_ARGS, to avoid false positives when the source directory
has "-j" in the path (e.g "amd64-job-12" or "src-j").
Previously this could pass either -"-j" or "-j BIGNUM" to gmake
and result in "vfork: Resource temporarily unavailable" failures.

PR misc/54456


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gcc.old/usr.bin/host-libcpp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile
cvs rdiff -u -r1.55 -r1.56 src/tools/Makefile.gnuhost

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.old/usr.bin/host-libcpp/Makefile
diff -u src/external/gpl3/gcc.old/usr.bin/host-libcpp/Makefile:1.6 src/external/gpl3/gcc.old/usr.bin/host-libcpp/Makefile:1.7
--- src/external/gpl3/gcc.old/usr.bin/host-libcpp/Makefile:1.6	Mon Feb 20 02:12:35 2023
+++ src/external/gpl3/gcc.old/usr.bin/host-libcpp/Makefile	Fri May 19 10:42:34 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2023/02/20 02:12:35 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2023/05/19 10:42:34 lukem Exp $
 
 BUILD_ENV= \
 		AR=${HOST_AR:Q} \
@@ -19,7 +19,7 @@ BUILD_ENV= \
 		RANLIB=${HOST_RANLIB:Q} \
 		YACC=${YACC:Q}
 
-GMAKE_J_ARGS?=	${MAKEFLAGS:[*]:M*-j*:C/.*(-j ?[0-9]*).*/\1/W}
+GMAKE_J_ARGS?=	${MAKEFLAGS:[*]:M*-j*:C/(^|.* )(-j ?[0-9][0-9]*).*/\2/W}
 BUILD_COMMAND=	/usr/bin/env -i ${BUILD_ENV} ${TOOL_GMAKE} ${GMAKE_J_ARGS} -e
 
 libcpp/libcpp.a:

Index: src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile:1.5 src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile:1.6
--- src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile:1.5	Wed Jun 24 05:06:08 2020
+++ src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile	Fri May 19 10:42:34 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2020/06/24 05:06:08 rin Exp $
+#	$NetBSD: Makefile,v 1.6 2023/05/19 10:42:34 lukem Exp $
 
 BUILD_ENV= \
 		AR=${HOST_AR:Q} \
@@ -19,7 +19,7 @@ BUILD_ENV= \
 		RANLIB=${HOST_RANLIB:Q} \
 		YACC=${YACC:Q}
 
-GMAKE_J_ARGS?=	${MAKEFLAGS:[*]:M*-j*:C/.*(-j ?[0-9]*).*/\1/W}
+GMAKE_J_ARGS?=	${MAKEFLAGS:[*]:M*-j*:C/(^|.* )(-j ?[0-9][0-9]*).*/\2/W}
 BUILD_COMMAND=	/usr/bin/env -i ${BUILD_ENV} ${TOOL_GMAKE} ${GMAKE_J_ARGS} -e
 
 libcpp/libcpp.a:

Index: src/tools/Makefile.gnuhost
diff -u src/tools/Makefile.gnuhost:1.55 src/tools/Makefile.gnuhost:1.56
--- src/tools/Makefile.gnuhost:1.55	Mon May 15 21:24:56 2023
+++ src/tools/Makefile.gnuhost	Fri May 19 10:42:34 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.gnuhost,v 1.55 2023/05/15 21:24:56 lukem Exp $
+#	$NetBSD: Makefile.gnuhost,v 1.56 2023/05/19 10:42:34 lukem Exp $
 #
 # Rules used when building a GNU host package.  Expects MODULE to be set.
 #
@@ -100,7 +100,7 @@ BUILD_COMMAND=	${BUILD_ENV} ${MAKE} ${MA
 # gmake version of this puts MAKE_ARGS in the environment to be sure that
 # sub-gmake's get them, otherwise tools/gcc tries to build libgcc and
 # fails.  it also uses "env -i" to entirely clear out MAKEFLAGS.
-GMAKE_J_ARGS?=	${MAKEFLAGS:[*]:M*-j*:C/.*(-j ?[0-9]*).*/\1/W}
+GMAKE_J_ARGS?=	${MAKEFLAGS:[*]:M*-j*:C/(^|.* )(-j ?[0-9][0-9]*).*/\2/W}
 BUILD_COMMAND=	/usr/bin/env -i ${BUILD_ENV} ${MAKE_ARGS:N-*} ${TOOL_GMAKE} ${GMAKE_J_ARGS} -e ${MAKE_ARGS}
 
 .endif

CVS commit: src/tests/usr.bin/indent

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Fri May 19 07:05:26 UTC 2023

Modified Files:
src/tests/usr.bin/indent: opt_cdb.c

Log Message:
tests/indent: test multi-line comments with -ncdb


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/indent/opt_cdb.c

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

Modified files:

Index: src/tests/usr.bin/indent/opt_cdb.c
diff -u src/tests/usr.bin/indent/opt_cdb.c:1.8 src/tests/usr.bin/indent/opt_cdb.c:1.9
--- src/tests/usr.bin/indent/opt_cdb.c:1.8	Sun Apr 24 09:04:12 2022
+++ src/tests/usr.bin/indent/opt_cdb.c	Fri May 19 07:05:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_cdb.c,v 1.8 2022/04/24 09:04:12 rillig Exp $ */
+/* $NetBSD: opt_cdb.c,v 1.9 2023/05/19 07:05:26 rillig Exp $ */
 
 /*
  * Tests for the options '-cdb' and '-ncdb'.
@@ -198,3 +198,30 @@ example(void)
 /*
  * */
 //indent end
+
+
+/*
+ * Since 2019-04-04, the -ncdb option condenses multi-line comments as well,
+ * not only single-line comments.
+ *
+ * XXX: Is this intended?
+ */
+//indent input
+{
+	/*
+	 * This is the first paragraph.
+	 *
+	 * This is the second paragraph.
+	 */
+}
+//indent end
+
+//indent run-equals-input -cdb
+
+//indent run -ncdb
+{
+	/* This is the first paragraph.
+	 *
+	 * This is the second paragraph. */
+}
+//indent end

CVS commit: src/tests/usr.bin/indent

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Fri May 19 07:05:26 UTC 2023

Modified Files:
src/tests/usr.bin/indent: opt_cdb.c

Log Message:
tests/indent: test multi-line comments with -ncdb


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/indent/opt_cdb.c

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