CVS commit: src/external/cddl/osnet/dev/fbt/x86

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Aug 18 11:26:17 UTC 2021

Modified Files:
src/external/cddl/osnet/dev/fbt/x86: fbt_isa.c

Log Message:
PR/56355: Exclude the symbol trap, not all symbols other than trap.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c

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

Modified files:

Index: src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c
diff -u src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c:1.5 src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c:1.6
--- src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c:1.5	Sun Aug 15 16:33:57 2021
+++ src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c	Wed Aug 18 11:26:17 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: fbt_isa.c,v 1.5 2021/08/15 16:33:57 christos Exp $	*/
+/*	$NetBSD: fbt_isa.c,v 1.6 2021/08/18 11:26:17 riastradh Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -251,7 +251,7 @@ fbt_provide_module_cb(const char *name, 
 	/*
 	 * Exclude some more symbols which can be called from probe context.
 	 */
-	if (strcmp(name, "trap") ||
+	if (strcmp(name, "trap") == 0 ||
 	strcmp(name, "x86_curcpu") == 0 ||
 	strcmp(name, "x86_curlwp") == 0) {
 		return 0;

CVS commit: src/external/bsd/openldap/lib/libldap_r

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 17 01:59:16 UTC 2021

Modified Files:
src/external/bsd/openldap/lib/libldap_r: Makefile

Log Message:
add missing tpool.c.  fixes libreoffice build.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openldap/lib/libldap_r/Makefile

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

Modified files:

Index: src/external/bsd/openldap/lib/libldap_r/Makefile
diff -u src/external/bsd/openldap/lib/libldap_r/Makefile:1.6 src/external/bsd/openldap/lib/libldap_r/Makefile:1.7
--- src/external/bsd/openldap/lib/libldap_r/Makefile:1.6	Sat Aug 14 16:15:04 2021
+++ src/external/bsd/openldap/lib/libldap_r/Makefile	Tue Aug 17 01:59:16 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2021/08/14 16:15:04 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2021/08/17 01:59:16 mrg Exp $
 
 USE_FORT?=	yes
 CWARNFLAGS.clang=	-Wno-format-extra-args
@@ -11,7 +11,7 @@ LIB=		ldap_r
 
 SRCS+=		threads.c rdwr.c rq.c \
 		thr_posix.c thr_thr.c thr_nt.c \
-		thr_pth.c thr_debug.c
+		thr_pth.c thr_debug.c tpool.c
 
 COPTS+=		-pthread
 LIBDPLIBS+=	pthread	${.CURDIR}/../../../../../lib/libpthread

CVS commit: src/external/gpl3/gcc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug 16 18:43:09 UTC 2021

Removed Files:
src/external/gpl3/gcc/lib/libbacktrace/arch/arm: backtrace-supported.h
config.h
src/external/gpl3/gcc/lib/libbacktrace/arch/armeb:
backtrace-supported.h config.h
src/external/gpl3/gcc/lib/libgcc/arch/arm: auto-target.h defs.mk
gthr-defs.mk
src/external/gpl3/gcc/lib/libgcc/arch/armeb: auto-target.h defs.mk
gthr-defs.mk
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/arm: defs.mk gcov-iov.h
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/armeb: defs.mk gcov-iov.h
src/external/gpl3/gcc/lib/libgomp/arch/arm: config.h libgomp.spec
libgomp_f.h omp.h
src/external/gpl3/gcc/lib/libgomp/arch/armeb: config.h libgomp.spec
libgomp_f.h omp.h
src/external/gpl3/gcc/lib/libiberty/arch/arm: config.h
src/external/gpl3/gcc/lib/libiberty/arch/armeb: config.h
src/external/gpl3/gcc/lib/libobjc/arch/arm: config.h defs.mk
src/external/gpl3/gcc/lib/libobjc/arch/armeb: config.h defs.mk
src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm: c++config.h
cxxabi_tweaks.h defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb: c++config.h
cxxabi_tweaks.h defs.mk gstdint.h symver-config.h
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/aarch64:
Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/arm: Makefile
src/external/gpl3/gcc/usr.bin/gcc/arch/arm: all-tree.def
arm-cpu-cdata.h arm-cpu-data.h arm-cpu.h arm-isa.h auto-host.h
bconfig.h bversion.h config.h configargs.h defs.mk gthr-default.h
gtyp-input.list insn-modes.h multilib.h plugin-version.h tm.h
src/external/gpl3/gcc/usr.bin/gcc/arch/armeb: all-tree.def
arm-cpu-cdata.h arm-cpu-data.h arm-cpu.h arm-isa.h auto-host.h
bconfig.h bversion.h config.h configargs.h defs.mk gthr-default.h
gtyp-input.list insn-modes.h multilib.h plugin-version.h tm.h
src/external/gpl3/gcc/usr.bin/libcpp/arch/arm: config.h
src/external/gpl3/gcc/usr.bin/libcpp/arch/armeb: config.h
src/external/gpl3/gcc/usr.bin/libdecnumber/arch/arm: config.h
src/external/gpl3/gcc/usr.bin/libdecnumber/arch/armeb: config.h

Log Message:
remove unused oabi mknative output.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r0 \
src/external/gpl3/gcc/lib/libbacktrace/arch/arm/backtrace-supported.h
cvs rdiff -u -r1.6 -r0 \
src/external/gpl3/gcc/lib/libbacktrace/arch/arm/config.h
cvs rdiff -u -r1.7 -r0 \
src/external/gpl3/gcc/lib/libbacktrace/arch/armeb/backtrace-supported.h
cvs rdiff -u -r1.5 -r0 \
src/external/gpl3/gcc/lib/libbacktrace/arch/armeb/config.h
cvs rdiff -u -r1.6 -r0 \
src/external/gpl3/gcc/lib/libgcc/arch/arm/auto-target.h \
src/external/gpl3/gcc/lib/libgcc/arch/arm/defs.mk
cvs rdiff -u -r1.1 -r0 src/external/gpl3/gcc/lib/libgcc/arch/arm/gthr-defs.mk
cvs rdiff -u -r1.6 -r0 \
src/external/gpl3/gcc/lib/libgcc/arch/armeb/auto-target.h
cvs rdiff -u -r1.5 -r0 src/external/gpl3/gcc/lib/libgcc/arch/armeb/defs.mk
cvs rdiff -u -r1.1 -r0 \
src/external/gpl3/gcc/lib/libgcc/arch/armeb/gthr-defs.mk
cvs rdiff -u -r1.5 -r0 \
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/arm/defs.mk
cvs rdiff -u -r1.16 -r0 \
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/arm/gcov-iov.h
cvs rdiff -u -r1.4 -r0 \
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/armeb/defs.mk
cvs rdiff -u -r1.15 -r0 \
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/armeb/gcov-iov.h
cvs rdiff -u -r1.9 -r0 src/external/gpl3/gcc/lib/libgomp/arch/arm/config.h
cvs rdiff -u -r1.3 -r0 \
src/external/gpl3/gcc/lib/libgomp/arch/arm/libgomp.spec
cvs rdiff -u -r1.7 -r0 src/external/gpl3/gcc/lib/libgomp/arch/arm/libgomp_f.h
cvs rdiff -u -r1.8 -r0 src/external/gpl3/gcc/lib/libgomp/arch/arm/omp.h
cvs rdiff -u -r1.8 -r0 src/external/gpl3/gcc/lib/libgomp/arch/armeb/config.h
cvs rdiff -u -r1.3 -r0 \
src/external/gpl3/gcc/lib/libgomp/arch/armeb/libgomp.spec
cvs rdiff -u -r1.6 -r0 \
src/external/gpl3/gcc/lib/libgomp/arch/armeb/libgomp_f.h
cvs rdiff -u -r1.7 -r0 src/external/gpl3/gcc/lib/libgomp/arch/armeb/omp.h
cvs rdiff -u -r1.8 -r0 src/external/gpl3/gcc/lib/libiberty/arch/arm/config.h
cvs rdiff -u -r1.9 -r0 \
src/external/gpl3/gcc/lib/libiberty/arch/armeb/config.h
cvs rdiff -u -r1.4 -r0 src/external/gpl3/gcc/lib/libobjc/arch/arm/config.h
cvs rdiff -u -r1.6 -r0 src/external/gpl3/gcc/lib/libobjc/arch/arm/defs.mk
cvs rdiff -u -r1.3 -r0 src/external/gpl3/gcc/lib/libobjc/arch/armeb/config.h
cvs rdiff -u -r1.5 -r0 src/external/gpl3/gcc/lib/libobjc/arch/armeb/defs.mk
cvs rdiff -u -r1.36 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h
cvs rdiff -u -r1.7 -r0 \

CVS commit: src/external/gpl3/gcc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug 16 17:42:06 UTC 2021

Modified Files:
src/external/gpl3/gcc: README.gcc10

Log Message:
note sh3 switched.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/gpl3/gcc/README.gcc10

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/README.gcc10
diff -u src/external/gpl3/gcc/README.gcc10:1.23 src/external/gpl3/gcc/README.gcc10:1.24
--- src/external/gpl3/gcc/README.gcc10:1.23	Sat Jun 19 06:19:35 2021
+++ src/external/gpl3/gcc/README.gcc10	Mon Aug 16 17:42:05 2021
@@ -1,4 +1,4 @@
-$NetBSD: README.gcc10,v 1.23 2021/06/19 06:19:35 mrg Exp $
+$NetBSD: README.gcc10,v 1.24 2021/08/16 17:42:05 mrg Exp $
 
 
 new stuff:
@@ -58,8 +58,8 @@ mips64eb	y	y	y	y		y		y	y	y
 mips64el	y	b	y	y		y		y	?	y
 powerpc		y	b	y	y		y		y	y	y
 powerpc64	y	b	y	y		y		N/A	N/A	y
-sh3eb		y	b	y	y		y		?	?	?
-sh3el		y	y	y	y		y		y	y[7]	n
+sh3eb		y	b	y	y		y		?[2]	?	y
+sh3el		y	y	y	y		y		y	y[7]	y
 sparc		y	y	y	y		y		y	y	y
 sparc64		y	y	y	y		y		y	y	y
 vax		y	y	y	y		y		y	n[6]	y
@@ -72,6 +72,7 @@ coldfire	?	N/A	?	?		?		N/A	N/A
 architecture	tools	kernels	libgcc	native-gcc	make release	runs	atf
 
 [1] - kernel may be too large, does not boot.  GCC 9 is the same, though.
+[2] - failed to find any sh3-eb systems to test.
 [6] - vax vs c++ exceptions issue, same as it ever was
 [7] - fails just as poorly in gxemul/landisk as GCC 9
 [8] - i386 seems to have a signal delivery issue.  pthread tests hang and then

CVS commit: src/external/cddl/osnet/dev/fbt/x86

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Aug 15 16:33:57 UTC 2021

Modified Files:
src/external/cddl/osnet/dev/fbt/x86: fbt_isa.c

Log Message:
PR/56355: Taylor Campbell: restore strcmp() over strncmp()


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c

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

Modified files:

Index: src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c
diff -u src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c:1.4 src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c:1.5
--- src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c:1.4	Wed Aug 11 07:16:49 2021
+++ src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c	Sun Aug 15 12:33:57 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: fbt_isa.c,v 1.4 2021/08/11 11:16:49 christos Exp $	*/
+/*	$NetBSD: fbt_isa.c,v 1.5 2021/08/15 16:33:57 christos Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -251,9 +251,9 @@ fbt_provide_module_cb(const char *name, 
 	/*
 	 * Exclude some more symbols which can be called from probe context.
 	 */
-	if (strncmp(name, "trap", 4) ||
-	strncmp(name, "x86_curcpu", 10) == 0 ||
-	strncmp(name, "x86_curlwp", 10) == 0) {
+	if (strcmp(name, "trap") ||
+	strcmp(name, "x86_curcpu") == 0 ||
+	strcmp(name, "x86_curlwp") == 0) {
 		return 0;
 	}
 #endif

CVS commit: src/external/bsd/jemalloc/lib

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sun Aug 15 12:41:40 UTC 2021

Modified Files:
src/external/bsd/jemalloc/lib: Makefile.inc

Log Message:
jemalloc: suppress two irrelevant lint warnings


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/jemalloc/lib/Makefile.inc

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

Modified files:

Index: src/external/bsd/jemalloc/lib/Makefile.inc
diff -u src/external/bsd/jemalloc/lib/Makefile.inc:1.14 src/external/bsd/jemalloc/lib/Makefile.inc:1.15
--- src/external/bsd/jemalloc/lib/Makefile.inc:1.14	Tue Jul  6 12:40:24 2021
+++ src/external/bsd/jemalloc/lib/Makefile.inc	Sun Aug 15 12:41:40 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.14 2021/07/06 12:40:24 thorpej Exp $
+#	$NetBSD: Makefile.inc,v 1.15 2021/08/15 12:41:40 rillig Exp $
 
 JEMALLOC:=${.PARSEDIR}/..
 
@@ -44,6 +44,8 @@ witness.c
 CPPFLAGS.${i}+=-I${JEMALLOC}/include -DJEMALLOC_PROTECT_NOSTD
 COPTS.${i}+= -fvisibility=hidden -funroll-loops
 COPTS.${i}+= ${${ACTIVE_CC} == "clang":? -Wno-atomic-alignment :}
+LINTFLAGS.${i}+=	-X 231	# argument unused
+LINTFLAGS.${i}+=	-X 220	# fallthrough on case statement
 .endfor
 
 COPTS.background_thread.c+=-Wno-error=stack-protector

CVS commit: src/external/bsd/openldap/lib/libldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Aug 15 10:33:58 UTC 2021

Modified Files:
src/external/bsd/openldap/lib/libldap: Makefile.libldap

Log Message:
Conditionalize GSSAPI use on USE_KERBEROS


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap

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

Modified files:

Index: src/external/bsd/openldap/lib/libldap/Makefile.libldap
diff -u src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.11 src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.12
--- src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.11	Sat Aug 14 12:15:03 2021
+++ src/external/bsd/openldap/lib/libldap/Makefile.libldap	Sun Aug 15 06:33:58 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libldap,v 1.11 2021/08/14 16:15:03 christos Exp $
+#	$NetBSD: Makefile.libldap,v 1.12 2021/08/15 10:33:58 christos Exp $
 
 .include "../../openldap.mk"
 
@@ -24,7 +24,11 @@ CPPFLAGS+=	-DLDAP_LIBRARY -DHAVE_GSSAPI
 
 LIBDPLIBS+=	lber	${.CURDIR}/../liblber
 
+.if ${USE_KERBEROS} != "no"
+CPPFLAGS+=	-DHAVE_GSSAPI
 LIBDPLIBS+=	gssapi	${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libgssapi
+.endif
+
 LIBDPLIBS+=	crypto	${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
 LIBDPLIBS+=	ssl	${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libssl
 

CVS commit: src/external/bsd/openldap/dist/libraries/libldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 14 16:15:46 UTC 2021

Added Files:
src/external/bsd/openldap/dist/libraries/libldap: gssapi.c

Log Message:
Put back gssapi.c


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.4 \
src/external/bsd/openldap/dist/libraries/libldap/gssapi.c

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

Added files:

Index: src/external/bsd/openldap/dist/libraries/libldap/gssapi.c
diff -u /dev/null src/external/bsd/openldap/dist/libraries/libldap/gssapi.c:1.4
--- /dev/null	Sat Aug 14 12:15:46 2021
+++ src/external/bsd/openldap/dist/libraries/libldap/gssapi.c	Sat Aug 14 12:15:46 2021
@@ -0,0 +1,1015 @@
+/*	$NetBSD: gssapi.c,v 1.4 2021/08/14 16:15:46 christos Exp $	*/
+
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2020 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Author: Stefan Metzmacher 
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
+
+#include 
+__RCSID("$NetBSD: gssapi.c,v 1.4 2021/08/14 16:15:46 christos Exp $");
+
+#include "portable.h"
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#ifdef HAVE_LIMITS_H
+#include 
+#endif
+
+#include "ldap-int.h"
+
+#ifdef HAVE_GSSAPI
+
+#ifdef HAVE_GSSAPI_GSSAPI_H
+#include 
+#else
+#include 
+#endif
+
+static char *
+gsserrstr(
+	char *buf,
+	ber_len_t buf_len,
+	gss_OID mech,
+	int gss_rc,
+	OM_uint32 minor_status )
+{
+	OM_uint32 min2;
+	gss_buffer_desc mech_msg = GSS_C_EMPTY_BUFFER;
+	gss_buffer_desc gss_msg = GSS_C_EMPTY_BUFFER;
+	gss_buffer_desc minor_msg = GSS_C_EMPTY_BUFFER;
+	OM_uint32 msg_ctx = 0;
+
+	if (buf == NULL) {
+		return NULL;
+	}
+
+	if (buf_len == 0) {
+		return NULL;
+	}
+
+#ifdef HAVE_GSS_OID_TO_STR
+	gss_oid_to_str(, mech, _msg);
+#endif
+	gss_display_status(, gss_rc, GSS_C_GSS_CODE,
+			   mech, _ctx, _msg);
+	gss_display_status(, minor_status, GSS_C_MECH_CODE,
+			   mech, _ctx, _msg);
+
+	snprintf(buf, buf_len, "gss_rc[%d:%*s] mech[%*s] minor[%u:%*s]",
+		 gss_rc, (int)gss_msg.length,
+		 (const char *)(gss_msg.value?gss_msg.value:""),
+		 (int)mech_msg.length,
+		 (const char *)(mech_msg.value?mech_msg.value:""),
+		 minor_status, (int)minor_msg.length,
+		 (const char *)(minor_msg.value?minor_msg.value:""));
+
+	gss_release_buffer(, _msg);
+	gss_release_buffer(, _msg);
+	gss_release_buffer(, _msg);
+
+	buf[buf_len-1] = '\0';
+
+	return buf;
+}
+
+static void
+sb_sasl_gssapi_init(
+	struct sb_sasl_generic_data *p,
+	ber_len_t *min_send,
+	ber_len_t *max_send,
+	ber_len_t *max_recv )
+{
+	gss_ctx_id_t gss_ctx = (gss_ctx_id_t)p->ops_private;
+	int gss_rc;
+	OM_uint32 minor_status;
+	gss_OID ctx_mech = GSS_C_NO_OID;
+	OM_uint32 ctx_flags = 0;
+	int conf_req_flag = 0;
+	OM_uint32 max_input_size;
+
+	gss_inquire_context(_status,
+			gss_ctx,
+			NULL,
+			NULL,
+			NULL,
+			_mech,
+			_flags,
+			NULL,
+			NULL);
+
+	if (ctx_flags & (GSS_C_CONF_FLAG)) {
+		conf_req_flag = 1;
+	}
+
+#if defined(HAVE_CYRUS_SASL)
+#define SEND_PREALLOC_SIZE	SASL_MIN_BUFF_SIZE
+#else
+#define SEND_PREALLOC_SIZE  4096
+#endif
+#define SEND_MAX_WIRE_SIZE	0x00A0
+#define RECV_MAX_WIRE_SIZE	0x0FFF
+#define FALLBACK_SEND_MAX_SIZE	0x009FFFB8 /* from MIT 1.5.x */
+
+	gss_rc = gss_wrap_size_limit(_status, gss_ctx,
+ conf_req_flag, GSS_C_QOP_DEFAULT,
+ SEND_MAX_WIRE_SIZE, _input_size);
+	if ( gss_rc != GSS_S_COMPLETE ) {
+		char msg[256];
+		ber_log_printf( LDAP_DEBUG_ANY, p->sbiod->sbiod_sb->sb_debug,
+"sb_sasl_gssapi_init: failed to wrap size limit: %s\n",
+gsserrstr( msg, sizeof(msg), ctx_mech, gss_rc, minor_status ) );
+		ber_log_printf( LDAP_DEBUG_ANY, p->sbiod->sbiod_sb->sb_debug,
+"sb_sasl_gssapi_init: fallback to default wrap size limit\n");
+		/*
+		 * some libgssglue/libgssapi versions
+		 * have a broken gss_wrap_size_limit()
+		 * implementation
+		 */
+		max_input_size = FALLBACK_SEND_MAX_SIZE;
+	}
+
+	*min_send = SEND_PREALLOC_SIZE;
+	*max_send = max_input_size;
+	*max_recv = RECV_MAX_WIRE_SIZE;
+}
+
+static ber_int_t
+sb_sasl_gssapi_encode(
+	struct sb_sasl_generic_data *p,
+	unsigned char *buf,
+	ber_len_t len,
+	Sockbuf_Buf *dst )
+{
+	gss_ctx_id_t gss_ctx = (gss_ctx_id_t)p->ops_private;
+	int gss_rc;
+	OM_uint32 minor_status;
+	gss_buffer_desc unwrapped, wrapped;
+	gss_OID ctx_mech = GSS_C_NO_OID;
+	OM_uint32 ctx_flags = 0;
+	int conf_req_flag = 0;
+	int conf_state;
+	unsigned char *b;
+	ber_len_t pkt_len;
+
+	unwrapped.value		= buf;
+	unwrapped.length	= len;
+
+	gss_inquire_context(_status,
+			gss_ctx,
+			NULL,
+			

CVS commit: src/external/bsd/openldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 14 16:15:04 UTC 2021

Modified Files:
src/external/bsd/openldap: openldap.mk
src/external/bsd/openldap/bin: Makefile.inc
src/external/bsd/openldap/dist/build: mkversion version.h
src/external/bsd/openldap/dist/clients/tools: common.c common.h
ldapcompare.c ldapdelete.c ldapexop.c ldapmodify.c ldapmodrdn.c
ldappasswd.c ldapsearch.c ldapurl.c ldapvc.c ldapwhoami.c
src/external/bsd/openldap/dist/contrib/ldapc++/src: LDAPAddRequest.h
LDAPAsynConnection.h LDAPAttrType.h LDAPAttribute.h
LDAPAttributeList.h LDAPBindRequest.h LDAPCompareRequest.h
LDAPConnection.h LDAPConstraints.h LDAPControl.h LDAPControlSet.h
LDAPDeleteRequest.h LDAPEntry.h LDAPEntryList.h LDAPException.h
LDAPExtRequest.h LDAPExtResult.h LDAPMessage.h LDAPMessageQueue.h
LDAPModDNRequest.h LDAPModList.h LDAPModification.h
LDAPModifyRequest.h LDAPObjClass.h LDAPRebind.h LDAPRebindAuth.h
LDAPReferenceList.h LDAPRequest.h LDAPResult.h LDAPSaslBindResult.h
LDAPSchema.h LDAPSearchReference.h LDAPSearchRequest.h
LDAPSearchResult.h LDAPSearchResults.h LDAPUrl.h LDAPUrlList.h
LdifReader.h LdifWriter.h SaslInteraction.h
SaslInteractionHandler.h StringList.h TlsOptions.h debug.h
src/external/bsd/openldap/dist/contrib/ldapc++/src/ac: time.h
src/external/bsd/openldap/dist/contrib/ldaptcl: neoXldap.c tclAppInit.c
tkAppInit.c
src/external/bsd/openldap/dist/contrib/slapd-modules/acl: gssacl.c
posixgroup.c
src/external/bsd/openldap/dist/contrib/slapd-modules/addpartial:
addpartial-overlay.c
src/external/bsd/openldap/dist/contrib/slapd-modules/adremap: adremap.c
src/external/bsd/openldap/dist/contrib/slapd-modules/allop: allop.c
src/external/bsd/openldap/dist/contrib/slapd-modules/allowed: allowed.c
src/external/bsd/openldap/dist/contrib/slapd-modules/authzid: authzid.c
src/external/bsd/openldap/dist/contrib/slapd-modules/autogroup:
autogroup.c
src/external/bsd/openldap/dist/contrib/slapd-modules/cloak: cloak.c
src/external/bsd/openldap/dist/contrib/slapd-modules/comp_match: asn.h
asn_to_syn_mr.c authorityKeyIdentifier.c authorityKeyIdentifier.h
certificate.c certificate.h componentlib.c componentlib.h crl.c
crl.h init.c
src/external/bsd/openldap/dist/contrib/slapd-modules/datamorph:
datamorph.c
src/external/bsd/openldap/dist/contrib/slapd-modules/denyop: denyop.c
src/external/bsd/openldap/dist/contrib/slapd-modules/dsaschema:
dsaschema.c
src/external/bsd/openldap/dist/contrib/slapd-modules/dupent: dupent.c
src/external/bsd/openldap/dist/contrib/slapd-modules/kinit: kinit.c
src/external/bsd/openldap/dist/contrib/slapd-modules/lastbind:
lastbind.c
src/external/bsd/openldap/dist/contrib/slapd-modules/lastmod: lastmod.c
src/external/bsd/openldap/dist/contrib/slapd-modules/noopsrch:
noopsrch.c
src/external/bsd/openldap/dist/contrib/slapd-modules/nops: nops.c
src/external/bsd/openldap/dist/contrib/slapd-modules/nssov: alias.c
ether.c group.c host.c netgroup.c network.c nssov.c nssov.h pam.c
passwd.c protocol.c rpc.c service.c shadow.c

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-pam-ldapd:
attrs.h nslcd-prot.h nslcd.h tio.c tio.h
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd: apr1.c
kerberos.c netscape.c radius.c
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd/pbkdf2:
pw-pbkdf2.c
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd/sha2:
sha2.c sha2.h slapd-sha2.c
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd/totp:
slapd-totp.c
src/external/bsd/openldap/dist/contrib/slapd-modules/ppm: ppm.c ppm.h
ppm_test.c
src/external/bsd/openldap/dist/contrib/slapd-modules/proxyOld:
proxyOld.c
src/external/bsd/openldap/dist/contrib/slapd-modules/rbac: init.c jts.c
ldap_rbac.h rbac.c rbac.h rbacacl.c rbacaudit.c rbacperm.c
rbacreq.c rbacsess.c rbacuser.c util.c
src/external/bsd/openldap/dist/contrib/slapd-modules/samba4: pguid.c
rdnval.c vernum.c
src/external/bsd/openldap/dist/contrib/slapd-modules/smbk5pwd:
smbk5pwd.c
src/external/bsd/openldap/dist/contrib/slapd-modules/trace: trace.c
src/external/bsd/openldap/dist/contrib/slapd-modules/usn: usn.c
src/external/bsd/openldap/dist/contrib/slapd-modules/variant: variant.c
src/external/bsd/openldap/dist/contrib/slapd-modules/vc: vc.c

CVS commit: src/external/mit/xorg/server/xorg-server

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Aug 11 23:02:39 UTC 2021

Modified Files:
src/external/mit/xorg/server/xorg-server/glamor: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile

Log Message:
Fix glamor - don't use stub functions
${LDADD.gbm} seems to be empty - use -lgbm directly (couldn't find a better
fix)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/glamor/Makefile
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/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/mit/xorg/server/xorg-server/glamor/Makefile
diff -u src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.3 src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.3	Fri Sep  2 03:58:59 2016
+++ src/external/mit/xorg/server/xorg-server/glamor/Makefile	Wed Aug 11 23:02:39 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2016/09/02 03:58:59 jakllsch Exp $
+#	$NetBSD: Makefile,v 1.4 2021/08/11 23:02:39 maya Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -42,13 +42,19 @@ SRCS= \
 	glamor_sync.c
 SRCS+= \
 	glamor_xv.c
+.if ${HAVE_XORG_GLAMOR} == "no"
 SRCS+= \
 	glamor_egl_stubs.c
-SRCS.EGL= \
-	glamor_egl.c
+.else
+SRCS+= \
+	glamor_egl.c \
+	glamor_eglmodule.c
+.endif
 
 CPPFLAGS+=  -I${DESTDIR}${X11INCDIR}/xorg \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
+		-I${DESTDIR}${X11INCDIR}/libdrm \
+		-I${X11SRCDIR.xorg-server}/glamor \
 		-I${X11SRCDIR.xorg-server}/../include
 CPPFLAGS+=  ${X11FLAGS.DIX}
 

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.18 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.19
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.18	Sun Sep 13 23:01:02 2020
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile	Wed Aug 11 23:02:39 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2020/09/13 23:01:02 mrg Exp $
+#	$NetBSD: Makefile,v 1.19 2021/08/11 23:02:39 maya Exp $
 
 .include 
 
@@ -33,7 +33,7 @@ LDADD+=	${LDADD.dix}
 LDADD+=	${LDADD.config}
 LDADD+=	${LDADD.dbe}
 .if ${HAVE_XORG_GLAMOR} != "no"  
-LDADD+=	${LDADD.glamor} ${LDADD.gbm}
+LDADD+=	${LDADD.glamor} -lgbm
 .endif
 LDADD+=	${LDADD.record}
 LDADD+=	${LDADD.hw/xfree86/loader}

CVS commit: src/external/cddl/osnet/dev/fbt/x86

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Aug 11 11:16:49 UTC 2021

Modified Files:
src/external/cddl/osnet/dev/fbt/x86: fbt_isa.c

Log Message:
PR/56355: Brad Harder: dtrace triggers double-fault in supervisor mode


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c

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

Modified files:

Index: src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c
diff -u src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c:1.3 src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c:1.4
--- src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c:1.3	Sat May  2 07:37:17 2020
+++ src/external/cddl/osnet/dev/fbt/x86/fbt_isa.c	Wed Aug 11 07:16:49 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: fbt_isa.c,v 1.3 2020/05/02 11:37:17 maxv Exp $	*/
+/*	$NetBSD: fbt_isa.c,v 1.4 2021/08/11 11:16:49 christos Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -251,8 +251,9 @@ fbt_provide_module_cb(const char *name, 
 	/*
 	 * Exclude some more symbols which can be called from probe context.
 	 */
-	if (strcmp(name, "x86_curcpu") == 0 ||
-	strcmp(name, "x86_curlwp") == 0) {
+	if (strncmp(name, "trap", 4) ||
+	strncmp(name, "x86_curcpu", 10) == 0 ||
+	strncmp(name, "x86_curlwp", 10) == 0) {
 		return 0;
 	}
 #endif

CVS commit: src/external/bsd/openpam/dist/lib/libpam

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Aug 11 09:11:05 UTC 2021

Modified Files:
src/external/bsd/openpam/dist/lib/libpam: pam_putenv.c

Log Message:
use const for strchr assignment.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openpam/dist/lib/libpam/pam_putenv.c

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

Modified files:

Index: src/external/bsd/openpam/dist/lib/libpam/pam_putenv.c
diff -u src/external/bsd/openpam/dist/lib/libpam/pam_putenv.c:1.3 src/external/bsd/openpam/dist/lib/libpam/pam_putenv.c:1.4
--- src/external/bsd/openpam/dist/lib/libpam/pam_putenv.c:1.3	Sat May  6 15:50:10 2017
+++ src/external/bsd/openpam/dist/lib/libpam/pam_putenv.c	Wed Aug 11 05:11:04 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pam_putenv.c,v 1.3 2017/05/06 19:50:10 christos Exp $	*/
+/*	$NetBSD: pam_putenv.c,v 1.4 2021/08/11 09:11:04 christos Exp $	*/
 
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
@@ -42,7 +42,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: pam_putenv.c,v 1.3 2017/05/06 19:50:10 christos Exp $");
+__RCSID("$NetBSD: pam_putenv.c,v 1.4 2021/08/11 09:11:04 christos Exp $");
 
 #include 
 #include 
@@ -63,7 +63,8 @@ int
 pam_putenv(pam_handle_t *pamh,
 	const char *namevalue)
 {
-	char **env, *p;
+	char **env; 
+	const char *p;
 	size_t env_size;
 	int i;
 
@@ -78,10 +79,11 @@ pam_putenv(pam_handle_t *pamh,
 	/* see if the variable is already in the environment */
 	if ((i = openpam_findenv(pamh, namevalue,
 	(size_t)(p - namevalue))) >= 0) {
-		if ((p = strdup(namevalue)) == NULL)
+		char *q;
+		if ((q = strdup(namevalue)) == NULL)
 			RETURNC(PAM_BUF_ERR);
 		FREE(pamh->env[i]);
-		pamh->env[i] = p;
+		pamh->env[i] = q;
 		RETURNC(PAM_SUCCESS);
 	}
 

CVS commit: src/external/gpl2/gettext/dist/gettext-runtime

[Chuck Silvers]

Module Name:src
Committed By:   chs
Date:   Tue Aug  3 20:22:15 UTC 2021

Modified Files:
src/external/gpl2/gettext/dist/gettext-runtime: Makefile.in

Log Message:
do not descend into the man or tests directory.
this avoids a problem where git sets the file timestamps differently
than CVS does and accidentally causes make to try to rebuild
various targets that don't work during the tools build.
this matches the change that was made to Makefile.am in our tree.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in

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

Modified files:

Index: src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in
diff -u src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in:1.2 src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in:1.3
--- src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in:1.2	Tue Jan 12 22:58:02 2016
+++ src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in	Tue Aug  3 20:22:15 2021
@@ -347,7 +347,7 @@ ACLOCAL_AMFLAGS = -I m4 -I ../autoconf-l
 # The list of subdirectories depends on whether --disable-libasprintf was
 # specified.
 @ENABLE_LIBASPRINTF_TRUE@SUBDIR_libasprintf = libasprintf
-SUBDIRS = doc intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po man m4 tests
+SUBDIRS = doc intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po m4
 
 # Allow users to use "gnulib-tool --update".
 

CVS commit: src/external/cddl/osnet/sys/kern

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Jul 25 06:07:42 UTC 2021

Modified Files:
src/external/cddl/osnet/sys/kern: opensolaris.c

Log Message:
KNF


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/kern/opensolaris.c

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

Modified files:

Index: src/external/cddl/osnet/sys/kern/opensolaris.c
diff -u src/external/cddl/osnet/sys/kern/opensolaris.c:1.2 src/external/cddl/osnet/sys/kern/opensolaris.c:1.3
--- src/external/cddl/osnet/sys/kern/opensolaris.c:1.2	Mon May 28 21:05:09 2018
+++ src/external/cddl/osnet/sys/kern/opensolaris.c	Sun Jul 25 06:07:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: opensolaris.c,v 1.2 2018/05/28 21:05:09 chs Exp $	*/
+/*	$NetBSD: opensolaris.c,v 1.3 2021/07/25 06:07:42 skrll Exp $	*/
 /*-
  * Copyright 2007 John Birrell 
  *
@@ -28,11 +28,12 @@
  */
 
 #include 
+#include 
 #include 
+
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

CVS commit: src/external/cddl/osnet/sys/sys

[Frank Kardel]

Module Name:src
Committed By:   kardel
Date:   Sun Jul 18 07:22:22 UTC 2021

Modified Files:
src/external/cddl/osnet/sys/sys: vnode.h

Log Message:
PR kern/56316: vn_open doesn't follow symlinks

remove setting of O_NOFOLLOW. restores ZFS being able
to open devices via symlinks again.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/cddl/osnet/sys/sys/vnode.h

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

Modified files:

Index: src/external/cddl/osnet/sys/sys/vnode.h
diff -u src/external/cddl/osnet/sys/sys/vnode.h:1.19 src/external/cddl/osnet/sys/sys/vnode.h:1.20
--- src/external/cddl/osnet/sys/sys/vnode.h:1.19	Tue Jun 29 22:40:53 2021
+++ src/external/cddl/osnet/sys/sys/vnode.h	Sun Jul 18 07:22:22 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnode.h,v 1.19 2021/06/29 22:40:53 dholland Exp $	*/
+/*	$NetBSD: vnode.h,v 1.20 2021/07/18 07:22:22 kardel Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -246,8 +246,6 @@ zfs_vn_open(const char *pnamep, enum uio
 	ASSERT(crwhy == CRCREAT);
 	ASSERT(umask == 0);
 
-	filemode |= O_NOFOLLOW;
-
 	pb = pathbuf_create(pnamep);
 	error = vn_open(NULL, pb, 0, filemode, createmode, vpp, NULL, NULL);
 	if (error == 0) {

CVS commit: src/external/gpl3/gcc/dist/gcc/ginclude

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jul 17 16:31:51 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist/gcc/ginclude: stddef.h

Log Message:
provide an equivalent alignment for __float128 for clang and i386 that
does not have it. Idea from mrg@


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/dist/gcc/ginclude/stddef.h

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/ginclude/stddef.h
diff -u src/external/gpl3/gcc/dist/gcc/ginclude/stddef.h:1.10 src/external/gpl3/gcc/dist/gcc/ginclude/stddef.h:1.11
--- src/external/gpl3/gcc/dist/gcc/ginclude/stddef.h:1.10	Wed Jul 14 09:24:58 2021
+++ src/external/gpl3/gcc/dist/gcc/ginclude/stddef.h	Sat Jul 17 12:31:51 2021
@@ -420,9 +420,14 @@ typedef struct {
  use __float128 here; that is only available on some
  architectures, but only on i386 is extra alignment needed for
  __float128.  */
-#if defined(__i386__) && !defined(__clang__)
+#if defined(__i386__)
+#ifdef __clang__
+  // 16 is the gcc alignment for __float128
+  long long __max_align_128 __attribute__((__aligned__(16)));
+#else
   __float128 __max_align_f128 __attribute__((__aligned__(__alignof(__float128;
 #endif
+#endif
 } max_align_t;
 #endif
 #endif /* C11 or C++11.  */

CVS commit: src/external/gpl3/gcc/dist/gcc/ginclude

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jul 14 13:24:59 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist/gcc/ginclude: stddef.h

Log Message:
clang does not support __float128 in our configuration and i386


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/ginclude/stddef.h

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/ginclude/stddef.h
diff -u src/external/gpl3/gcc/dist/gcc/ginclude/stddef.h:1.9 src/external/gpl3/gcc/dist/gcc/ginclude/stddef.h:1.10
--- src/external/gpl3/gcc/dist/gcc/ginclude/stddef.h:1.9	Sat Apr 10 20:02:17 2021
+++ src/external/gpl3/gcc/dist/gcc/ginclude/stddef.h	Wed Jul 14 09:24:58 2021
@@ -420,7 +420,7 @@ typedef struct {
  use __float128 here; that is only available on some
  architectures, but only on i386 is extra alignment needed for
  __float128.  */
-#ifdef __i386__
+#if defined(__i386__) && !defined(__clang__)
   __float128 __max_align_f128 __attribute__((__aligned__(__alignof(__float128;
 #endif
 } max_align_t;

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jul 14 06:34:33 UTC 2021

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl:
Makefile

Log Message:
find libgbm in libgbm.old.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/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/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.1 src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.1	Tue Apr 16 21:21:51 2019
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile	Wed Jul 14 06:34:33 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/04/16 21:21:51 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/07/14 06:34:33 mrg Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -30,8 +30,10 @@ CPPFLAGS+=	\
 CPPFLAGS+=	\
 	-DGLAMOR_HAS_GBM
 
+.include "../../../../../lib/mesa-which.mk"
+
 LIBDPLIBS=	\
-	gbm	${.CURDIR}/../../../../../lib/libgbm
+	gbm	${.CURDIR}/../../../../../lib/libgbm${OLD_SUFFIX}
 
 .include 
 LIBDIR=	${XMODULEDIR}

CVS commit: src/external/gpl3/gcc/dist/gcc/config/aarch64

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jul 13 06:56:24 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist/gcc/config/aarch64: aarch64-netbsd.h

Log Message:
Fix a comment


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64-netbsd.h

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64-netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64-netbsd.h:1.5 src/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64-netbsd.h:1.6
--- src/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64-netbsd.h:1.5	Sat Apr 24 06:44:24 2021
+++ src/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64-netbsd.h	Tue Jul 13 06:56:24 2021
@@ -20,7 +20,7 @@
 #ifndef GCC_AARCH64_NETBSD_H
 #define GCC_AARCH64_NETBSD_H
 
-/* NetBSD malloc(3) does 64, not 128 bytes. */
+/* NetBSD malloc(3) does 64, not 128 bits. */
 #undef MALLOC_ABI_ALIGNMENT
 #define MALLOC_ABI_ALIGNMENT  64
 

CVS commit: src/external/gpl3/gcc/dist/gcc/config/pa

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jul 13 06:56:09 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist/gcc/config/pa: pa-netbsd.h

Log Message:
Fix a comment


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/gcc/config/pa/pa-netbsd.h

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config/pa/pa-netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/pa/pa-netbsd.h:1.6 src/external/gpl3/gcc/dist/gcc/config/pa/pa-netbsd.h:1.7
--- src/external/gpl3/gcc/dist/gcc/config/pa/pa-netbsd.h:1.6	Sun Nov  3 01:03:30 2019
+++ src/external/gpl3/gcc/dist/gcc/config/pa/pa-netbsd.h	Tue Jul 13 06:56:09 2021
@@ -131,7 +131,7 @@ along with GCC; see the file COPYING3.  
 #undef PTRDIFF_TYPE
 #define PTRDIFF_TYPE "long int"
 
-/* NetBSD always uses 128 byte alignment.  */
+/* NetBSD always uses 128 bits / 16 byte alignment.  */
 #undef MALLOC_ABI_ALIGNMENT
 #define MALLOC_ABI_ALIGNMENT 128
 

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jul 13 05:22:27 UTC 2021

Modified Files:
src/external/mit/xorg/lib/libEGL: Makefile

Log Message:
also look for libgbm in ${OLD_SUFFIX}.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libEGL/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/mit/xorg/lib/libEGL/Makefile
diff -u src/external/mit/xorg/lib/libEGL/Makefile:1.6 src/external/mit/xorg/lib/libEGL/Makefile:1.7
--- src/external/mit/xorg/lib/libEGL/Makefile:1.6	Mon Jul 12 09:40:31 2021
+++ src/external/mit/xorg/lib/libEGL/Makefile	Tue Jul 13 05:22:27 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2021/07/12 09:40:31 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2021/07/13 05:22:27 mrg Exp $
 
 .include 
 
@@ -102,7 +102,7 @@ LIBDPLIBS=	Xext		${.CURDIR}/../libXext \
 		Xdmcp		${.CURDIR}/../libXdmcp \
 		glapi		${.CURDIR}/../libglapi${OLD_SUFFIX} \
 		drm		${.CURDIR}/../libdrm \
-		gbm		${.CURDIR}/../libgbm \
+		gbm		${.CURDIR}/../libgbm${OLD_SUFFIX} \
 		xshmfence	${.CURDIR}/../libxshmfence \
 		X11-xcb		${.CURDIR}/../libX11/libX11-xcb \
 		xcb-dri2	${.CURDIR}/../libxcb/dri2 \

CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 12 18:42:40 UTC 2021

Modified Files:
src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb: config.h config.m4
gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el: config.h config.m4
gmp.h

Log Message:
mknative-gmp for mipsn64* and GMP 6.2.1.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h \
src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.m4 \
src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/gmp.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/config.h \
src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/config.m4 \
src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/gmp.h

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

Modified files:

Index: src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h:1.1	Sun Apr 25 23:57:47 2021
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h	Mon Jul 12 18:42:39 2021
@@ -548,7 +548,7 @@ see https://www.gnu.org/licenses/.
 #define PACKAGE_NAME "GNU MP"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU MP 6.2.0"
+#define PACKAGE_STRING "GNU MP 6.2.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gmp"
@@ -557,7 +557,7 @@ see https://www.gnu.org/licenses/.
 #define PACKAGE_URL "http://www.gnu.org/software/gmp/;
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "6.2.0"
+#define PACKAGE_VERSION "6.2.1"
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
@@ -569,13 +569,13 @@ see https://www.gnu.org/licenses/.
 #define SIZEOF_UNSIGNED 4
 
 /* The size of `unsigned long', as computed by sizeof. */
-#define SIZEOF_UNSIGNED_LONG 4
+#define SIZEOF_UNSIGNED_LONG 8
 
 /* The size of `unsigned short', as computed by sizeof. */
 #define SIZEOF_UNSIGNED_SHORT 2
 
 /* The size of `void *', as computed by sizeof. */
-#define SIZEOF_VOID_P 4
+#define SIZEOF_VOID_P 8
 
 /* Define to 1 if sscanf requires writable inputs */
 /* #undef SSCANF_WRITABLE_INPUT */
@@ -590,7 +590,7 @@ see https://www.gnu.org/licenses/.
 #define TUNE_SQR_TOOM2_MAX SQR_TOOM2_MAX_GENERIC
 
 /* Version number of package */
-#define VERSION "6.2.0"
+#define VERSION "6.2.1"
 
 /* Define to 1 to enable ASSERT checking, per --enable-assert */
 /* #undef WANT_ASSERT */
Index: src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.m4
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.m4:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.m4:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.m4:1.1	Sun Apr 25 23:57:47 2021
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.m4	Mon Jul 12 18:42:39 2021
@@ -27,7 +27,7 @@ changequote(`,')
 ifdef(`__CONFIG_M4_INCLUDED__',,`
 include(CONFIG_TOP_SRCDIR`/mpn/asm-defs.m4')
 include_mpn(`mips32/mips-defs.m4')
-define_not_for_expansion(`HAVE_HOST_CPU_mips64')
+define_not_for_expansion(`HAVE_HOST_CPU_mipsn64eb')
 define_not_for_expansion(`HAVE_ABI_n32')
 define_not_for_expansion(`HAVE_LIMB_BIG_ENDIAN')
 define_not_for_expansion(`HAVE_DOUBLE_IEEE_BIG_ENDIAN')
Index: src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/gmp.h
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/gmp.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/gmp.h:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/gmp.h:1.1	Sun Apr 25 23:57:47 2021
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/gmp.h	Mon Jul 12 18:42:39 2021
@@ -361,11 +361,9 @@ typedef __mpq_struct *mpq_ptr;
 GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
 inline semantics, unless -fgnu89-inline is used.  */
 #ifdef __GNUC__
-#if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2) \
-  || (defined __GNUC_GNU_INLINE__ && defined __cplusplus)
+#if (defined __GNUC_STDC_INLINE__) || \
+(__GNUC__ == 4 && __GNUC_MINOR__ >= 2) || (__GNUC__ > 4)
 #define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__))
-#else
-#define __GMP_EXTERN_INLINE  extern __inline__
 #endif
 #define __GMP_INLINE_PROTOTYPES  1
 #endif
@@ -1693,6 +1691,9 @@ __GMP_DECLSPEC int mpn_sec_invert (mp_pt
 #define mpn_sec_invert_itch __MPN(sec_invert_itch)
 __GMP_DECLSPEC mp_size_t mpn_sec_invert_itch (mp_size_t) __GMP_ATTRIBUTE_PURE;
 
+#define mpn_udiv_w_sdiv __MPN(udiv_w_sdiv)
+__GMP_DECLSPEC mp_limb_t mpn_udiv_w_sdiv (mp_limb_t *, mp_limb_t, mp_limb_t, mp_limb_t);
+
 
 / mpz inlines /
 
@@ -2324,12 +2325,12 @@ enum
 
 /* Define CC and CFLAGS which were used to build this version 

CVS commit: src/external/lgpl3/gmp/dist

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 12 18:42:23 UTC 2021

Modified Files:
src/external/lgpl3/gmp/dist: configfsf.sub configure configure.ac

Log Message:
add mipsn64 support, so native-gmp works, and likely, build.sh tools
on a mipsn64 host.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/lgpl3/gmp/dist/configfsf.sub
cvs rdiff -u -r1.9 -r1.10 src/external/lgpl3/gmp/dist/configure
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/lgpl3/gmp/dist/configure.ac

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

Modified files:

Index: src/external/lgpl3/gmp/dist/configfsf.sub
diff -u src/external/lgpl3/gmp/dist/configfsf.sub:1.7 src/external/lgpl3/gmp/dist/configfsf.sub:1.8
--- src/external/lgpl3/gmp/dist/configfsf.sub:1.7	Sun Jul 11 21:15:45 2021
+++ src/external/lgpl3/gmp/dist/configfsf.sub	Mon Jul 12 18:42:23 2021
@@ -1193,6 +1193,7 @@ case $cpu-$vendor in
 			| mips | mipsbe | mipseb | mipsel | mipsle \
 			| mips16 \
 			| mips64 | mips64eb | mips64el \
+			| mipsn64 | mipsn64eb | mipsn64el \
 			| mips64octeon | mips64octeonel \
 			| mips64orion | mips64orionel \
 			| mips64r5900 | mips64r5900el \

Index: src/external/lgpl3/gmp/dist/configure
diff -u src/external/lgpl3/gmp/dist/configure:1.9 src/external/lgpl3/gmp/dist/configure:1.10
--- src/external/lgpl3/gmp/dist/configure:1.9	Sun Jul 11 21:15:45 2021
+++ src/external/lgpl3/gmp/dist/configure	Mon Jul 12 18:42:23 2021
@@ -4684,7 +4684,7 @@ echo "include_mpn(\`mips32/mips-defs.m4'
 
 
 case $host in
-  mips64*-*-* | mipsisa64*-*-* | mips*-*-irix[6789]*)
+  mips64*-*-* | mipsisa64*-*-* | mips*-*-irix[6789]* | mipsn64*-*-*)
 abilist="n32 64 o32"
 
 cclist_n32="gcc cc"

Index: src/external/lgpl3/gmp/dist/configure.ac
diff -u src/external/lgpl3/gmp/dist/configure.ac:1.1.1.4 src/external/lgpl3/gmp/dist/configure.ac:1.2
--- src/external/lgpl3/gmp/dist/configure.ac:1.1.1.4	Sun Jul 11 21:14:44 2021
+++ src/external/lgpl3/gmp/dist/configure.ac	Mon Jul 12 18:42:23 2021
@@ -35,7 +35,7 @@ see https://www.gnu.org/licenses/.
 AC_COPYRIGHT(GMP_COPYRIGHT)
 AH_TOP(/*GMP_COPYRIGHT*/)
 
-AC_REVISION($Revision: 1.1.1.4 $)
+AC_REVISION($Revision: 1.2 $)
 AC_PREREQ(2.59)
 AC_INIT(GNU MP, GMP_VERSION, [gmp-b...@gmplib.org, see https://gmplib.org/manual/Reporting-Bugs.html], gmp)
 AC_CONFIG_SRCDIR(gmp-impl.h)
@@ -1027,7 +1027,7 @@ case $host in
 GMP_INCLUDE_MPN(mips32/mips-defs.m4)
 
 case $host in
-  [mips64*-*-* | mipsisa64*-*-* | mips*-*-irix[6789]*])
+  [mips64*-*-* | mipsisa64*-*-* | mips*-*-irix[6789]* | mipsn64*-*-*])
 abilist="n32 64 o32"
 
 cclist_n32="gcc cc"

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 12 09:40:31 UTC 2021

Modified Files:
src/external/mit/xorg/lib/libEGL: Makefile

Log Message:
look for libglapi in ${OLD_SUFFIX}.  noted by gson.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libEGL/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/mit/xorg/lib/libEGL/Makefile
diff -u src/external/mit/xorg/lib/libEGL/Makefile:1.5 src/external/mit/xorg/lib/libEGL/Makefile:1.6
--- src/external/mit/xorg/lib/libEGL/Makefile:1.5	Tue Sep 24 19:29:42 2019
+++ src/external/mit/xorg/lib/libEGL/Makefile	Mon Jul 12 09:40:31 2021
@@ -1,7 +1,9 @@
-#	$NetBSD: Makefile,v 1.5 2019/09/24 19:29:42 maya Exp $
+#	$NetBSD: Makefile,v 1.6 2021/07/12 09:40:31 mrg Exp $
 
 .include 
 
+.include "../mesa-which.mk"
+
 LIB=		EGL
 LIBISCXX=	yes
 
@@ -98,7 +100,7 @@ LIBDPLIBS=	Xext		${.CURDIR}/../libXext \
 		Xfixes		${.CURDIR}/../libXfixes \
 		Xdamage		${.CURDIR}/../libXdamage \
 		Xdmcp		${.CURDIR}/../libXdmcp \
-		glapi		${.CURDIR}/../libglapi \
+		glapi		${.CURDIR}/../libglapi${OLD_SUFFIX} \
 		drm		${.CURDIR}/../libdrm \
 		gbm		${.CURDIR}/../libgbm \
 		xshmfence	${.CURDIR}/../libxshmfence \

CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 12 09:34:57 UTC 2021

Modified Files:
src/external/lgpl3/gmp/lib/libgmp/arch/aarch64: config.h
src/external/lgpl3/gmp/lib/libgmp/arch/alpha: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/arm: config.h config.m4 gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/armeb: config.h config.m4 gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/hppa: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/ia64: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/m68000: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/m68k: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/mips64el: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/mipseb: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/mipsel: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/powerpc: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/riscv32: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/riscv64: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/sh3el: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/sparc: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/sparc64: config.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/vax: config.h gmp.h

Log Message:
mknative-gmp for GMP 6.2.1 and most platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/lgpl3/gmp/lib/libgmp/arch/alpha/config.h \
src/external/lgpl3/gmp/lib/libgmp/arch/alpha/gmp.h
cvs rdiff -u -r1.6 -r1.7 src/external/lgpl3/gmp/lib/libgmp/arch/arm/config.h
cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/arm/config.m4 \
src/external/lgpl3/gmp/lib/libgmp/arch/arm/gmp.h
cvs rdiff -u -r1.7 -r1.8 \
src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.m4 \
src/external/lgpl3/gmp/lib/libgmp/arch/armeb/gmp.h
cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/hppa/config.h \
src/external/lgpl3/gmp/lib/libgmp/arch/hppa/gmp.h
cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/lib/libgmp/arch/ia64/config.h \
src/external/lgpl3/gmp/lib/libgmp/arch/ia64/gmp.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/lgpl3/gmp/lib/libgmp/arch/m68000/config.h \
src/external/lgpl3/gmp/lib/libgmp/arch/m68000/gmp.h
cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/m68k/config.h \
src/external/lgpl3/gmp/lib/libgmp/arch/m68k/gmp.h
cvs rdiff -u -r1.7 -r1.8 \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/config.h \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h
cvs rdiff -u -r1.7 -r1.8 \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/config.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/lgpl3/gmp/lib/libgmp/arch/mipseb/config.h \
src/external/lgpl3/gmp/lib/libgmp/arch/mipseb/gmp.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/lgpl3/gmp/lib/libgmp/arch/mipsel/config.h \
src/external/lgpl3/gmp/lib/libgmp/arch/mipsel/gmp.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/lgpl3/gmp/lib/libgmp/arch/powerpc/config.h
cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/powerpc/gmp.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/config.h \
src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/gmp.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/lgpl3/gmp/lib/libgmp/arch/riscv32/config.h
cvs rdiff -u -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/riscv32/gmp.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/lgpl3/gmp/lib/libgmp/arch/riscv64/config.h
cvs rdiff -u -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/riscv64/gmp.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb/config.h \
src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb/gmp.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/lgpl3/gmp/lib/libgmp/arch/sh3el/config.h
cvs rdiff -u -r1.6 -r1.7 src/external/lgpl3/gmp/lib/libgmp/arch/sh3el/gmp.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/lgpl3/gmp/lib/libgmp/arch/sparc/config.h
cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/lib/libgmp/arch/sparc/gmp.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/config.h
cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/gmp.h
cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/lib/libgmp/arch/vax/config.h \
src/external/lgpl3/gmp/lib/libgmp/arch/vax/gmp.h

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

CVS commit: src/external/lgpl3/gmp

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 12 07:59:52 UTC 2021

Modified Files:
src/external/lgpl3/gmp: README
src/external/lgpl3/gmp/lib/libgmp/arch/aarch64: config.h config.m4
gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/i386: config.h gmp.h

Log Message:
regen for GMP 6.2.1 and i386 and arm64.  update docs so i don't forget
that i mostly got 'native-gmp' working last year.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/lgpl3/gmp/README
cvs rdiff -u -r1.2 -r1.3 \
src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h \
src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4 \
src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp.h
cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h
cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/lib/libgmp/arch/i386/gmp.h

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

Modified files:

Index: src/external/lgpl3/gmp/README
diff -u src/external/lgpl3/gmp/README:1.8 src/external/lgpl3/gmp/README:1.9
--- src/external/lgpl3/gmp/README:1.8	Fri Jun  1 21:46:18 2018
+++ src/external/lgpl3/gmp/README	Mon Jul 12 07:59:51 2021
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.8 2018/06/01 21:46:18 mrg Exp $
+$NetBSD: README,v 1.9 2021/07/12 07:59:51 mrg Exp $
 
 GMP in NetBSD.  We need GMP for GCC >= 4.2.
 
@@ -10,7 +10,20 @@ creates a bunch of symlinks and weeds ou
 files with the same name in different subdirectories linked into the same
 final product.  All of these issues need to be dealt with.
 
-There are a few steps to this:
+There is a mostly-working "mknative" for GMP now.  If this fails, see the
+section below for the old instructions.
+
+	- run a "./build tools libs", possibly setting MKGCC=no if the
+	  GMP port is currently not working at all.
+
+	- cd to tools/gmp, and run $TOOLDIR/bin/nbmake-$arch native-gmp
+
+	- if that works, commit the files it changed in the source tree.
+
+	- set NEWCONFIGDIR=/writeable/src if eg /usr/src is read-only.
+
+These are the old steps, that maybe are necessary to fix the automated
+output:
 
 	- run ./configure, save the output.  you can use the makefile
 	  "Makefile.netbsd-gmp" in this directory to run this with the
@@ -54,9 +67,5 @@ There are a few steps to this:
 The amd64 port is a good reference to compare.
 
 
-This is still a work in progress and methods used to build may be
-changed at any time.
-
-
 m...@netbsd.org
-- 2017/08/22
+- 2021/07/11

Index: src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h:1.2 src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h:1.3
--- src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h:1.2	Sun Sep 27 00:31:51 2020
+++ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h	Mon Jul 12 07:59:52 2021
@@ -548,7 +548,7 @@ see https://www.gnu.org/licenses/.
 #define PACKAGE_NAME "GNU MP"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU MP 6.2.0"
+#define PACKAGE_STRING "GNU MP 6.2.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gmp"
@@ -557,7 +557,7 @@ see https://www.gnu.org/licenses/.
 #define PACKAGE_URL "http://www.gnu.org/software/gmp/;
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "6.2.0"
+#define PACKAGE_VERSION "6.2.1"
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
@@ -590,7 +590,7 @@ see https://www.gnu.org/licenses/.
 #define TUNE_SQR_TOOM2_MAX SQR_TOOM2_MAX_GENERIC
 
 /* Version number of package */
-#define VERSION "6.2.0"
+#define VERSION "6.2.1"
 
 /* Define to 1 to enable ASSERT checking, per --enable-assert */
 /* #undef WANT_ASSERT */
@@ -641,7 +641,7 @@ see https://www.gnu.org/licenses/.
 
 /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
-#define YYTEXT_POINTER 1
+/* #undef YYTEXT_POINTER */
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name.  */
Index: src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4:1.2 src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4:1.3
--- src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4:1.2	Sun Sep 27 00:31:51 2020
+++ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4	Mon Jul 12 07:59:52 2021
@@ -27,6 +27,7 @@ define(,eval(GMP_LIMB_BIT
 changequote(`,')
 ifdef(`__CONFIG_M4_INCLUDED__',,`
 include(CONFIG_TOP_SRCDIR`/mpn/asm-defs.m4')
+include_mpn(`arm64/arm64-defs.m4')
 define_not_for_expansion(`HAVE_HOST_CPU_aarch64')
 define_not_for_expansion(`HAVE_ABI_64')
 define_not_for_expansion(`HAVE_LIMB_LITTLE_ENDIAN')
Index: src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp.h
diff -u 

CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch/x86_64

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 12 07:04:37 UTC 2021

Modified Files:
src/external/lgpl3/gmp/lib/libgmp/arch/x86_64: config.h config.m4 gmp.h

Log Message:
regen gmp parts for amd64 and gmp 6.2.1.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h \
src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4
cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h

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

Modified files:

Index: src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h:1.4 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h:1.5
--- src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h:1.4	Sun Sep 27 00:31:54 2020
+++ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h	Mon Jul 12 07:04:37 2021
@@ -548,7 +548,7 @@ see https://www.gnu.org/licenses/.
 #define PACKAGE_NAME "GNU MP"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU MP 6.2.0"
+#define PACKAGE_STRING "GNU MP 6.2.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gmp"
@@ -557,7 +557,7 @@ see https://www.gnu.org/licenses/.
 #define PACKAGE_URL "http://www.gnu.org/software/gmp/;
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "6.2.0"
+#define PACKAGE_VERSION "6.2.1"
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
@@ -590,7 +590,7 @@ see https://www.gnu.org/licenses/.
 /* #undef TUNE_SQR_TOOM2_MAX */
 
 /* Version number of package */
-#define VERSION "6.2.0"
+#define VERSION "6.2.1"
 
 /* Define to 1 to enable ASSERT checking, per --enable-assert */
 /* #undef WANT_ASSERT */
Index: src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4:1.4 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4:1.5
--- src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4:1.4	Sun Sep 27 00:31:54 2020
+++ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4	Mon Jul 12 07:04:37 2021
@@ -19,6 +19,7 @@ define(, <.L>)
 define(, <.long>)
 define(,)
 define(,)
+define(, )
 define(,<34>)
 define(,<16>)
 define(,<4>)

Index: src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h:1.5 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h:1.6
--- src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h:1.5	Sun Sep 27 00:31:54 2020
+++ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h	Mon Jul 12 07:04:37 2021
@@ -361,11 +361,9 @@ typedef __mpq_struct *mpq_ptr;
 GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
 inline semantics, unless -fgnu89-inline is used.  */
 #ifdef __GNUC__
-#if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2) \
-  || (defined __GNUC_GNU_INLINE__ && defined __cplusplus)
+#if (defined __GNUC_STDC_INLINE__) || \
+(__GNUC__ == 4 && __GNUC_MINOR__ >= 2) || (__GNUC__ > 4)
 #define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__))
-#else
-#define __GMP_EXTERN_INLINE  extern __inline__
 #endif
 #define __GMP_INLINE_PROTOTYPES  1
 #endif
@@ -1693,6 +1691,9 @@ __GMP_DECLSPEC int mpn_sec_invert (mp_pt
 #define mpn_sec_invert_itch __MPN(sec_invert_itch)
 __GMP_DECLSPEC mp_size_t mpn_sec_invert_itch (mp_size_t) __GMP_ATTRIBUTE_PURE;
 
+#define mpn_udiv_w_sdiv __MPN(udiv_w_sdiv)
+__GMP_DECLSPEC mp_limb_t mpn_udiv_w_sdiv (mp_limb_t *, mp_limb_t, mp_limb_t, mp_limb_t);
+
 
 / mpz inlines /
 
@@ -2329,7 +2330,7 @@ enum
 /* Major version number is the value of __GNU_MP__ too, above. */
 #define __GNU_MP_VERSION6
 #define __GNU_MP_VERSION_MINOR  2
-#define __GNU_MP_VERSION_PATCHLEVEL 0
+#define __GNU_MP_VERSION_PATCHLEVEL 1
 #define __GNU_MP_RELEASE (__GNU_MP_VERSION * 1 + __GNU_MP_VERSION_MINOR * 100 + __GNU_MP_VERSION_PATCHLEVEL)
 
 #define __GMP_H__

CVS commit: src/external/gpl3/gcc/dist/gcc/config/i386

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Jul 11 22:41:39 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist/gcc/config/i386: i386.c i386.h netbsd-elf.h
netbsd64.h

Log Message:
define a X86_32_ASAN_BIT_OFFSET macro that defaults differently on
netbsd/i386 than other x86-32 targets.

fixes PR#56280.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/external/gpl3/gcc/dist/gcc/config/i386/i386.c
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/dist/gcc/config/i386/i386.h \
src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h \
src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config/i386/i386.c
diff -u src/external/gpl3/gcc/dist/gcc/config/i386/i386.c:1.24 src/external/gpl3/gcc/dist/gcc/config/i386/i386.c:1.25
--- src/external/gpl3/gcc/dist/gcc/config/i386/i386.c:1.24	Sun Apr 11 00:02:13 2021
+++ src/external/gpl3/gcc/dist/gcc/config/i386/i386.c	Sun Jul 11 22:41:38 2021
@@ -1399,7 +1399,7 @@ ix86_asan_shadow_offset (void)
 {
   return TARGET_LP64 ? (TARGET_MACHO ? (HOST_WIDE_INT_1 << 44)
  : HOST_WIDE_INT_C (0x7fff8000))
-		 : (HOST_WIDE_INT_1 << 29);
+		 : (HOST_WIDE_INT_1 << X86_32_ASAN_BIT_OFFSET);
 }
 
 /* Argument support functions.  */

Index: src/external/gpl3/gcc/dist/gcc/config/i386/i386.h
diff -u src/external/gpl3/gcc/dist/gcc/config/i386/i386.h:1.14 src/external/gpl3/gcc/dist/gcc/config/i386/i386.h:1.15
--- src/external/gpl3/gcc/dist/gcc/config/i386/i386.h:1.14	Sun Apr 11 00:02:14 2021
+++ src/external/gpl3/gcc/dist/gcc/config/i386/i386.h	Sun Jul 11 22:41:39 2021
@@ -2975,6 +2975,9 @@ extern enum attr_cpu ix86_schedule;
 #define NUM_X86_64_MS_CLOBBERED_REGS 12
 #endif
 
+/* Standard location for 32-bit ASAN shadow map.  */
+#define X86_32_ASAN_BIT_OFFSET 29
+
 /*
 Local variables:
 version-control: t
Index: src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h:1.14 src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h:1.15
--- src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h:1.14	Sun Apr 11 00:02:14 2021
+++ src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h	Sun Jul 11 22:41:39 2021
@@ -129,3 +129,7 @@ along with GCC; see the file COPYING3.  
 /* Preserve i386 psABI  */
 #undef PREFERRED_STACK_BOUNDARY_DEFAULT
 #define PREFERRED_STACK_BOUNDARY_DEFAULT MIN_STACK_BOUNDARY
+
+/* NetBSD/x86 on 32-bit places the ASAN shadow map at 0x4000.  */
+#undef X86_32_ASAN_BIT_OFFSET
+#define X86_32_ASAN_BIT_OFFSET 30
Index: src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h
diff -u src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h:1.14 src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h:1.15
--- src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h:1.14	Sun Apr 11 00:02:14 2021
+++ src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h	Sun Jul 11 22:41:39 2021
@@ -73,3 +73,7 @@ along with GCC; see the file COPYING3.  
   ((TARGET_64BIT || TARGET_SSE) ? 128 : 32)
 
 #define HAVE_ENABLE_EXECUTE_STACK
+
+/* NetBSD/x86 on 32-bit places the ASAN shadow map at 0x4000.  */
+#undef X86_32_ASAN_BIT_OFFSET
+#define X86_32_ASAN_BIT_OFFSET 30

CVS commit: src/external/lgpl3/gmp/dist

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Jul 11 21:15:48 UTC 2021

Modified Files:
src/external/lgpl3/gmp/dist: Makefile.in config.guess configfsf.guess
configfsf.sub configure gmp-h.in gmp-impl.h longlong.h
src/external/lgpl3/gmp/dist/mpn/generic: mod_1_1.c
Removed Files:
src/external/lgpl3/gmp/dist/mpn/alpha/ev67: gcd_1.asm
src/external/lgpl3/gmp/dist/mpn/arm/v5: gcd_1.asm
src/external/lgpl3/gmp/dist/mpn/arm/v6t2: gcd_1.asm
src/external/lgpl3/gmp/dist/mpn/arm64: gcd_1.asm
src/external/lgpl3/gmp/dist/mpn/ia64: gcd_1.asm
src/external/lgpl3/gmp/dist/mpn/mips64: addmul_1.asm mul_1.asm
sqr_diagonal.asm submul_1.asm umul.asm
src/external/lgpl3/gmp/dist/mpn/powerpc64/mode64: gcd_1.asm
src/external/lgpl3/gmp/dist/mpn/powerpc64/mode64/p7: gcd_1.asm
src/external/lgpl3/gmp/dist/mpn/sparc64: gcd_1.asm
src/external/lgpl3/gmp/dist/mpn/x86/bobcat: gmp-mparam.h
src/external/lgpl3/gmp/dist/mpn/x86/fat: gcd_1.c
src/external/lgpl3/gmp/dist/mpn/x86/k6: gcd_1.asm
src/external/lgpl3/gmp/dist/mpn/x86/k7: gcd_1.asm
src/external/lgpl3/gmp/dist/mpn/x86/p6: gcd_1.asm
src/external/lgpl3/gmp/dist/mpn/x86_64: addmul_2.asm gcd_1.asm
src/external/lgpl3/gmp/dist/mpn/x86_64/bd1: gcd_1.asm
src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat: aors_n.asm aorsmul_1.asm
copyd.asm copyi.asm gmp-mparam.h mul_1.asm mul_basecase.asm
redc_1.asm sqr_basecase.asm
src/external/lgpl3/gmp/dist/mpn/x86_64/core2: gcd_1.asm
src/external/lgpl3/gmp/dist/mpn/x86_64/coreisbr: popcount.asm
src/external/lgpl3/gmp/dist/mpn/x86_64/k10: gcd_1.asm
src/external/lgpl3/gmp/dist/mpn/x86_64/mulx: aorsmul_1.asm mul_1.asm
src/external/lgpl3/gmp/dist/mpn/x86_64/nano: gcd_1.asm
src/external/lgpl3/gmp/dist/tests/cxx: t-ops2.cc
src/external/lgpl3/gmp/dist/tests/devel: addmul_N.c anymul_1.c aors_n.c
cnd_aors_n.c copy.c divmod_1.c divrem.c logops_n.c mul_N.c shift.c
tst-addsub.c
src/external/lgpl3/gmp/dist/tests/mpz: bit.c

Log Message:
merge GMP 6.2.1.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/dist/Makefile.in \
src/external/lgpl3/gmp/dist/gmp-impl.h
cvs rdiff -u -r1.6 -r1.7 src/external/lgpl3/gmp/dist/config.guess \
src/external/lgpl3/gmp/dist/configfsf.sub \
src/external/lgpl3/gmp/dist/gmp-h.in
cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/dist/configfsf.guess \
src/external/lgpl3/gmp/dist/longlong.h
cvs rdiff -u -r1.8 -r1.9 src/external/lgpl3/gmp/dist/configure
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/lgpl3/gmp/dist/mpn/alpha/ev67/gcd_1.asm
cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/arm/v5/gcd_1.asm
cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/arm/v6t2/gcd_1.asm
cvs rdiff -u -r1.1.1.1 -r0 src/external/lgpl3/gmp/dist/mpn/arm64/gcd_1.asm
cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/dist/mpn/generic/mod_1_1.c
cvs rdiff -u -r1.1.1.3 -r0 src/external/lgpl3/gmp/dist/mpn/ia64/gcd_1.asm
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/lgpl3/gmp/dist/mpn/mips64/addmul_1.asm \
src/external/lgpl3/gmp/dist/mpn/mips64/mul_1.asm \
src/external/lgpl3/gmp/dist/mpn/mips64/sqr_diagonal.asm \
src/external/lgpl3/gmp/dist/mpn/mips64/submul_1.asm \
src/external/lgpl3/gmp/dist/mpn/mips64/umul.asm
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/lgpl3/gmp/dist/mpn/powerpc64/mode64/gcd_1.asm
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/lgpl3/gmp/dist/mpn/powerpc64/mode64/p7/gcd_1.asm
cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/sparc64/gcd_1.asm
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/lgpl3/gmp/dist/mpn/x86/bobcat/gmp-mparam.h
cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/x86/fat/gcd_1.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/x86/k6/gcd_1.asm
cvs rdiff -u -r1.1.1.3 -r0 src/external/lgpl3/gmp/dist/mpn/x86/k7/gcd_1.asm
cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/x86/p6/gcd_1.asm
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/lgpl3/gmp/dist/mpn/x86_64/addmul_2.asm \
src/external/lgpl3/gmp/dist/mpn/x86_64/gcd_1.asm
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/lgpl3/gmp/dist/mpn/x86_64/bd1/gcd_1.asm
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/aors_n.asm \
src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/redc_1.asm
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/aorsmul_1.asm \
src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/copyd.asm \
src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/copyi.asm \
src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/gmp-mparam.h \
src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/mul_1.asm \
src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/mul_basecase.asm \
src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/sqr_basecase.asm
cvs 

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Jul 11 20:53:35 UTC 2021

Modified Files:
src/external/mit/xorg/lib: driver.old.mk libglsl.old.mk
libloader.old.mk libmesa.old.mk
src/external/mit/xorg/lib/dri.old: Makefile
src/external/mit/xorg/lib/gallium.old: Makefile
src/external/mit/xorg/lib/libGL.old: Makefile mesa-ver.mk shlib_version
src/external/mit/xorg/lib/libGL.old/internal: Makefile
src/external/mit/xorg/lib/libgbm.old: Makefile shlib_version
src/external/mit/xorg/lib/libglapi.old: Makefile

Log Message:
copy the Mesa 19.7.1 build framework into .old.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/driver.old.mk \
src/external/mit/xorg/lib/libglsl.old.mk \
src/external/mit/xorg/lib/libloader.old.mk \
src/external/mit/xorg/lib/libmesa.old.mk
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/dri.old/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/gallium.old/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libGL.old/Makefile \
src/external/mit/xorg/lib/libGL.old/mesa-ver.mk \
src/external/mit/xorg/lib/libGL.old/shlib_version
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/libGL.old/internal/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libgbm.old/Makefile \
src/external/mit/xorg/lib/libgbm.old/shlib_version
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libglapi.old/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/mit/xorg/lib/driver.old.mk
diff -u src/external/mit/xorg/lib/driver.old.mk:1.1 src/external/mit/xorg/lib/driver.old.mk:1.2
--- src/external/mit/xorg/lib/driver.old.mk:1.1	Sun Mar 10 02:29:52 2019
+++ src/external/mit/xorg/lib/driver.old.mk	Sun Jul 11 20:53:35 2021
@@ -1,20 +1,48 @@
-#	$NetBSD: driver.old.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $
+#	$NetBSD: driver.old.mk,v 1.2 2021/07/11 20:53:35 mrg Exp $
 
 # stuff both dri and gallium drivers need.
 
 # util
 .PATH:		${X11SRCDIR.Mesa}/src/util
-SRCS.util=	\
-	hash_table.c\
-MESAralloc.c
 .PATH:		${X11SRCDIR.Mesa}/../src/util
-SRCS.util+=	\
-	format_srgb.c
+
+SRCS.util=	\
+	hash_table.c \
+	build_id.c \
+	crc32.c \
+	disk_cache.c \
+	fast_idiv_by_const.c \
+	half_float.c \
+	format_srgb.c \
+	mesa-sha1.c \
+	os_time.c \
+	ralloc.c \
+	UTILdebug.c \
+	rand_xor.c \
+	rb_tree.c \
+	register_allocate.c \
+	rgtc.c \
+	set.c \
+	slab.c \
+	string_buffer.c \
+	strtod.c \
+	u_atomic.c \
+	u_cpu_detect.c \
+	u_math.c \
+	u_queue.c \
+	u_process.c \
+	u_vector.c \
+	vma.c
+
 CPPFLAGS.format_srgb.c+=	-I${X11SRCDIR.Mesa}/src/util
 CPPFLAGS.hash_table.c+=		-I${X11SRCDIR.Mesa}/src/util
 CPPFLAGS.MESAralloc.c+=		-I${X11SRCDIR.Mesa}/src/util
+CPPFLAGS.UTILdebug.c+=		-I${X11SRCDIR.Mesa}/src/util \
+-I${X11SRCDIR.Mesa}/src/mesa \
+-I${X11SRCDIR.Mesa}/src \
+-I${X11SRCDIR.Mesa}/src/gallium/include
 
-BUILDSYMLINKS+=	${X11SRCDIR.Mesa}/src/util/ralloc.c MESAralloc.c
+BUILDSYMLINKS+=	${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c
 
 SRCS+=	${SRCS.util}
 
@@ -22,3 +50,6 @@ SRCS+=	${SRCS.util}
 .PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
 SRCS+=	utils.c dri_util.c xmlconfig.c
 SRCS+=	megadriver_stub.c
+
+CPPFLAGS.dri_util.c+=		-I${X11SRCDIR.Mesa}/../src/util
+
Index: src/external/mit/xorg/lib/libglsl.old.mk
diff -u src/external/mit/xorg/lib/libglsl.old.mk:1.1 src/external/mit/xorg/lib/libglsl.old.mk:1.2
--- src/external/mit/xorg/lib/libglsl.old.mk:1.1	Sun Mar 10 02:29:52 2019
+++ src/external/mit/xorg/lib/libglsl.old.mk	Sun Jul 11 20:53:35 2021
@@ -1,10 +1,21 @@
-#	$NetBSD: libglsl.old.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $
+#	$NetBSD: libglsl.old.mk,v 1.2 2021/07/11 20:53:35 mrg Exp $
 
 LIBGLSL_GENERATED_CXX_FILES = \
 	glsl_lexer.cpp \
 	glsl_parser.cpp 
 
-COPTS.glsl_lexer.cpp+=	-Wno-deprecated-register
+#COPTS.glsl_lexer.cpp+=	-Wno-deprecated-register
+COPTS.vtn_glsl450.c+=	${${ACTIVE_CC} == "clang":? -Wno-error=enum-conversion :}
+
+CPPFLAGS+=	-I${X11SRCDIR.Mesa}/src/compiler \
+		-I${X11SRCDIR.Mesa}/../src/compiler \
+		-I${X11SRCDIR.Mesa}/src/compiler/nir \
+		-I${X11SRCDIR.Mesa}/../src/compiler/nir \
+		-I${X11SRCDIR.Mesa}/src/compiler/glsl \
+		-I${X11SRCDIR.Mesa}/../src/compiler/glsl \
+		-I${X11SRCDIR.Mesa}/src/compiler/glsl/glcpp \
+		-I${X11SRCDIR.Mesa}/../src/compiler/glsl/glcpp \
+		-I${X11SRCDIR.Mesa}/src/compiler/spirv
 
 LIBGLSL_FILES = \
 	ast_array_index.cpp \
@@ -15,23 +26,34 @@ LIBGLSL_FILES = \
 	builtin_functions.cpp \
 	builtin_types.cpp \
 	builtin_variables.cpp \
+	generate_ir.cpp \
+	gl_nir_lower_atomics.c \
+	gl_nir_link_atomics.c \
+	gl_nir_link_uniform_initializers.c \
+	gl_nir_link_uniforms.c \
+	gl_nir_link_xfb.c \
+	gl_nir_linker.c \
+	gl_nir_lower_bindless_images.c \
+	gl_nir_lower_buffers.c \
+	gl_nir_lower_samplers.c \
+	gl_nir_lower_samplers_as_deref.c \
 	glsl_parser_extras.cpp \
-	

CVS commit: src/external/mit/xorg

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Jul 11 20:52:07 UTC 2021

Modified Files:
src/external/mit/xorg/include: Makefile
src/external/mit/xorg/lib: Makefile mesa-which.mk
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libGLU: Makefile
src/external/mit/xorg/lib/libGLw: Makefile
src/external/mit/xorg/lib/libgbm: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
xorg/lib stuff to enable mesa.old, prepare for new mesa

- rename OLD_PREFIX to OLD_SUFFIX, since it is
- include mesa-which.mk and use ${OLD_SUFFIX} in several places
- remove mesa < 18 support


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/include/Makefile
cvs rdiff -u -r1.55 -r1.56 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/mesa-which.mk
cvs rdiff -u -r1.37 -r1.38 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.47 -r1.48 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.31 -r1.32 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/lib/libGLU/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libGLw/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libgbm/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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/mit/xorg/include/Makefile
diff -u src/external/mit/xorg/include/Makefile:1.9 src/external/mit/xorg/include/Makefile:1.10
--- src/external/mit/xorg/include/Makefile:1.9	Sun Mar 10 13:52:11 2019
+++ src/external/mit/xorg/include/Makefile	Sun Jul 11 20:52:06 2021
@@ -1,15 +1,13 @@
-#	$NetBSD: Makefile,v 1.9 2019/03/10 13:52:11 mrg Exp $
+#	$NetBSD: Makefile,v 1.10 2021/07/11 20:52:06 mrg Exp $
 
 # *proto packages for xorg
 
 .include 
 
-.if ${HAVE_MESA_VER} == 18
-SUBDIR=		KHR 
-.endif
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
 SUBDIR+=	libvdpau
 .endif
+SUBDIR+=	KHR 
 SUBDIR+=	xorgproto xbitmaps xcb-proto
 SUBDIR+=	.WAIT xtrans
 

Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.55 src/external/mit/xorg/lib/Makefile:1.56
--- src/external/mit/xorg/lib/Makefile:1.55	Sun Jul 11 01:13:26 2021
+++ src/external/mit/xorg/lib/Makefile	Sun Jul 11 20:52:06 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.55 2021/07/11 01:13:26 mrg Exp $
+#	$NetBSD: Makefile,v 1.56 2021/07/11 20:52:06 mrg Exp $
 
 # build libraries for xorg
 
@@ -6,7 +6,7 @@
 
 .include "mesa-which.mk"
 
-SUBDIR=	libfontenc freetype libFS libICE libglapi${OLD_PREFIX} \
+SUBDIR=	libfontenc freetype libFS libICE libglapi${OLD_SUFFIX} \
 	libXau libXdmcp libdrm libpciaccess libpthread-stubs libxshmfence .WAIT
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 SUBDIR+=libdrm_intel
@@ -23,7 +23,7 @@ SUBDIR+=libxcb \
 	libX11 \
 	.WAIT
 .if !defined(MLIBDIR)
-SUBDIR+=dri${OLD_PREFIX} gallium${OLD_PREFIX}
+SUBDIR+=dri${OLD_SUFFIX} gallium${OLD_SUFFIX}
 .endif
 SUBDIR+=fontconfig libSM \
 	.WAIT \
@@ -36,7 +36,7 @@ SUBDIR+=libvdpau \
 	.WAIT
 .endif
 SUBDIR+=libXi libXxf86vm \
-	libGL${OLD_PREFIX} libXScrnSaver libXfont libXfont2 \
+	libGL${OLD_SUFFIX} libXScrnSaver libXfont libXfont2 \
 	libXinerama libXmu libXmuu libXpm libXrender \
 	libXres libXtst libXvMC libXvMCW libXv libXxf86dga libXxf86misc \
 	libxkbui \
@@ -54,7 +54,7 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw lib
 	.WAIT \
 	libXdmGreet \
 	xcb-util
-SUBDIR+=libgbm${OLD_PREFIX}
+SUBDIR+=libgbm${OLD_SUFFIX}
 .if ${HAVE_XORG_GLAMOR} != "no"
 # libEGL depends upon libgbm
 SUBDIR+=.WAIT libEGL

Index: src/external/mit/xorg/lib/mesa-which.mk
diff -u src/external/mit/xorg/lib/mesa-which.mk:1.2 src/external/mit/xorg/lib/mesa-which.mk:1.3
--- src/external/mit/xorg/lib/mesa-which.mk:1.2	Sun Jul 11 01:13:26 2021
+++ src/external/mit/xorg/lib/mesa-which.mk	Sun Jul 11 20:52:06 2021
@@ -1,6 +1,6 @@
-#	$NetBSD: mesa-which.mk,v 1.2 2021/07/11 01:13:26 mrg Exp $
+#	$NetBSD: mesa-which.mk,v 1.3 2021/07/11 20:52:06 mrg Exp $
 
-OLD_PREFIX=
+OLD_SUFFIX=
 .if ${EXTERNAL_MESALIB_DIR} == "MesaLib.old"
-OLD_PREFIX=.old
+OLD_SUFFIX=.old
 .endif

Index: src/external/mit/xorg/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.37 src/external/mit/xorg/lib/dri/Makefile:1.38
--- src/external/mit/xorg/lib/dri/Makefile:1.37	Tue Apr 13 04:58:59 2021
+++ src/external/mit/xorg/lib/dri/Makefile	Sun Jul 11 20:52:06 2021
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.37 2021/04/13 04:58:59 mrg Exp $
+# $NetBSD: Makefile,v 1.38 2021/07/11 20:52:06 mrg Exp $
 
 # Link the mesa_dri_drivers mega driver.
 
 .include 
 
+.include "../mesa-which.mk"
+
 .if ${MACHINE_ARCH} == "i386" || 

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Jul 11 01:13:27 UTC 2021

Modified Files:
src/external/mit/xorg/lib: Makefile mesa-which.mk
Removed Files:
src/external/mit/xorg/lib/dri7: Makefile dri.mk libglsl7.mk libmesa7.mk
src/external/mit/xorg/lib/dri7/libmesa: Makefile
src/external/mit/xorg/lib/dri7/r300: Makefile

Log Message:
remove dead mesa7 support.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/mesa-which.mk
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/dri7/Makefile \
src/external/mit/xorg/lib/dri7/dri.mk \
src/external/mit/xorg/lib/dri7/libmesa7.mk
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/dri7/libglsl7.mk
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/dri7/libmesa/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/dri7/r300/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/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.54 src/external/mit/xorg/lib/Makefile:1.55
--- src/external/mit/xorg/lib/Makefile:1.54	Wed Oct 28 08:10:10 2020
+++ src/external/mit/xorg/lib/Makefile	Sun Jul 11 01:13:26 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.54 2020/10/28 08:10:10 nia Exp $
+#	$NetBSD: Makefile,v 1.55 2021/07/11 01:13:26 mrg Exp $
 
 # build libraries for xorg
 
@@ -23,7 +23,7 @@ SUBDIR+=libxcb \
 	libX11 \
 	.WAIT
 .if !defined(MLIBDIR)
-SUBDIR+=${EXTRA_DRI_DIRS} dri${OLD_PREFIX} gallium${OLD_PREFIX}
+SUBDIR+=dri${OLD_PREFIX} gallium${OLD_PREFIX}
 .endif
 SUBDIR+=fontconfig libSM \
 	.WAIT \

Index: src/external/mit/xorg/lib/mesa-which.mk
diff -u src/external/mit/xorg/lib/mesa-which.mk:1.1 src/external/mit/xorg/lib/mesa-which.mk:1.2
--- src/external/mit/xorg/lib/mesa-which.mk:1.1	Sun Mar 10 02:29:52 2019
+++ src/external/mit/xorg/lib/mesa-which.mk	Sun Jul 11 01:13:26 2021
@@ -1,7 +1,6 @@
-#	$NetBSD: mesa-which.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $
+#	$NetBSD: mesa-which.mk,v 1.2 2021/07/11 01:13:26 mrg Exp $
 
 OLD_PREFIX=
 .if ${EXTERNAL_MESALIB_DIR} == "MesaLib.old"
 OLD_PREFIX=.old
-EXTRA_DRI_DIRS=dri7
 .endif

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Jul 11 00:43:40 UTC 2021

Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile

Log Message:
also look in dist/../include.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/lib/libdrm/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/mit/xorg/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.17 src/external/mit/xorg/lib/libdrm/Makefile:1.18
--- src/external/mit/xorg/lib/libdrm/Makefile:1.17	Mon Aug 12 14:21:54 2019
+++ src/external/mit/xorg/lib/libdrm/Makefile	Sun Jul 11 00:43:40 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2019/08/12 14:21:54 maya Exp $
+#	$NetBSD: Makefile,v 1.18 2021/07/11 00:43:40 mrg Exp $
 
 .include 
 
@@ -10,7 +10,7 @@ SRCS=	xf86drm.c xf86drmHash.c xf86drmMod
 INCS=	xf86drm.h xf86drmMode.h libsync.h
 INCSDIR=${X11INCDIR}
 
-CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm -I${X11SRCDIR.${LIB}}/../include
 
 SUBDIR=	drm kms
 

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Jul 10 22:39:56 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/asan: asan_linux.cc

Log Message:
remove an old #if 0'd section.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc

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

Modified files:

Index: src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc:1.15 src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc:1.16
--- src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc:1.15	Sun Apr 11 23:54:25 2021
+++ src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc	Sat Jul 10 22:39:56 2021
@@ -234,139 +234,6 @@ void AsanCheckIncompatibleRT() {
 }
 #endif // SANITIZER_ANDROID
 
-#if 0 // was in old netbsd / gcc 5 sanitizer stuff
-void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) {
-#ifdef __NetBSD__
-# define __UC_MACHINE_FP(ucontext, r) \
-(ucontext)->uc_mcontext.__gregs[(r)]
-/*
- * Unfortunately we don't have a portable frame pointer (yet)
- */
-# if defined(__alpha__)
-#  define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_S6)
-# elif defined(__arm__)
-#  define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_FP)
-# elif defined(__x86_64__)
-#  define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_RBP)
-# elif defined(__i386__)
-#  define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_EBP)
-# elif defined(__m68k__)
-#  define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_A6)
-# elif defined(__mips__)
-#  define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_S8)
-# elif defined(__powerpc__) || defined(__powerpc64__)
-#  define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_R1)
-# elif defined(__riscv__)
-#  define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_S0)
-# elif defined(__sparc__)
-#  define _UC_MACHINE_FP(ucontext) sp[15]
-# elif defined(__sh3__)
-#  define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_R14)
-# elif defined(__vax__)
-#  define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_FP)
-# else
-#  define _UC_MACHINE_FP(ucontext) 0
-# endif
-  ucontext_t *ucontext = (ucontext_t*)context;
-  *pc = _UC_MACHINE_PC(ucontext);
-  *sp = _UC_MACHINE_SP(ucontext);
-  *bp = _UC_MACHINE_FP(ucontext);
-#elif ASAN_ANDROID
-  *pc = *sp = *bp = 0;
-#elif defined(__arm__)
-  ucontext_t *ucontext = (ucontext_t*)context;
-  *pc = ucontext->uc_mcontext.arm_pc;
-  *bp = ucontext->uc_mcontext.arm_fp;
-  *sp = ucontext->uc_mcontext.arm_sp;
-#elif defined(__aarch64__)
-  ucontext_t *ucontext = (ucontext_t*)context;
-  *pc = ucontext->uc_mcontext.pc;
-  *bp = ucontext->uc_mcontext.regs[29];
-  *sp = ucontext->uc_mcontext.sp;
-#elif defined(__hppa__)
-  ucontext_t *ucontext = (ucontext_t*)context;
-  *pc = ucontext->uc_mcontext.sc_iaoq[0];
-  /* GCC uses %r3 whenever a frame pointer is needed.  */
-  *bp = ucontext->uc_mcontext.sc_gr[3];
-  *sp = ucontext->uc_mcontext.sc_gr[30];
-#elif defined(__x86_64__)
-# if SANITIZER_FREEBSD
-  ucontext_t *ucontext = (ucontext_t*)context;
-  *pc = ucontext->uc_mcontext.mc_rip;
-  *bp = ucontext->uc_mcontext.mc_rbp;
-  *sp = ucontext->uc_mcontext.mc_rsp;
-# elif SANITIZER_NETBSD
-  *pc = ucontext->uc_mcontext.__gregs[_REG_RIP];
-  *bp = ucontext->uc_mcontext.__gregs[_REG_RBP];
-  *sp = ucontext->uc_mcontext.__gregs[_REG_RSP];
-# else
-  ucontext_t *ucontext = (ucontext_t*)context;
-  *pc = ucontext->uc_mcontext.gregs[REG_RIP];
-  *bp = ucontext->uc_mcontext.gregs[REG_RBP];
-  *sp = ucontext->uc_mcontext.gregs[REG_RSP];
-# endif
-#elif defined(__i386__)
-# if SANITIZER_FREEBSD
-  ucontext_t *ucontext = (ucontext_t*)context;
-  *pc = ucontext->uc_mcontext.mc_eip;
-  *bp = ucontext->uc_mcontext.mc_ebp;
-  *sp = ucontext->uc_mcontext.mc_esp;
-# elif SANITIZER_FREEBSD
-  ucontext_t *ucontext = (ucontext_t*)context;
-  *pc = ucontext->uc_mcontext.__gregs[_REG_EIP];
-  *bp = ucontext->uc_mcontext.__gregs[_REG_EBP];
-  *sp = ucontext->uc_mcontext.__gregs[_REG_ESP];
-# else
-  ucontext_t *ucontext = (ucontext_t*)context;
-  *pc = ucontext->uc_mcontext.gregs[REG_EIP];
-  *bp = ucontext->uc_mcontext.gregs[REG_EBP];
-  *sp = ucontext->uc_mcontext.gregs[REG_ESP];
-# endif
-#elif defined(__powerpc__) || defined(__powerpc64__)
-  ucontext_t *ucontext = (ucontext_t*)context;
-  *pc = ucontext->uc_mcontext.regs->nip;
-  *sp = ucontext->uc_mcontext.regs->gpr[PT_R1];
-  // The powerpc{,64}-linux ABIs do not specify r31 as the frame
-  // pointer, but GCC always uses r31 when we need a frame pointer.
-  *bp = ucontext->uc_mcontext.regs->gpr[PT_R31];
-#elif defined(__riscv__)
-  ucontext_t *ucontext = (ucontext_t*)context;
-  *pc = ucontext->uc_mcontext.gregs[REG_PC];
-  *bp = ucontext->uc_mcontext.gregs[REG_S0];
-  *sp = 

CVS commit: src/external/bsd/atf/dist/tools

[Andreas Gustafsson]

Module Name:src
Committed By:   gson
Date:   Thu Jul  8 18:10:52 UTC 2021

Modified Files:
src/external/bsd/atf/dist/tools: atf-run.cpp

Log Message:
When running an individual test case under isolation, make the test
case count on the tp-start line of the output match the number of test
cases actually executed (one) so that the atf-run output is valid
input to atf-report.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/dist/tools/atf-run.cpp

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

Modified files:

Index: src/external/bsd/atf/dist/tools/atf-run.cpp
diff -u src/external/bsd/atf/dist/tools/atf-run.cpp:1.6 src/external/bsd/atf/dist/tools/atf-run.cpp:1.7
--- src/external/bsd/atf/dist/tools/atf-run.cpp:1.6	Sat Apr 10 10:32:57 2021
+++ src/external/bsd/atf/dist/tools/atf-run.cpp	Thu Jul  8 18:10:52 2021
@@ -388,7 +388,22 @@ atf_run::run_test_program(const tools::f
 tools::fs::temp_dir resdir(
 tools::fs::path(tools::config::get("atf_workdir")) / "atf-run.XX");
 
-w.start_tp(tp.str(), md.test_cases.size());
+size_t nseltcs;
+if (tc.empty()) {
+nseltcs = md.test_cases.size();
+} else {
+nseltcs = 0;
+for (std::map< std::string, vars_map >::const_iterator iter
+ = md.test_cases.begin(); iter != md.test_cases.end(); iter++) {
+const std::string& tcname = (*iter).first;
+if (tcname == tc)
+nseltcs++;
+}
+if (nseltcs == 0)
+throw std::runtime_error("No such test case");
+}
+
+w.start_tp(tp.str(), nseltcs);
 if (md.test_cases.empty()) {
 w.end_tp("Bogus test program: reported 0 test cases");
 errcode = EXIT_FAILURE;

CVS commit: src/external/gpl3/gdb/dist/gnulib/import

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Tue Jul  6 12:41:00 UTC 2021

Modified Files:
src/external/gpl3/gdb/dist/gnulib/import: canonicalize-lgpl.c

Log Message:
Remote -O0 hack for alpha; root cause has been addressed.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gdb/dist/gnulib/import/canonicalize-lgpl.c

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

Modified files:

Index: src/external/gpl3/gdb/dist/gnulib/import/canonicalize-lgpl.c
diff -u src/external/gpl3/gdb/dist/gnulib/import/canonicalize-lgpl.c:1.2 src/external/gpl3/gdb/dist/gnulib/import/canonicalize-lgpl.c:1.3
--- src/external/gpl3/gdb/dist/gnulib/import/canonicalize-lgpl.c:1.2	Sat May  8 12:23:47 2021
+++ src/external/gpl3/gdb/dist/gnulib/import/canonicalize-lgpl.c	Tue Jul  6 12:41:00 2021
@@ -114,13 +114,6 @@ alloc_failed (void)
holds the same value as the value returned.  */
 
 char *
-#ifdef __alpha__
-/*
- * toolchain/56153
- * GCC 10 and 9 miscompile malloca() macro for alpha.
- */
-__attribute__((optimize("O0")))
-#endif
 __realpath (const char *name, char *resolved)
 {
   char *rpath, *dest, *extra_buf = NULL;

CVS commit: src/external/bsd/jemalloc/lib

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Tue Jul  6 12:40:25 UTC 2021

Modified Files:
src/external/bsd/jemalloc/lib: Makefile.inc

Log Message:
Remove -O0 hack for alpha; root cause has been addressed.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/jemalloc/lib/Makefile.inc

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

Modified files:

Index: src/external/bsd/jemalloc/lib/Makefile.inc
diff -u src/external/bsd/jemalloc/lib/Makefile.inc:1.13 src/external/bsd/jemalloc/lib/Makefile.inc:1.14
--- src/external/bsd/jemalloc/lib/Makefile.inc:1.13	Wed Dec 16 01:21:32 2020
+++ src/external/bsd/jemalloc/lib/Makefile.inc	Tue Jul  6 12:40:24 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.13 2020/12/16 01:21:32 rin Exp $
+#	$NetBSD: Makefile.inc,v 1.14 2021/07/06 12:40:24 thorpej Exp $
 
 JEMALLOC:=${.PARSEDIR}/..
 
@@ -51,14 +51,6 @@ COPTS.ctl.c+=-Wno-error=stack-protector
 COPTS.stats.c+=-Wno-error=stack-protector
 COPTS.tcache.c+=-Wno-error=stack-protector
 
-.if ${MACHINE} == "alpha" && ${ACTIVE_CC} == "gcc"
-# These files need to be compiled with -O0, or build everything with
-# -DJEMALLOC_DEBUG. Otherwise, userland binaries crash randomly, as
-# reported in port-alpha/54307.
-COPTS.rtree.c+=	-O0
-COPTS.tcache.c+=-O0
-.endif
-
 .if ${MACHINE_ARCH} == "vax"
 # in merge_overlapping_regs, at regrename.c
 COPTS.arena.c+=-O0

CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs

[Juergen Hannken-Illjes]

Module Name:src
Committed By:   hannken
Date:   Sun Jul  4 11:25:07 UTC 2021

Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_ctldir.c

Log Message:
Add VOP_PARSEPATH to zfs control dir vnode op table.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c

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

Modified files:

Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c:1.12 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c:1.13
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c:1.12	Sat May 16 18:31:46 2020
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c	Sun Jul  4 11:25:07 2021
@@ -1825,6 +1825,7 @@ sfs_print(void *v)
 
 const struct vnodeopv_entry_desc zfs_sfsop_entries[] = {
 	{ _default_desc,		vn_default_error },
+	{ _parsepath_desc,		genfs_parsepath },
 	{ _lookup_desc,		sfs_lookup },
 	{ _open_desc,		sfs_open },
 	{ _close_desc,		sfs_close },

CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Fri Jul  2 17:14:37 UTC 2021

Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c

Log Message:
Add VOP_PARSEPATH to zfs's vnode table. "oops"

zfs not being under src/sys strikes again :-(


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c

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

Modified files:

Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.71 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.72
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.71	Sun Nov 15 00:54:13 2020
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c	Fri Jul  2 17:14:36 2021
@@ -6347,6 +6347,7 @@ const struct genfs_ops zfs_genfsops = {
 int (**zfs_vnodeop_p)(void *);
 const struct vnodeopv_entry_desc zfs_vnodeop_entries[] = {
 	{ _default_desc,		vn_default_error },
+	{ _parsepath_desc,		genfs_parsepath },
 	{ _lookup_desc,		zfs_netbsd_lookup },
 	{ _create_desc,		zfs_netbsd_create },
 	{ _mknod_desc,		zfs_netbsd_mknod },

CVS commit: src/external/gpl3/gcc.old/dist/gcc

[Chris Pinnock]

Module Name:src
Committed By:   cjep
Date:   Tue Jun 29 08:51:04 UTC 2021

Modified Files:
src/external/gpl3/gcc.old/dist/gcc: config.host

Log Message:
PR toolchain/56180. Additional to yesterday's commit in gcc, also needed in
gcc.old. Add configuration so that gcc can find the LTO plugin when
cross-building NetBSD from OpenBSD hosts.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc.old/dist/gcc/config.host

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/dist/gcc/config.host
diff -u src/external/gpl3/gcc.old/dist/gcc/config.host:1.10 src/external/gpl3/gcc.old/dist/gcc/config.host:1.11
--- src/external/gpl3/gcc.old/dist/gcc/config.host:1.10	Fri Apr  9 23:14:17 2021
+++ src/external/gpl3/gcc.old/dist/gcc/config.host	Tue Jun 29 08:51:03 2021
@@ -277,6 +277,7 @@ case ${host} in
   *-*-openbsd*)
 out_host_hook_obj=host-openbsd.o
 host_xmake_file="${host_xmake_file} x-openbsd"
+host_lto_plugin_soname=liblto_plugin.so.0.0
 ;;
   *-*-netbsd*)
 out_host_hook_obj=host-netbsd.o

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

[Chris Pinnock]

Module Name:src
Committed By:   cjep
Date:   Mon Jun 28 09:13:11 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist/gcc: config.host

Log Message:
PR toolchain/56180. Add configuration so that gcc can find the LTO
plugin when cross-building NetBSD from OpenBSD hosts. Discussed with mrg.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/dist/gcc/config.host

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config.host
diff -u src/external/gpl3/gcc/dist/gcc/config.host:1.10 src/external/gpl3/gcc/dist/gcc/config.host:1.11
--- src/external/gpl3/gcc/dist/gcc/config.host:1.10	Sun Apr 11 00:02:11 2021
+++ src/external/gpl3/gcc/dist/gcc/config.host	Mon Jun 28 09:13:10 2021
@@ -277,6 +277,7 @@ case ${host} in
   *-*-openbsd*)
 out_host_hook_obj=host-openbsd.o
 host_xmake_file="${host_xmake_file} x-openbsd"
+host_lto_plugin_soname=liblto_plugin.so.0.0
 ;;
   *-*-netbsd*)
 out_host_hook_obj=host-netbsd.o

CVS commit: src/external/gpl2/xcvs/dist/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Jun 21 02:48:01 UTC 2021

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.texinfo

Log Message:
PR/56256: Germain: cvs info doc incorrect for update -D


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.14 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.15
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.14	Fri Jul  5 20:10:25 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo	Sun Jun 20 22:48:01 2021
@@ -11807,7 +11807,7 @@ them):
 @table @code
 @item -D date
 Use the most recent revision no later than @var{date}.
-This option is sticky, and implies @samp{-P}.
+This option is sticky.
 See @ref{Sticky tags}, for more information on sticky tags/dates.
 
 @item -f

CVS commit: src/external/gpl3/gdb/bin/gdbserver

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Jun 20 12:29:58 UTC 2021

Modified Files:
src/external/gpl3/gdb/bin/gdbserver: Makefile

Log Message:
gdbserver(1): Work around clang build failure.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/bin/gdbserver/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/gdb/bin/gdbserver/Makefile
diff -u src/external/gpl3/gdb/bin/gdbserver/Makefile:1.3 src/external/gpl3/gdb/bin/gdbserver/Makefile:1.4
--- src/external/gpl3/gdb/bin/gdbserver/Makefile:1.3	Thu Sep 24 14:53:35 2020
+++ src/external/gpl3/gdb/bin/gdbserver/Makefile	Sun Jun 20 12:29:58 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2020/09/24 14:53:35 christos Exp $
+#	$NetBSD: Makefile,v 1.4 2021/06/20 12:29:58 riastradh Exp $
 
 NOCTF=
 NOMAN=
@@ -30,6 +30,9 @@ CPPFLAGS+=	-I${.CURDIR} \
 		-I${DIST}/include \
 		${GCPPFLAGS:M-D*}
 
+# /usr/src/current/external/gpl3/gdb/bin/gdbserver/../../dist/gdb/nat/fork-inferior.c:497:15: error: 6 enumeration values not handled in switch: 'TARGET_WAITKIND_VFORK_DONE', 'TARGET_WAITKIND_IGNORE', 'TARGET_WAITKIND_NO_HISTORY'... [-Werror,-Wswitch]
+CXXFLAGS+=	${${ACTIVE_CC} == "clang":? -Wno-error=switch : }
+
 .include "../../Makefile.inc"
 .include 
 

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jun 18 22:12:02 UTC 2021

Modified Files:
src/external/mit/libuv/lib: Makefile

Log Message:
don't install the libuv.pc file for pic (but private) libs as well.

avoids triggering a makefs warning when building a file system out
of the DESTDIR directly, using the METALOG files etc:

makefs: Can't open `././libuv.pc' for reading: No such file or directory

(the file was installed, and the obsoleted.)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/libuv/lib/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/mit/libuv/lib/Makefile
diff -u src/external/mit/libuv/lib/Makefile:1.4 src/external/mit/libuv/lib/Makefile:1.5
--- src/external/mit/libuv/lib/Makefile:1.4	Mon Jun  1 14:39:42 2020
+++ src/external/mit/libuv/lib/Makefile	Fri Jun 18 22:12:02 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/06/01 14:39:42 christos Exp $
+# $NetBSD: Makefile,v 1.5 2021/06/18 22:12:02 mrg Exp $
 
 LIBISPRIVATE=pic
 
@@ -61,7 +61,7 @@ CPPFLAGS+=	-I${LIBUVDIR}/include -I${LIB
 
 LIBDPLIBS+=	kvm ${NETBSDSRCDIR}/lib/libkvm
 
-.if ${LIBISPRIVATE} != "yes"
+.if ${LIBISPRIVATE} != "yes" && ${LIBISPRIVATE} != "pic"
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0
 

CVS commit: src/external/bsd/libfido2

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Jun 18 13:57:52 UTC 2021

Modified Files:
src/external/bsd/libfido2: Makefile.inc
src/external/bsd/libfido2/bin: Makefile.inc
src/external/bsd/libfido2/lib: Makefile

Log Message:
fix sun2 build


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libfido2/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/bin/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libfido2/lib/Makefile

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

Modified files:

Index: src/external/bsd/libfido2/Makefile.inc
diff -u src/external/bsd/libfido2/Makefile.inc:1.3 src/external/bsd/libfido2/Makefile.inc:1.4
--- src/external/bsd/libfido2/Makefile.inc:1.3	Wed Jun 16 21:15:44 2021
+++ src/external/bsd/libfido2/Makefile.inc	Fri Jun 18 09:57:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2021/06/17 01:15:44 christos Exp $
+# $NetBSD: Makefile.inc,v 1.4 2021/06/18 13:57:52 christos Exp $
 
 DIST:=${.PARSEDIR}/dist
 
@@ -13,6 +13,3 @@ FIDO_VERSION=${FIDO_MAJOR}.${FIDO_MINOR}
 CPPFLAGS+=-D_FIDO_MAJOR=${FIDO_MAJOR} -D_FIDO_MINOR=${FIDO_MINOR}
 CPPFLAGS+=-D_FIDO_PATCH=${FIDO_PATCH}
 CPPFLAGS+=-DHAVE_UNISTD_H -DHAVE_ARC4RANDOM_BUF -DHAVE_TIMESPECSUB
-
-LDFLAGS+=-lz
-DPFLAGS+=${LIBZ}

Index: src/external/bsd/libfido2/bin/Makefile.inc
diff -u src/external/bsd/libfido2/bin/Makefile.inc:1.2 src/external/bsd/libfido2/bin/Makefile.inc:1.3
--- src/external/bsd/libfido2/bin/Makefile.inc:1.2	Wed Mar  4 12:31:08 2020
+++ src/external/bsd/libfido2/bin/Makefile.inc	Fri Jun 18 09:57:52 2021
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile.inc,v 1.2 2020/03/04 17:31:08 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.3 2021/06/18 13:57:52 christos Exp $
 
 .include "${.PARSEDIR}/../Makefile.inc"
 
 .PATH: ${DIST}/tools ${DIST}/man ${DIST}/openbsd-compat
 
-LDADD+=-lfido2 -lcbor -lusbhid -lcrypto  -lm
-DPADD+=${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID} ${LIBCRYPTO} ${LIBM}
+LDADD+=-lfido2 -lcbor -lusbhid -lcrypto -lz -lm 
+DPADD+=${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID} ${LIBCRYPTO} ${LIBZ} ${LIBM}

Index: src/external/bsd/libfido2/lib/Makefile
diff -u src/external/bsd/libfido2/lib/Makefile:1.6 src/external/bsd/libfido2/lib/Makefile:1.7
--- src/external/bsd/libfido2/lib/Makefile:1.6	Thu Jun 17 08:38:53 2021
+++ src/external/bsd/libfido2/lib/Makefile	Fri Jun 18 09:57:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/06/17 12:38:53 christos Exp $
+# $NetBSD: Makefile,v 1.7 2021/06/18 13:57:52 christos Exp $
 
 NOLINT=
 .include 
@@ -8,8 +8,8 @@ NOLINT=
 
 CPPFLAGS+= -D_FIDO_INTERNAL -I${DIST}/src
 
-LDADD+=-lusbhid -lcbor
-DPADD+=${LIBUSBHID} ${LIBCBOR}
+LDADD+=-lusbhid -lcbor -lz
+DPADD+=${LIBUSBHID} ${LIBCBOR} ${LIBZ}
 
 LDFLAGS+=-Wl,--version-script=${DIST}/src/export.gnu
 

CVS commit: src/external/bsd/libfido2/dist/src

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun 17 12:53:43 UTC 2021

Modified Files:
src/external/bsd/libfido2/dist/src: hid_netbsd.c

Log Message:
replace our merged version with upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/dist/src/hid_netbsd.c

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

Modified files:

Index: src/external/bsd/libfido2/dist/src/hid_netbsd.c
diff -u src/external/bsd/libfido2/dist/src/hid_netbsd.c:1.2 src/external/bsd/libfido2/dist/src/hid_netbsd.c:1.3
--- src/external/bsd/libfido2/dist/src/hid_netbsd.c:1.2	Wed Jun 16 21:15:46 2021
+++ src/external/bsd/libfido2/dist/src/hid_netbsd.c	Thu Jun 17 08:53:43 2021
@@ -11,23 +11,22 @@
 #include 
 
 #include 
-#include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 
 #include "fido.h"
 
 #define MAX_UHID	64
 
 struct hid_netbsd {
-	int	fd;
-	size_t	report_in_len;
-	size_t	report_out_len;
+	int fd;
+	size_t  report_in_len;
+	size_t  report_out_len;
 	sigset_tsigmask;
 	const sigset_t *sigmaskp;
 };
@@ -41,47 +40,39 @@ struct hid_netbsd {
 static bool
 is_fido(int fd)
 {
-	report_desc_t			rdesc;
-	hid_data_t			hdata;
-	hid_item_t			hitem;
-	boolisfido;
+	struct usb_ctl_report_desc	ucrd;
+	uint32_t			usage_page = 0;
 	intraw = 1;
 
-	if ((rdesc = hid_get_report_desc(fd)) == NULL) {
-		fido_log_debug("%s: failed to get report descriptor",
-		__func__);
+	memset(, 0, sizeof(ucrd));
+
+	if (ioctl(fd, IOCTL_REQ(USB_GET_REPORT_DESC), ) == -1) {
+		fido_log_error(errno, "%s: ioctl", __func__);
 		return (false);
 	}
-	if ((hdata = hid_start_parse(rdesc, 1 << hid_collection, -1))
-	== NULL) {
-		fido_log_debug("%s: failed to parse report descriptor",
-		__func__);
-		hid_dispose_report_desc(rdesc);
+
+	if (ucrd.ucrd_size < 0 ||
+	(size_t)ucrd.ucrd_size > sizeof(ucrd.ucrd_data) ||
+	fido_hid_get_usage(ucrd.ucrd_data, (size_t)ucrd.ucrd_size,
+		_page) < 0) {
+		fido_log_debug("%s: fido_hid_get_usage", __func__);
 		return (false);
 	}
-	isfido = false;
-	while ((hid_get_item(hdata, )) > 0) {
-		if (HID_PAGE(hitem.usage) == 0xf1d0) {
-			isfido = true;
-			break;
-		}
-	}
-	hid_end_parse(hdata);
-	hid_dispose_report_desc(rdesc);
-	if (!isfido)
+
+	if (usage_page != 0xf1d0)
 		return (false);
 
-/*
+	/*
 	 * This step is not strictly necessary -- NetBSD puts fido
- * devices into raw mode automatically by default, but in
- * principle that might change, and this serves as a test to
- * verify that we're running on a kernel with support for raw
- * mode at all so we don't get confused issuing writes that try
- * to set the report descriptor rather than transfer data on
- * the output interrupt pipe as we need.
+	 * devices into raw mode automatically by default, but in
+	 * principle that might change, and this serves as a test to
+	 * verify that we're running on a kernel with support for raw
+	 * mode at all so we don't get confused issuing writes that try
+	 * to set the report descriptor rather than transfer data on
+	 * the output interrupt pipe as we need.
 	 */
-	if (ioctl(fd, USB_HID_SET_RAW, ) == -1) {
-		fido_log_debug("%s: unable to set raw", __func__);
+	if (ioctl(fd, IOCTL_REQ(USB_HID_SET_RAW), ) == -1) {
+		fido_log_error(errno, "%s: unable to set raw", __func__);
 		return (false);
 	}
 
@@ -98,17 +89,13 @@ copy_info(fido_dev_info_t *di, const cha
 	memset(di, 0, sizeof(*di));
 	memset(, 0, sizeof(udi));
 
-	if ((fd = open(path, O_RDWR)) == -1) {
-		if (errno != EBUSY && errno != ENOENT)
-			fido_log_debug("%s: open %s: %s", __func__, path,
-			strerror(errno));
-		goto fail;
-	}
-	if (!is_fido(fd))
+	if ((fd = fido_hid_unix_open(path)) == -1 || is_fido(fd) == 0)
 		goto fail;
 
-	if (ioctl(fd, USB_GET_DEVICEINFO, ) == -1)
+	if (ioctl(fd, IOCTL_REQ(USB_GET_DEVICEINFO), ) == -1) {
+		fido_log_error(errno, "%s: ioctl", __func__);
 		goto fail;
+	}
 
 	if ((di->path = strdup(path)) == NULL ||
 	(di->manufacturer = strdup(udi.udi_vendor)) == NULL ||
@@ -120,8 +107,8 @@ copy_info(fido_dev_info_t *di, const cha
 
 	ok = 0;
 fail:
-	if (fd != -1)
-		close(fd);
+	if (fd != -1 && close(fd) == -1)
+		fido_log_error(errno, "%s: close", __func__);
 
 	if (ok < 0) {
 		free(di->path);
@@ -198,7 +185,7 @@ terrible_ping_kludge(struct hid_netbsd *
 		pfd.fd = ctx->fd;
 		pfd.events = POLLIN;
 		if ((n = poll(, 1, 100)) == -1) {
-			fido_log_debug("%s: poll: %d", __func__, errno);
+			fido_log_error(errno, "%s: poll", __func__);
 			return -1;
 		} else if (n == 0) {
 			fido_log_debug("%s: timed out", __func__);
@@ -223,58 +210,40 @@ void *
 fido_hid_open(const char *path)
 {
 	struct hid_netbsd		*ctx;
-	report_desc_t			rdesc = NULL;
-	hid_data_t			hdata;
-	intlen, report_id = 0;
-
-	if ((ctx = calloc(1, sizeof(*ctx))) == NULL)
-		goto 

CVS commit: src/external/bsd/libfido2/lib

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun 17 12:38:53 UTC 2021

Modified Files:
src/external/bsd/libfido2/lib: Makefile
Removed Files:
src/external/bsd/libfido2/lib: fido2.map

Log Message:
use the linker script provided by the package


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libfido2/lib/Makefile
cvs rdiff -u -r1.3 -r0 src/external/bsd/libfido2/lib/fido2.map

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

Modified files:

Index: src/external/bsd/libfido2/lib/Makefile
diff -u src/external/bsd/libfido2/lib/Makefile:1.5 src/external/bsd/libfido2/lib/Makefile:1.6
--- src/external/bsd/libfido2/lib/Makefile:1.5	Thu Jun 17 02:20:56 2021
+++ src/external/bsd/libfido2/lib/Makefile	Thu Jun 17 08:38:53 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/06/17 06:20:56 rin Exp $
+# $NetBSD: Makefile,v 1.6 2021/06/17 12:38:53 christos Exp $
 
 NOLINT=
 .include 
@@ -11,7 +11,7 @@ CPPFLAGS+= -D_FIDO_INTERNAL -I${DIST}/sr
 LDADD+=-lusbhid -lcbor
 DPADD+=${LIBUSBHID} ${LIBCBOR}
 
-LDFLAGS+=-Wl,--version-script=${.CURDIR}/fido2.map
+LDFLAGS+=-Wl,--version-script=${DIST}/src/export.gnu
 
 LIB=fido2
 

CVS commit: src/external/bsd/libfido2/lib

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Jun 17 06:20:56 UTC 2021

Modified Files:
src/external/bsd/libfido2/lib: Makefile

Log Message:
Unbreak build; new libfido2 requires OpenBSD-compatible freezero().


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

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

Modified files:

Index: src/external/bsd/libfido2/lib/Makefile
diff -u src/external/bsd/libfido2/lib/Makefile:1.4 src/external/bsd/libfido2/lib/Makefile:1.5
--- src/external/bsd/libfido2/lib/Makefile:1.4	Thu Jun 17 01:15:46 2021
+++ src/external/bsd/libfido2/lib/Makefile	Thu Jun 17 06:20:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/06/17 01:15:46 christos Exp $
+# $NetBSD: Makefile,v 1.5 2021/06/17 06:20:56 rin Exp $
 
 NOLINT=
 .include 
@@ -48,6 +48,7 @@ u2f.c
 
 SRCS+= \
 explicit_bzero.c \
+freezero.c \
 recallocarray.c \
 timingsafe_bcmp.c
 

CVS commit: src/external/bsd/libfido2

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun 17 01:15:46 UTC 2021

Modified Files:
src/external/bsd/libfido2: Makefile.inc
src/external/bsd/libfido2/bin/fido2-assert: Makefile
src/external/bsd/libfido2/bin/fido2-cred: Makefile
src/external/bsd/libfido2/bin/fido2-token: Makefile
src/external/bsd/libfido2/dist/src: hid_netbsd.c
src/external/bsd/libfido2/dist/tools: util.c
src/external/bsd/libfido2/lib: Makefile fido2.map
Removed Files:
src/external/bsd/libfido2/dist: .travis.yml x xx
src/external/bsd/libfido2/dist/.github/workflows: scan.yml windows.yml
src/external/bsd/libfido2/dist/.travis: build-linux-clang
build-linux-gcc build-linux-mingw build-osx-clang fuzz-linux-asan
fuzz-linux-msan
src/external/bsd/libfido2/dist/debian: changelog compat control
copyright fido2-tools.install fido2-tools.manpages
libfido2-1.install libfido2-1.symbols libfido2-dev.install
libfido2-dev.links libfido2-dev.manpages libfido2-udev.install
rules
src/external/bsd/libfido2/dist/debian/source: format
src/external/bsd/libfido2/dist/docker/bionic: Dockerfile
src/external/bsd/libfido2/dist/fuzz: corpus.tgz
src/external/bsd/libfido2/dist/openbsd-compat: diff.sh
src/external/bsd/libfido2/dist/tools: macos_pkg.sh

Log Message:
merge conflicts and update between libfido 1.5.0 and 1.7.0


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libfido2/bin/fido2-assert/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libfido2/bin/fido2-cred/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libfido2/bin/fido2-token/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libfido2/dist/.travis.yml \
src/external/bsd/libfido2/dist/x src/external/bsd/libfido2/dist/xx
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/libfido2/dist/.github/workflows/scan.yml \
src/external/bsd/libfido2/dist/.github/workflows/windows.yml
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/libfido2/dist/.travis/build-linux-clang \
src/external/bsd/libfido2/dist/.travis/build-linux-gcc \
src/external/bsd/libfido2/dist/.travis/build-linux-mingw \
src/external/bsd/libfido2/dist/.travis/build-osx-clang \
src/external/bsd/libfido2/dist/.travis/fuzz-linux-asan \
src/external/bsd/libfido2/dist/.travis/fuzz-linux-msan
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libfido2/dist/debian/changelog \
src/external/bsd/libfido2/dist/debian/compat \
src/external/bsd/libfido2/dist/debian/control \
src/external/bsd/libfido2/dist/debian/copyright \
src/external/bsd/libfido2/dist/debian/fido2-tools.install \
src/external/bsd/libfido2/dist/debian/fido2-tools.manpages \
src/external/bsd/libfido2/dist/debian/libfido2-1.install \
src/external/bsd/libfido2/dist/debian/libfido2-1.symbols \
src/external/bsd/libfido2/dist/debian/libfido2-dev.install \
src/external/bsd/libfido2/dist/debian/libfido2-dev.links \
src/external/bsd/libfido2/dist/debian/libfido2-dev.manpages \
src/external/bsd/libfido2/dist/debian/libfido2-udev.install \
src/external/bsd/libfido2/dist/debian/rules
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/libfido2/dist/debian/source/format
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/libfido2/dist/docker/bionic/Dockerfile
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libfido2/dist/fuzz/corpus.tgz
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/libfido2/dist/openbsd-compat/diff.sh
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libfido2/dist/src/hid_netbsd.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libfido2/dist/tools/macos_pkg.sh
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/libfido2/dist/tools/util.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libfido2/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/lib/fido2.map

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

Modified files:

Index: src/external/bsd/libfido2/Makefile.inc
diff -u src/external/bsd/libfido2/Makefile.inc:1.2 src/external/bsd/libfido2/Makefile.inc:1.3
--- src/external/bsd/libfido2/Makefile.inc:1.2	Fri Dec  4 13:27:44 2020
+++ src/external/bsd/libfido2/Makefile.inc	Wed Jun 16 21:15:44 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2020/12/04 18:27:44 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2021/06/17 01:15:44 christos Exp $
 
 DIST:=${.PARSEDIR}/dist
 
@@ -13,3 +13,6 @@ FIDO_VERSION=${FIDO_MAJOR}.${FIDO_MINOR}
 CPPFLAGS+=-D_FIDO_MAJOR=${FIDO_MAJOR} -D_FIDO_MINOR=${FIDO_MINOR}
 CPPFLAGS+=-D_FIDO_PATCH=${FIDO_PATCH}
 CPPFLAGS+=-DHAVE_UNISTD_H -DHAVE_ARC4RANDOM_BUF -DHAVE_TIMESPECSUB
+
+LDFLAGS+=-lz
+DPFLAGS+=${LIBZ}

Index: src/external/bsd/libfido2/bin/fido2-assert/Makefile
diff -u src/external/bsd/libfido2/bin/fido2-assert/Makefile:1.1 

CVS commit: src/external/gpl3/gcc

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Wed Jun 16 00:56:16 UTC 2021

Modified Files:
src/external/gpl3/gcc: README.gcc10

Log Message:
Update earmv[67]{,hf}{,eb}: hazard has gone, just working fine!

Note that kernel texts for soft-float variants are just same as that for
hard-float counterparts.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/gpl3/gcc/README.gcc10

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/README.gcc10
diff -u src/external/gpl3/gcc/README.gcc10:1.21 src/external/gpl3/gcc/README.gcc10:1.22
--- src/external/gpl3/gcc/README.gcc10:1.21	Thu May 27 06:58:27 2021
+++ src/external/gpl3/gcc/README.gcc10	Wed Jun 16 00:56:16 2021
@@ -1,4 +1,4 @@
-$NetBSD: README.gcc10,v 1.21 2021/05/27 06:58:27 mrg Exp $
+$NetBSD: README.gcc10,v 1.22 2021/06/16 00:56:16 rin Exp $
 
 
 new stuff:
@@ -39,14 +39,14 @@ earmv5		y	b	y	y		y		y	y	n
 earmv5eb	y	b	y	y		y		?	?	?
 earmv5hf	y	y	y	y		y		?	?	?
 earmv5hfeb	y	b	y	y		y		?	?	?
-earmv6		y	b	y	y		y		y	?	?
-earmv6eb	y	b	y	y		y		y	?	?
-earmv6hf	y	y	y	y		y		y[2]	?	?
-earmv6hfeb	y	b	y	y		y		y[2]	?	?
-earmv7		y	b	y	y		y		?	?	?
-earmv7eb	y	b	y	y		y		?	?	?
+earmv6		y	b	y	y		y		y	y	n
+earmv6eb	y	b	y	y		y		y	y	n
+earmv6hf	y	y	y	y		y		y	y	n
+earmv6hfeb	y	y	y	y		y		y	y	n
+earmv7		y	b	y	y		y		y	y	n
+earmv7eb	y	b	y	y		y		y	y	n
 earmv7hf	y	y	y	y		y		y	y	n
-earmv7hfeb	y	b	y	y		y		y	y	n
+earmv7hfeb	y	y	y	y		y		y	y	n
 hppa		y	y	y	y		y		y	y	y
 i386		y	y	y	y		y		y	n[8]	y
 ia64		y	y	y	y		y		?	N/A	y
@@ -72,14 +72,6 @@ coldfire	?	N/A	?	?		?		N/A	N/A
 architecture	tools	kernels	libgcc	native-gcc	make release	runs	atf
 
 [1] - ramdisk.fs is too large, needs fixing.
-[2] - armv6hf (both little and big endian) has new problems:
-  rpi# cat bar.s
-  .cfi_startproc
-  .cfi_endproc
-  rpi# as bar.s
-  bar.s: Assembler messages:
-  bar.s: Internal error (Illegal instruction).
-  Please report this bug.
 [6] - vax vs c++ exceptions issue, same as it ever was
 [7] - fails just as poorly in gxemul/landisk as GCC 9
 [8] - i386 seems to have a signal delivery issue.  pthread tests hang and then

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

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Tue Jun 15 08:22:23 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc

Log Message:
Fix GCC10 for arm.

Include order of bpapi.h and netbsd-elf.h was swapped when official
support for arm*--netbsdelf-eabi{,hf} was added to GCC10. This seems to
cause critical inconsistencies, which results in SIGSEGV for as(1) on
earmv6hf{,eb} and some other regressions for many arm variants.

With this fix, everything work just fine as far as I can see.

Thanks skrll and mrg for discussion!


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/external/gpl3/gcc/dist/gcc/config.gcc

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.69 src/external/gpl3/gcc/dist/gcc/config.gcc:1.70
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.69	Sun Apr 25 23:12:53 2021
+++ src/external/gpl3/gcc/dist/gcc/config.gcc	Tue Jun 15 08:22:23 2021
@@ -1280,7 +1280,7 @@ arm*-*-netbsdelf*)
 	esac
 	case ${target} in
 	arm*-*-netbsdelf-*eabi*)
-	tm_file="${tm_file} arm/bpabi.h arm/netbsd-elf.h arm/netbsd-eabi.h"
+	tm_file="${tm_file} arm/netbsd-elf.h arm/bpabi.h arm/netbsd-eabi.h"
 	# GCC 7 vs NetBSD/eabi -> avoid arm unwinder
 	#tmake_file="$tmake_file arm/t-bpabi"
 	tmake_file="$tmake_file arm/t-netbsdeabi"
@@ -1288,7 +1288,7 @@ arm*-*-netbsdelf*)
 	default_use_cxa_atexit=yes
 	;;
 	*)
-	tm_file="$tm_file arm/bpabi.h arm/netbsd-elf.h"
+	tm_file="$tm_file arm/netbsd-elf.h arm/bpabi.h"
 	#tmake_file="$tmake_file arm/t-bpabi arm/t-netbsdeabi"
 	tmake_file="$tmake_file arm/t-netbsd"
 	;;

CVS commit: src/external/gpl2/texinfo/dist/makeinfo

[Chris Pinnock]

Module Name:src
Committed By:   cjep
Date:   Mon Jun  7 20:27:59 UTC 2021

Modified Files:
src/external/gpl2/texinfo/dist/makeinfo: multi.c

Log Message:
Whilst debugging the nbmakeinfo tool on an OpenBSD box, I noticed
two changes in OpenBSD's makeinfo sources. One addresses an out of bounds
access issue and the other an off-by-one issue.

Fixes PR toolchain/56179. Reviewed by christos.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/texinfo/dist/makeinfo/multi.c

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

Modified files:

Index: src/external/gpl2/texinfo/dist/makeinfo/multi.c
diff -u src/external/gpl2/texinfo/dist/makeinfo/multi.c:1.1.1.1 src/external/gpl2/texinfo/dist/makeinfo/multi.c:1.2
--- src/external/gpl2/texinfo/dist/makeinfo/multi.c:1.1.1.1	Thu Jan 14 00:11:29 2016
+++ src/external/gpl2/texinfo/dist/makeinfo/multi.c	Mon Jun  7 20:27:59 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: multi.c,v 1.1.1.1 2016/01/14 00:11:29 christos Exp $	*/
+/*	$NetBSD: multi.c,v 1.2 2021/06/07 20:27:59 cjep Exp $	*/
 
 /* multi.c -- multiple-column tables (@multitable) for makeinfo.
Id: multi.c,v 1.8 2004/04/11 17:56:47 karl Exp 
@@ -209,7 +209,7 @@ setup_multitable_parameters (void)
   params++;
 
 if (*params == '@') {
-  sscanf (params, "%200s", command);
+  sscanf (params, "%199s", command);
   nchars = strlen (command);
   params += nchars;
   if (strcmp (command, "@hsep") == 0)
@@ -432,8 +432,8 @@ output_multitable_row (void)
 
   /* remove trailing whitespace from each column */
   for (i = 1; i <= last_column; i++) {
-if (envs[i].output_paragraph_offset)
-  while (cr_or_whitespace (CHAR_AT (envs[i].output_paragraph_offset - 1)))
+while (envs[i].output_paragraph_offset &&
+  cr_or_whitespace (CHAR_AT (envs[i].output_paragraph_offset - 1)))
 envs[i].output_paragraph_offset--;
 
 if (i == current_env_no)

CVS commit: src/external/gpl3/gcc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Jun  6 01:09:08 UTC 2021

Modified Files:
src/external/gpl3/gcc/lib/libbacktrace/arch/mipsn64el: config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsn64el: c++config.h
symver-config.h
src/external/gpl3/gcc/usr.bin/gcc/arch/mipsn64el: auto-host.h
configargs.h
src/external/gpl3/gcc/usr.bin/libcpp/arch/mipsn64el: config.h

Log Message:
regen mipsn64el


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libbacktrace/arch/mipsn64el/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsn64el/c++config.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsn64el/symver-config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/usr.bin/gcc/arch/mipsn64el/auto-host.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/mipsn64el/configargs.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/usr.bin/libcpp/arch/mipsn64el/config.h

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

Modified files:

Index: src/external/gpl3/gcc/lib/libbacktrace/arch/mipsn64el/config.h
diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/mipsn64el/config.h:1.1 src/external/gpl3/gcc/lib/libbacktrace/arch/mipsn64el/config.h:1.2
--- src/external/gpl3/gcc/lib/libbacktrace/arch/mipsn64el/config.h:1.1	Mon Apr 26 13:29:25 2021
+++ src/external/gpl3/gcc/lib/libbacktrace/arch/mipsn64el/config.h	Sat Jun  5 21:09:08 2021
@@ -85,7 +85,7 @@
 #define HAVE_UNISTD_H 1
 
 /* Define if -lz is available. */
-/* #undef HAVE_ZLIB */
+#define HAVE_ZLIB 1
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
*/

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsn64el/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsn64el/c++config.h:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsn64el/c++config.h:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsn64el/c++config.h:1.1	Mon Apr 26 13:29:26 2021
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsn64el/c++config.h	Sat Jun  5 21:09:08 2021
@@ -702,10 +702,10 @@ namespace std
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 if you have the `acosf' function. */
-/* #undef _GLIBCXX_HAVE_ACOSF */
+#define _GLIBCXX_HAVE_ACOSF 1
 
 /* Define to 1 if you have the `acosl' function. */
-/* #undef _GLIBCXX_HAVE_ACOSL */
+#define _GLIBCXX_HAVE_ACOSL 1
 
 /* Define to 1 if you have the `aligned_alloc' function. */
 #define _GLIBCXX_HAVE_ALIGNED_ALLOC 1
@@ -714,25 +714,25 @@ namespace std
 #define _GLIBCXX_HAVE_ARPA_INET_H 1
 
 /* Define to 1 if you have the `asinf' function. */
-/* #undef _GLIBCXX_HAVE_ASINF */
+#define _GLIBCXX_HAVE_ASINF 1
 
 /* Define to 1 if you have the `asinl' function. */
-/* #undef _GLIBCXX_HAVE_ASINL */
+#define _GLIBCXX_HAVE_ASINL 1
 
 /* Define to 1 if the target assembler supports .symver directive. */
 #define _GLIBCXX_HAVE_AS_SYMVER_DIRECTIVE 1
 
 /* Define to 1 if you have the `atan2f' function. */
-/* #undef _GLIBCXX_HAVE_ATAN2F */
+#define _GLIBCXX_HAVE_ATAN2F 1
 
 /* Define to 1 if you have the `atan2l' function. */
-/* #undef _GLIBCXX_HAVE_ATAN2L */
+#define _GLIBCXX_HAVE_ATAN2L 1
 
 /* Define to 1 if you have the `atanf' function. */
-/* #undef _GLIBCXX_HAVE_ATANF */
+#define _GLIBCXX_HAVE_ATANF 1
 
 /* Define to 1 if you have the `atanl' function. */
-/* #undef _GLIBCXX_HAVE_ATANL */
+#define _GLIBCXX_HAVE_ATANL 1
 
 /* Defined if shared_ptr reference counting should use atomic operations. */
 #define _GLIBCXX_HAVE_ATOMIC_LOCK_POLICY 1
@@ -744,25 +744,25 @@ namespace std
 /* #undef _GLIBCXX_HAVE_CC_TLS */
 
 /* Define to 1 if you have the `ceilf' function. */
-/* #undef _GLIBCXX_HAVE_CEILF */
+#define _GLIBCXX_HAVE_CEILF 1
 
 /* Define to 1 if you have the `ceill' function. */
-/* #undef _GLIBCXX_HAVE_CEILL */
+#define _GLIBCXX_HAVE_CEILL 1
 
 /* Define to 1 if you have the  header file. */
 #define _GLIBCXX_HAVE_COMPLEX_H 1
 
 /* Define to 1 if you have the `cosf' function. */
-/* #undef _GLIBCXX_HAVE_COSF */
+#define _GLIBCXX_HAVE_COSF 1
 
 /* Define to 1 if you have the `coshf' function. */
-/* #undef _GLIBCXX_HAVE_COSHF */
+#define _GLIBCXX_HAVE_COSHF 1
 
 /* Define to 1 if you have the `coshl' function. */
-/* #undef _GLIBCXX_HAVE_COSHL */
+#define _GLIBCXX_HAVE_COSHL 1
 
 /* Define to 1 if you have the `cosl' function. */
-/* #undef _GLIBCXX_HAVE_COSL */
+#define _GLIBCXX_HAVE_COSL 1
 
 /* Define to 1 if you have the  header file. */
 #define _GLIBCXX_HAVE_DIRENT_H 1
@@ -780,16 +780,16 @@ namespace std
 #define _GLIBCXX_HAVE_EXECINFO_H 1
 
 /* Define to 1 if you have the `expf' function. */
-/* #undef _GLIBCXX_HAVE_EXPF */
+#define _GLIBCXX_HAVE_EXPF 1
 
 /* Define to 1 if you have the `expl' function. */
-/* #undef _GLIBCXX_HAVE_EXPL */
+#define _GLIBCXX_HAVE_EXPL 1
 
 /* Define to 1 if you have the `fabsf' function. */
-/* 

CVS commit: src/external/gpl3/gdb/dist/gdb

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri Jun  4 01:42:14 UTC 2021

Modified Files:
src/external/gpl3/gdb/dist/gdb: aarch64-nbsd-tdep.c

Log Message:
Add missing nbsd_init_abi() call to aarch64_nbsd_init_abi().

Fix tests/usr.bin/gdb/t_regress:pie on aarch64eb (types of auxv was
misinterpreted), and hopefully other strange behaviors on aarch64{,eb}.

This is a regression introduced in GDB11. Neither gdb.old nor release
branches are affected.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-tdep.c

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

Modified files:

Index: src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-tdep.c:1.7 src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-tdep.c:1.8
--- src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-tdep.c:1.7	Fri Dec 11 18:23:25 2020
+++ src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-tdep.c	Fri Jun  4 01:42:14 2021
@@ -182,6 +182,8 @@ aarch64_nbsd_init_abi (struct gdbarch_in
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
+  nbsd_init_abi (info, gdbarch);
+
   set_solib_svr4_fetch_link_map_offsets (gdbarch,
 	 svr4_lp64_fetch_link_map_offsets);
 

CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Jun  3 07:37:01 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
Sort ${MACHINE}'s. No functional changes.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.18 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.19
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.18	Thu Jun  3 07:34:29 2021
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile	Thu Jun  3 07:37:00 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2021/06/03 07:34:29 rin Exp $
+#	$NetBSD: Makefile,v 1.19 2021/06/03 07:37:00 rin Exp $
 
 DRIVER=		xf86-input-keyboard
 DRIVER_NAME=	kbd_drv
@@ -13,11 +13,15 @@ CPPFLAGS+=	-DPCVT_SUPPORT
 # turns out we can't use wskbd everywhere without a couple more translation
 # tables in the X driver so make it the default only where we know it will work
 
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE} == "sparc" || \
-${MACHINE} == "sparc64" || ${MACHINE} == "sgimips" || \
-${MACHINE} == "shark" || ${MACHINE} == "vax" || \
-${MACHINE} == "evbarm" || ${MACHINE} == "mac68k" || \
-${MACHINE} == "amiga"
+.if ${MACHINE_ARCH} == "powerpc" || \
+${MACHINE} == "amiga" || \
+${MACHINE} == "evbarm" || \
+${MACHINE} == "mac68k" || \
+${MACHINE} == "sgimips" || \
+${MACHINE} == "shark" || \
+${MACHINE} == "sparc" || \
+${MACHINE} == "sparc64" || \
+${MACHINE} == "vax"
 CPPFLAGS+=	-DDEFAULT_TO_WSKBD
 .endif
 

CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Jun  3 07:34:30 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
For amiga, use wskbd as default, which is only supported protocol today.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.17 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.18
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.17	Sat May 29 12:15:32 2021
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile	Thu Jun  3 07:34:29 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2021/05/29 12:15:32 rin Exp $
+#	$NetBSD: Makefile,v 1.18 2021/06/03 07:34:29 rin Exp $
 
 DRIVER=		xf86-input-keyboard
 DRIVER_NAME=	kbd_drv
@@ -16,7 +16,8 @@ CPPFLAGS+=	-DPCVT_SUPPORT
 .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE} == "sparc" || \
 ${MACHINE} == "sparc64" || ${MACHINE} == "sgimips" || \
 ${MACHINE} == "shark" || ${MACHINE} == "vax" || \
-${MACHINE} == "evbarm" || ${MACHINE} == "mac68k"
+${MACHINE} == "evbarm" || ${MACHINE} == "mac68k" || \
+${MACHINE} == "amiga"
 CPPFLAGS+=	-DDEFAULT_TO_WSKBD
 .endif
 

CVS commit: src/external/mit/xorg/server/drivers

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon May 31 21:45:41 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-video-amdgpu: Makefile

Log Message:
Stop using -fcommon, xsrc should be fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-amdgpu/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/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.27 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.28
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.27	Mon Apr 12 03:57:06 2021
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver	Mon May 31 21:45:41 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.xf86-driver,v 1.27 2021/04/12 03:57:06 mrg Exp $
+#	$NetBSD: Makefile.xf86-driver,v 1.28 2021/05/31 21:45:41 joerg Exp $
 
 LIBISMODULE=	yes
 SHLIB_MAJOR=	${PACKAGE_MAJOR}
@@ -49,9 +49,6 @@ CPPFLAGS+=	-DPACKAGE_VERSION_MINOR=${PAC
 CPPFLAGS+=	-DPACKAGE_VERSION_PATCHLEVEL=${PACKAGE_PATCH}
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
-# IOPortBase is particularly annoying to fix
-COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
-
 .PATH:	${X11SRCDIR.${DRIVER}}/src
 .PATH:	${X11SRCDIR.${DRIVER}}/man
 .PATH:	${X11SRCDIR.${DRIVER}}

Index: src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.2	Sun May 30 22:24:35 2021
+++ src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile	Mon May 31 21:45:41 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2021/05/30 22:24:35 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2021/05/31 21:45:41 joerg Exp $
 
 .include 
 
@@ -26,6 +26,5 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 
 
 # XXX
 COPTS+=		-Wno-error
-COPTS+=		-fcommon
 
 .include "../Makefile.xf86-driver"

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-geode

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon May 31 00:04:15 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-geode: Makefile

Log Message:
Use -fcommon


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-geode/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/mit/xorg/server/drivers/xf86-video-geode/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.6	Tue Jan  1 00:37:06 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile	Mon May 31 00:04:15 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2019/01/01 00:37:06 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2021/05/31 00:04:15 joerg Exp $
 
 DRIVER=		xf86-video-geode
 DRIVER_NAME=	geode_drv
@@ -54,6 +54,8 @@ COPTS.lx_panel.c+=	-Wno-error	# XXX
 
 CWARNFLAGS.clang+=	-Wno-empty-body
 
+COPTS+=		-fcommon
+
 .include "../Makefile.xf86-driver"
 
 XORG_PKG_VER_PROG=	${DRIVER}

CVS commit: src/external/mit/xorg/server/drivers

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun May 30 22:24:36 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-amdgpu: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
Various X drivers still need -fcommon, so add it.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile
cvs rdiff -u -r1.33 -r1.34 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.1	Thu Aug 18 07:49:09 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile	Sun May 30 22:24:35 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2016/08/18 07:49:09 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 22:24:35 joerg Exp $
 
 .include 
 
@@ -25,6 +25,7 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 
 		-I${X11SRCDIR.${DRIVER}}/../include
 
 # XXX
-COPTS+=	-Wno-error
+COPTS+=		-Wno-error
+COPTS+=		-fcommon
 
 .include "../Makefile.xf86-driver"

Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.33 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.34
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.33	Mon Sep  7 00:24:37 2020
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile	Sun May 30 22:24:35 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.33 2020/09/07 00:24:37 mrg Exp $
+#	$NetBSD: Makefile,v 1.34 2021/05/30 22:24:35 joerg Exp $
 
 .include 
 
@@ -218,6 +218,8 @@ SRCS+=		i810_xaa.c
 CWARNFLAGS.clang+=	-Wno-parentheses -Wno-tautological-compare \
 			-Wno-empty-body -Wno-error
 
+COPTS+=	-fcommon
+
 COPTS.sna_display.c+=	-Wno-stack-protector
 COPTS.sna_threads.c+=	-Wno-stack-protector
 COPTS.sna_trapezoids.c+=	-Wno-stack-protector

Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.16 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.17
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.16	Tue Jan  1 00:37:06 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile	Sun May 30 22:24:36 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2019/01/01 00:37:06 mrg Exp $
+#	$NetBSD: Makefile,v 1.17 2021/05/30 22:24:36 joerg Exp $
 
 DRIVER=		xf86-video-openchrome
 DRIVER_NAME=	openchrome_drv
@@ -43,6 +43,8 @@ CPPFLAGS+=	-I${X11SRCDIR.${DRIVER}}/src
 CPPFLAGS+=	-DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
 CPPFLAGS+=	-DHAVE_XF86_CURSOR_RESET_CURSOR
 
+COPTS+=	-fcommon
+
 .include "../Makefile.xf86-driver"
 
 # XXX

Index: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.12	Sun Feb  9 12:28:28 2020
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile	Sun May 30 22:24:36 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2020/02/09 12:28:28 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.13 2021/05/30 22:24:36 joerg Exp $
 
 .include 
 
@@ -61,4 +61,6 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 
 
 LIBDPLIBS+=	gbm ${.CURDIR}/../../../lib/libgbm${OLD_PREFIX}
 
+COPTS+=		-fcommon
+
 .include "../Makefile.xf86-driver"

CVS commit: src/external/bsd/tcpdump/dist

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sun May 30 21:48:42 UTC 2021

Modified Files:
src/external/bsd/tcpdump/dist: print-icmp6.c

Log Message:
Minimal change to suppress unaligned access errors on NetBSD/alpha; add
the UNALIGNED decoration to icmp6 related structures.

PR bin/56199.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/tcpdump/dist/print-icmp6.c

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

Modified files:

Index: src/external/bsd/tcpdump/dist/print-icmp6.c
diff -u src/external/bsd/tcpdump/dist/print-icmp6.c:1.13 src/external/bsd/tcpdump/dist/print-icmp6.c:1.14
--- src/external/bsd/tcpdump/dist/print-icmp6.c:1.13	Mon Feb 24 18:39:47 2020
+++ src/external/bsd/tcpdump/dist/print-icmp6.c	Sun May 30 21:48:42 2021
@@ -21,7 +21,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: print-icmp6.c,v 1.13 2020/02/24 18:39:47 kamil Exp $");
+__RCSID("$NetBSD: print-icmp6.c,v 1.14 2021/05/30 21:48:42 thorpej Exp $");
 #endif
 
 /* \summary: IPv6 Internet Control Message Protocol (ICMPv6) printer */
@@ -91,7 +91,7 @@ struct icmp6_hdr {
 		uint16_t	icmp6_un_data16[2]; /* type-specific field */
 		uint8_t		icmp6_un_data8[4];  /* type-specific field */
 	} icmp6_dataun;
-};
+} UNALIGNED;
 
 #define icmp6_data32	icmp6_dataun.icmp6_un_data32
 #define icmp6_data16	icmp6_dataun.icmp6_un_data16
@@ -183,7 +183,7 @@ struct icmp6_hdr {
 struct mld6_hdr {
 	struct icmp6_hdr	mld6_hdr;
 	struct in6_addr		mld6_addr; /* multicast address */
-};
+} UNALIGNED;
 
 #define mld6_type	mld6_hdr.icmp6_type
 #define mld6_code	mld6_hdr.icmp6_code
@@ -201,7 +201,7 @@ struct mld6_hdr {
 struct nd_router_solicit {	/* router solicitation */
 	struct icmp6_hdr 	nd_rs_hdr;
 	/* could be followed by options */
-};
+} UNALIGNED;
 
 #define nd_rs_type	nd_rs_hdr.icmp6_type
 #define nd_rs_code	nd_rs_hdr.icmp6_code
@@ -213,7 +213,7 @@ struct nd_router_advert {	/* router adve
 	uint32_t		nd_ra_reachable;	/* reachable time */
 	uint32_t		nd_ra_retransmit;	/* retransmit timer */
 	/* could be followed by options */
-};
+} UNALIGNED;
 
 #define nd_ra_type		nd_ra_hdr.icmp6_type
 #define nd_ra_code		nd_ra_hdr.icmp6_code
@@ -241,7 +241,7 @@ struct nd_neighbor_solicit {	/* neighbor
 	struct icmp6_hdr	nd_ns_hdr;
 	struct in6_addr		nd_ns_target;	/*target address */
 	/* could be followed by options */
-};
+} UNALIGNED;
 
 #define nd_ns_type		nd_ns_hdr.icmp6_type
 #define nd_ns_code		nd_ns_hdr.icmp6_code
@@ -252,7 +252,7 @@ struct nd_neighbor_advert {	/* neighbor 
 	struct icmp6_hdr	nd_na_hdr;
 	struct in6_addr		nd_na_target;	/* target address */
 	/* could be followed by options */
-};
+} UNALIGNED;
 
 #define nd_na_type		nd_na_hdr.icmp6_type
 #define nd_na_code		nd_na_hdr.icmp6_code
@@ -268,7 +268,7 @@ struct nd_redirect {		/* redirect */
 	struct in6_addr		nd_rd_target;	/* target address */
 	struct in6_addr		nd_rd_dst;	/* destination address */
 	/* could be followed by options */
-};
+} UNALIGNED;
 
 #define nd_rd_type		nd_rd_hdr.icmp6_type
 #define nd_rd_code		nd_rd_hdr.icmp6_code
@@ -301,7 +301,7 @@ struct nd_opt_prefix_info {	/* prefix in
 	nd_uint32_t		nd_opt_pi_preferred_time;
 	nd_uint32_t		nd_opt_pi_reserved2;
 	struct in6_addr	nd_opt_pi_prefix;
-};
+} UNALIGNED;
 
 #define ND_OPT_PI_FLAG_ONLINK		0x80
 #define ND_OPT_PI_FLAG_AUTO		0x40
@@ -313,14 +313,14 @@ struct nd_opt_rd_hdr { /* redire
 	uint16_t	nd_opt_rh_reserved1;
 	uint32_t	nd_opt_rh_reserved2;
 	/* followed by IP header and data */
-};
+} UNALIGNED;
 
 struct nd_opt_mtu {		/* MTU option */
 	uint8_t		nd_opt_mtu_type;
 	uint8_t		nd_opt_mtu_len;
 	uint16_t	nd_opt_mtu_reserved;
 	uint32_t	nd_opt_mtu_mtu;
-};
+} UNALIGNED;
 
 struct nd_opt_rdnss {		/* RDNSS RFC 6106 5.1 */
 	uint8_t		nd_opt_rdnss_type;
@@ -328,7 +328,7 @@ struct nd_opt_rdnss {		/* RDNSS RFC 6106
 	uint16_t	nd_opt_rdnss_reserved;
 	uint32_t	nd_opt_rdnss_lifetime;
 	struct in6_addr nd_opt_rdnss_addr[1];	/* variable-length */
-};
+} UNALIGNED;
 
 struct nd_opt_dnssl {		/* DNSSL RFC 6106 5.2 */
 	uint8_t  nd_opt_dnssl_type;
@@ -336,14 +336,14 @@ struct nd_opt_dnssl {		/* DNSSL RFC 6106
 	uint16_t nd_opt_dnssl_reserved;
 	uint32_t nd_opt_dnssl_lifetime;
 	/* followed by list of DNS search domains, variable-length */
-};
+} UNALIGNED;
 
 struct nd_opt_advinterval {	/* Advertisement interval option */
 	uint8_t		nd_opt_adv_type;
 	uint8_t		nd_opt_adv_len;
 	uint16_t	nd_opt_adv_reserved;
 	uint32_t	nd_opt_adv_interval;
-};
+} UNALIGNED;
 
 struct nd_opt_homeagent_info {	/* Home Agent info */
 	uint8_t		nd_opt_hai_type;
@@ -351,7 +351,7 @@ struct nd_opt_homeagent_info {	/* Home A
 	uint16_t	nd_opt_hai_reserved;
 	int16_t		nd_opt_hai_preference;
 	uint16_t	nd_opt_hai_lifetime;
-};
+} UNALIGNED;
 
 struct nd_opt_route_info {	/* route info */
 	uint8_t		nd_opt_rti_type;
@@ -360,7 +360,7 @@ struct nd_opt_route_info {	/* route info
 	uint8_t		nd_opt_rti_flags;
 	uint32_t	nd_opt_rti_lifetime;
 	/* prefix 

CVS commit: src/external/bsd/tcpdump/dist

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sun May 30 21:01:43 UTC 2021

Modified Files:
src/external/bsd/tcpdump/dist: print-icmp.c

Log Message:
Minimal change to suppress unaligned access errors on NetBSD/alpha; add
the UNALIGNED decoration to struct icmp.

PR bin/56199.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/tcpdump/dist/print-icmp.c

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

Modified files:

Index: src/external/bsd/tcpdump/dist/print-icmp.c
diff -u src/external/bsd/tcpdump/dist/print-icmp.c:1.11 src/external/bsd/tcpdump/dist/print-icmp.c:1.12
--- src/external/bsd/tcpdump/dist/print-icmp.c:1.11	Mon Feb 24 18:39:47 2020
+++ src/external/bsd/tcpdump/dist/print-icmp.c	Sun May 30 21:01:43 2021
@@ -21,7 +21,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: print-icmp.c,v 1.11 2020/02/24 18:39:47 kamil Exp $");
+__RCSID("$NetBSD: print-icmp.c,v 1.12 2021/05/30 21:01:43 thorpej Exp $");
 #endif
 
 /* \summary: Internet Control Message Protocol (ICMP) printer */
@@ -89,7 +89,7 @@ struct icmp {
 #define	icmp_ip		icmp_dun.id_ip.idi_ip
 #define	icmp_mask	icmp_dun.id_mask
 #define	icmp_data	icmp_dun.id_data
-};
+} UNALIGNED;
 
 #define ICMP_MPLS_EXT_EXTRACT_VERSION(x) (((x)&0xf0)>>4)
 #define ICMP_MPLS_EXT_VERSION 2

CVS commit: src/external/gpl3/gdb/lib/libgdb

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun May 30 02:23:25 UTC 2021

Modified Files:
src/external/gpl3/gdb/lib/libgdb: Makefile

Log Message:
Always use C++17 string_view, the emulation is just broken.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/gpl3/gdb/lib/libgdb/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/gdb/lib/libgdb/Makefile
diff -u src/external/gpl3/gdb/lib/libgdb/Makefile:1.29 src/external/gpl3/gdb/lib/libgdb/Makefile:1.30
--- src/external/gpl3/gdb/lib/libgdb/Makefile:1.29	Sun Dec  6 04:08:53 2020
+++ src/external/gpl3/gdb/lib/libgdb/Makefile	Sun May 30 02:23:25 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.29 2020/12/06 04:08:53 christos Exp $
+#	$NetBSD: Makefile,v 1.30 2021/05/30 02:23:25 joerg Exp $
 
 NOCTF=
 HOSTPROG_CXX=   1
@@ -47,7 +47,7 @@ CWARNFLAGS.clang+=	-Wno-switch
 CWARNFLAGS.clang+=	-Wno-deprecated
 HOST_CC:=		${HOST_CXX}
 CC:=			${CXX}
-CFLAGS:=		${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
+CFLAGS:=		${CXXFLAGS} -std=gnu++17 -Wno-error=stack-protector
 
 .PATH: ${DIST}/gdb ${DIST}/gdb/arch ${DIST}/gdb/mi ${DIST}/gdb/cli  \
 ${DIST}/gdb/tui ${DIST}/gdb/python ${DIST}/gdb/common ${DIST}/gdb/target \

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-pnozz

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun May 30 02:22:19 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-pnozz: Makefile

Log Message:
Ignore pointer sign cast issues with clang.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-pnozz/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/mit/xorg/server/drivers/xf86-video-pnozz/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.2	Thu May 27 04:53:44 2021
+++ src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile	Sun May 30 02:22:19 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2021/05/27 04:53:44 jdc Exp $
+#	$NetBSD: Makefile,v 1.3 2021/05/30 02:22:19 joerg Exp $
 
 DRIVER=		xf86-video-pnozz
 DRIVER_NAME=	pnozz_drv
@@ -14,3 +14,4 @@ MAN=		pnozz.4
 # XXX
 COPTS.pnozz_accel.c+=	${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
 COPTS.pnozz_accel.c+=	${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
+COPTS.pnozz_cursor.c+=	${${ACTIVE_CC} == "clang":? -Wno-error=pointer-sign :}

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

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun May 30 02:20:09 UTC 2021

Modified Files:
src/external/mit/xorg/lib/libXaw: Makefile Makefile.common

Log Message:
Ignore pointer cast warnings for clang, too. Use -Wno-format more
selectively.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/libXaw/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXaw/Makefile.common

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/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.16 src/external/mit/xorg/lib/libXaw/Makefile:1.17
--- src/external/mit/xorg/lib/libXaw/Makefile:1.16	Mon Apr 26 21:53:53 2021
+++ src/external/mit/xorg/lib/libXaw/Makefile	Sun May 30 02:20:09 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2021/04/26 21:53:53 mrg Exp $
+#	$NetBSD: Makefile,v 1.17 2021/05/30 02:20:09 joerg Exp $
 
 .include 
 
@@ -66,5 +66,3 @@ X11EXTRAMANTRANSFORMS+= \
 
 .include 
 .include 
-
-CWARNFLAGS.clang+=	-Wno-format

Index: src/external/mit/xorg/lib/libXaw/Makefile.common
diff -u src/external/mit/xorg/lib/libXaw/Makefile.common:1.2 src/external/mit/xorg/lib/libXaw/Makefile.common:1.3
--- src/external/mit/xorg/lib/libXaw/Makefile.common:1.2	Tue May  4 17:47:05 2021
+++ src/external/mit/xorg/lib/libXaw/Makefile.common	Sun May 30 02:20:09 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.common,v 1.2 2021/05/04 17:47:05 rillig Exp $
+#	$NetBSD: Makefile.common,v 1.3 2021/05/30 02:20:09 joerg Exp $
 
 CPPFLAGS+=	-DHAVE_WCHAR_H		\
 		-DHAVE_WCTYPE_H		\
@@ -17,5 +17,8 @@ LIBDPLIBS=\
 	Xext	${.CURDIR}/../libXext \
 	X11	${.CURDIR}/../libX11/dynamic
 
+COPTS.Converters.c+=	${${ACTIVE_CC} == "clang":? -Wno-format :}
 COPTS.Pixmap.c+=	${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :}
+COPTS.Pixmap.c+=	${${ACTIVE_CC} == "clang":? -Wno-incompatible-pointer-types-discards-qualifiers :}
 COPTS.TextAction.c+=	${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :}
+COPTS.TextAction.c+=	${${ACTIVE_CC} == "clang":? -Wno-incompatible-pointer-types-discards-qualifiers :}

CVS commit: src/external/bsd/libevent/dist/test

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun May 30 00:19:09 UTC 2021

Modified Files:
src/external/bsd/libevent/dist/test: regress_ssl.c

Log Message:
Cast to enums via uintptr_t to avoid compiler warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libevent/dist/test/regress_ssl.c

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

Modified files:

Index: src/external/bsd/libevent/dist/test/regress_ssl.c
diff -u src/external/bsd/libevent/dist/test/regress_ssl.c:1.5 src/external/bsd/libevent/dist/test/regress_ssl.c:1.6
--- src/external/bsd/libevent/dist/test/regress_ssl.c:1.5	Wed Apr  7 03:36:48 2021
+++ src/external/bsd/libevent/dist/test/regress_ssl.c	Sun May 30 00:19:08 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: regress_ssl.c,v 1.5 2021/04/07 03:36:48 christos Exp $	*/
+/*	$NetBSD: regress_ssl.c,v 1.6 2021/05/30 00:19:08 joerg Exp $	*/
 
 /*
  * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
@@ -891,7 +891,7 @@ regress_bufferevent_openssl_wm(void *arg
 	struct sockaddr_in sin;
 	struct sockaddr_storage ss;
 	enum regress_openssl_type type =
-		(enum regress_openssl_type)data->setup_data;
+		(enum regress_openssl_type)(uintptr_t)data->setup_data;
 	int bev_flags = BEV_OPT_CLOSE_ON_FREE;
 	ev_socklen_t slen;
 	SSL *ssl;

CVS commit: src/external/bsd/libc++/dist/libcxxrt/src

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun May 30 00:12:31 UTC 2021

Modified Files:
src/external/bsd/libc++/dist/libcxxrt/src: exception.cc
libelftc_dem_gnu3.c unwind-itanium.h

Log Message:
Merge 47661d00cd4d6cd728ae31b0bb29a49a6c06272a


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/libc++/dist/libcxxrt/src/exception.cc \
src/external/bsd/libc++/dist/libcxxrt/src/libelftc_dem_gnu3.c \
src/external/bsd/libc++/dist/libcxxrt/src/unwind-itanium.h

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

Modified files:

Index: src/external/bsd/libc++/dist/libcxxrt/src/exception.cc
diff -u src/external/bsd/libc++/dist/libcxxrt/src/exception.cc:1.2 src/external/bsd/libc++/dist/libcxxrt/src/exception.cc:1.3
--- src/external/bsd/libc++/dist/libcxxrt/src/exception.cc:1.2	Fri Jun 26 00:50:39 2015
+++ src/external/bsd/libc++/dist/libcxxrt/src/exception.cc	Sun May 30 00:12:31 2021
@@ -304,13 +304,17 @@ static pthread_key_t eh_key;
 static void exception_cleanup(_Unwind_Reason_Code reason, 
   struct _Unwind_Exception *ex)
 {
-	__cxa_free_exception(static_cast(ex));
+	// Exception layout:
+	// [__cxa_exception [_Unwind_Exception]] [exception object]
+	//
+	// __cxa_free_exception expects a pointer to the exception object
+	__cxa_free_exception(static_cast(ex + 1));
 }
 static void dependent_exception_cleanup(_Unwind_Reason_Code reason, 
   struct _Unwind_Exception *ex)
 {
 
-	__cxa_free_dependent_exception(static_cast(ex));
+	__cxa_free_dependent_exception(static_cast(ex + 1));
 }
 
 /**
@@ -340,7 +344,8 @@ static void thread_cleanup(void* thread_
 		if (info->foreign_exception_state != __cxa_thread_info::none)
 		{
 			_Unwind_Exception *e = reinterpret_cast<_Unwind_Exception*>(info->globals.caughtExceptions);
-			e->exception_cleanup(_URC_FOREIGN_EXCEPTION_CAUGHT, e);
+			if (e->exception_cleanup)
+e->exception_cleanup(_URC_FOREIGN_EXCEPTION_CAUGHT, e);
 		}
 		else
 		{
@@ -516,7 +521,7 @@ static void emergency_malloc_free(char *
 			break;
 		}
 	}
-	assert(buffer > 0 &&
+	assert(buffer >= 0 &&
 	   "Trying to free something that is not an emergency buffer!");
 	// emergency_malloc() is expected to return 0-initialized data.  We don't
 	// zero the buffer when allocating it, because the static buffers will
@@ -556,7 +561,7 @@ static void free_exception(char *e)
 {
 	// If this allocation is within the address range of the emergency buffer,
 	// don't call free() because it was not allocated with malloc()
-	if ((e > emergency_buffer) &&
+	if ((e >= emergency_buffer) &&
 	(e < (emergency_buffer + sizeof(emergency_buffer
 	{
 		emergency_malloc_free(e);
@@ -854,6 +859,13 @@ extern "C" void __cxa_rethrow()
 
 	assert(ex->handlerCount > 0 && "Rethrowing uncaught exception!");
 
+	// `globals->uncaughtExceptions` was decremented by `__cxa_begin_catch`.
+	// It's normally incremented by `throw_exception`, but this path invokes
+	// `_Unwind_Resume_or_Rethrow` directly to rethrow the exception.
+	// This path is only reachable if we're rethrowing a C++ exception -
+	// foreign exceptions don't adjust any of this state.
+	globals->uncaughtExceptions++;
+
 	// ex->handlerCount will be decremented in __cxa_end_catch in enclosing
 	// catch block
 	
@@ -1199,11 +1211,13 @@ extern "C" void *__cxa_begin_catch(void 
 	// we see is a foreign exception then we won't have called it yet.
 	__cxa_thread_info *ti = thread_info();
 	__cxa_eh_globals *globals = >globals;
-	globals->uncaughtExceptions--;
 	_Unwind_Exception *exceptionObject = static_cast<_Unwind_Exception*>(e);
 
 	if (isCXXException(exceptionObject->exception_class))
 	{
+		// Only exceptions thrown with a C++ exception throwing function will
+		// increment this, so don't decrement it here.
+		globals->uncaughtExceptions--;
 		__cxa_exception *ex =  exceptionFromPointer(exceptionObject);
 
 		if (ex->handlerCount == 0)
@@ -1280,12 +1294,13 @@ extern "C" void __cxa_end_catch()
 	
 	if (ti->foreign_exception_state != __cxa_thread_info::none)
 	{
-		globals->caughtExceptions = 0;
 		if (ti->foreign_exception_state != __cxa_thread_info::rethrown)
 		{
 			_Unwind_Exception *e = reinterpret_cast<_Unwind_Exception*>(ti->globals.caughtExceptions);
-			e->exception_cleanup(_URC_FOREIGN_EXCEPTION_CAUGHT, e);
+			if (e->exception_cleanup)
+e->exception_cleanup(_URC_FOREIGN_EXCEPTION_CAUGHT, e);
 		}
+		globals->caughtExceptions = 0;
 		ti->foreign_exception_state = __cxa_thread_info::none;
 		return;
 	}
@@ -1339,6 +1354,14 @@ extern "C" std::type_info *__cxa_current
 }
 
 /**
+ * Cleanup, ensures that `__cxa_end_catch` is called to balance an explicit
+ * `__cxa_begin_catch` call.
+ */
+static void end_catch(char *)
+{
+	__cxa_end_catch();
+}
+/**
  * ABI function, called when an exception specification is violated.
  *
  * This function does not return.
@@ 

CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Sat May 29 12:15:32 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
Make wskbd(4) default for mac68k; no other protocol is available.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.17
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16	Mon Dec 31 11:58:43 2018
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile	Sat May 29 12:15:32 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2018/12/31 11:58:43 mrg Exp $
+#	$NetBSD: Makefile,v 1.17 2021/05/29 12:15:32 rin Exp $
 
 DRIVER=		xf86-input-keyboard
 DRIVER_NAME=	kbd_drv
@@ -16,7 +16,7 @@ CPPFLAGS+=	-DPCVT_SUPPORT
 .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE} == "sparc" || \
 ${MACHINE} == "sparc64" || ${MACHINE} == "sgimips" || \
 ${MACHINE} == "shark" || ${MACHINE} == "vax" || \
-${MACHINE} == "evbarm"
+${MACHINE} == "evbarm" || ${MACHINE} == "mac68k"
 CPPFLAGS+=	-DDEFAULT_TO_WSKBD
 .endif
 

CVS commit: src/external/mit/xorg/server/drivers

[Julian Coleman]

Module Name:src
Committed By:   jdc
Date:   Thu May 27 04:54:21 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
Restore the build of the pnozz driver on sparc, now that it has EXA support.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/external/mit/xorg/server/drivers/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/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.101 src/external/mit/xorg/server/drivers/Makefile:1.102
--- src/external/mit/xorg/server/drivers/Makefile:1.101	Sun Mar  7 10:42:27 2021
+++ src/external/mit/xorg/server/drivers/Makefile	Thu May 27 04:54:21 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.101 2021/03/07 10:42:27 rin Exp $
+#	$NetBSD: Makefile,v 1.102 2021/05/27 04:54:21 jdc Exp $
 
 .include 
 
@@ -335,6 +335,7 @@ SUBDIR+= \
 
 .if ${MACHINE} == "sparc"
 SUBDIR+= \
+	xf86-video-pnozz \
 	xf86-video-suncg14 \
 	xf86-video-suntcx
 

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-pnozz

[Julian Coleman]

Module Name:src
Committed By:   jdc
Date:   Thu May 27 04:53:44 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-pnozz: Makefile

Log Message:
Update the pnozz files list for EXA support.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-pnozz/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/mit/xorg/server/drivers/xf86-video-pnozz/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.1	Wed Aug 26 22:30:46 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile	Thu May 27 04:53:44 2021
@@ -1,12 +1,16 @@
-#	$NetBSD: Makefile,v 1.1 2009/08/26 22:30:46 macallan Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/27 04:53:44 jdc Exp $
 
 DRIVER=		xf86-video-pnozz
 DRIVER_NAME=	pnozz_drv
 
-SRCS=		pnozz_driver.c pnozz_cursor.c pnozz_accel.c
+SRCS=		pnozz_driver.c pnozz_cursor.c pnozz_accel.c pnozz_exa.c
 
 CPPFLAGS+=	${X11FLAGS.DRI}
 
 MAN=		pnozz.4
 
 .include "../Makefile.xf86-driver"
+
+# XXX
+COPTS.pnozz_accel.c+=	${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+COPTS.pnozz_accel.c+=	${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}

CVS commit: src/external/mpl/dhcp/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed May 26 22:52:32 UTC 2021

Modified Files:
src/external/mpl/dhcp/dist/client: dhclient.c
src/external/mpl/dhcp/dist/common: parse.c
src/external/mpl/dhcp/dist/common/tests: option_unittest.c
src/external/mpl/dhcp/dist/relay: dhcrelay.c
src/external/mpl/dhcp/dist/relay/tests: relay_unittests.c
src/external/mpl/dhcp/dist/server: dhcpd.c

Log Message:
merge local changes between dhcp-4.4.2 and dhcp-4.4.2-P1


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/client/dhclient.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/common/parse.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/mpl/dhcp/dist/common/tests/option_unittest.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/dhcp/dist/relay/dhcrelay.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/mpl/dhcp/dist/relay/tests/relay_unittests.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/server/dhcpd.c

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

Modified files:

Index: src/external/mpl/dhcp/dist/client/dhclient.c
diff -u src/external/mpl/dhcp/dist/client/dhclient.c:1.3 src/external/mpl/dhcp/dist/client/dhclient.c:1.4
--- src/external/mpl/dhcp/dist/client/dhclient.c:1.3	Mon Aug  3 17:10:56 2020
+++ src/external/mpl/dhcp/dist/client/dhclient.c	Wed May 26 18:52:31 2021
@@ -1,11 +1,11 @@
-/*	$NetBSD: dhclient.c,v 1.3 2020/08/03 21:10:56 christos Exp $	*/
+/*	$NetBSD: dhclient.c,v 1.4 2021/05/26 22:52:31 christos Exp $	*/
 
 /* dhclient.c
 
DHCP Client. */
 
 /*
- * Copyright (c) 2004-2020 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2021 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
@@ -33,7 +33,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: dhclient.c,v 1.3 2020/08/03 21:10:56 christos Exp $");
+__RCSID("$NetBSD: dhclient.c,v 1.4 2021/05/26 22:52:31 christos Exp $");
 
 #include "dhcpd.h"
 #include 
@@ -84,7 +84,7 @@ int decline_wait_time = 10; /* Default t
 #define ASSERT_STATE(state_is, state_shouldbe) {}
 
 #ifndef UNIT_TEST
-static const char copyright[] = "Copyright 2004-2020 Internet Systems Consortium.";
+static const char copyright[] = "Copyright 2004-2021 Internet Systems Consortium.";
 static const char arr [] = "All rights reserved.";
 static const char message [] = "Internet Systems Consortium DHCP Client";
 static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/;;
@@ -241,7 +241,7 @@ add_interfaces(char **ifaces, int niface
  */
 
 #include 
-__RCSID("$NetBSD: dhclient.c,v 1.3 2020/08/03 21:10:56 christos Exp $");
+__RCSID("$NetBSD: dhclient.c,v 1.4 2021/05/26 22:52:31 christos Exp $");
 
 #if defined(DHCPv6) && defined(DHCP4o6)
 static void dhcp4o6_poll(void *dummy);
@@ -1230,7 +1230,7 @@ int find_subnet (struct subnet **sp,
  */
 
 #include 
-__RCSID("$NetBSD: dhclient.c,v 1.3 2020/08/03 21:10:56 christos Exp $");
+__RCSID("$NetBSD: dhclient.c,v 1.4 2021/05/26 22:52:31 christos Exp $");
 
 void state_reboot (cpp)
 	void *cpp;

Index: src/external/mpl/dhcp/dist/common/parse.c
diff -u src/external/mpl/dhcp/dist/common/parse.c:1.3 src/external/mpl/dhcp/dist/common/parse.c:1.4
--- src/external/mpl/dhcp/dist/common/parse.c:1.3	Mon Aug  3 17:10:56 2020
+++ src/external/mpl/dhcp/dist/common/parse.c	Wed May 26 18:52:31 2021
@@ -1,11 +1,11 @@
-/*	$NetBSD: parse.c,v 1.3 2020/08/03 21:10:56 christos Exp $	*/
+/*	$NetBSD: parse.c,v 1.4 2021/05/26 22:52:31 christos Exp $	*/
 
 /* parse.c
 
Common parser code for dhcpd and dhclient. */
 
 /*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2021 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
@@ -29,7 +29,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: parse.c,v 1.3 2020/08/03 21:10:56 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.4 2021/05/26 22:52:31 christos Exp $");
 
 #include "dhcpd.h"
 #include 
@@ -5561,13 +5561,14 @@ int parse_X (cfile, buf, max)
 skip_to_semi (cfile);
 return 0;
 			}
-			convert_num (cfile,  [len], val, 16, 8);
-			if (len++ > max) {
+			if (len >= max) {
 parse_warn (cfile,
 	"hexadecimal constant too long.");
 skip_to_semi (cfile);
 return 0;
 			}
+			convert_num (cfile,  [len], val, 16, 8);
+			len++;
 			token = peek_token (, (unsigned *)0, cfile);
 			if (token == COLON)
 token = next_token (,

Index: src/external/mpl/dhcp/dist/common/tests/option_unittest.c
diff -u src/external/mpl/dhcp/dist/common/tests/option_unittest.c:1.2 src/external/mpl/dhcp/dist/common/tests/option_unittest.c:1.3
--- src/external/mpl/dhcp/dist/common/tests/option_unittest.c:1.2	Sat Apr  7 18:37:29 

CVS commit: src/external/mpl/dhcp/dist/relay

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri May 21 21:07:37 UTC 2021

Modified Files:
src/external/mpl/dhcp/dist/relay: dhcrelay.c

Log Message:
Add missing call to libdhcp_callbacks_register().  Should stop
dhcrelay() crashing when accessing *libdhcp_callbacks.local_port.
(from mrg@)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/relay/dhcrelay.c

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

Modified files:

Index: src/external/mpl/dhcp/dist/relay/dhcrelay.c
diff -u src/external/mpl/dhcp/dist/relay/dhcrelay.c:1.3 src/external/mpl/dhcp/dist/relay/dhcrelay.c:1.4
--- src/external/mpl/dhcp/dist/relay/dhcrelay.c:1.3	Mon Aug  3 17:10:57 2020
+++ src/external/mpl/dhcp/dist/relay/dhcrelay.c	Fri May 21 17:07:37 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: dhcrelay.c,v 1.3 2020/08/03 21:10:57 christos Exp $	*/
+/*	$NetBSD: dhcrelay.c,v 1.4 2021/05/21 21:07:37 christos Exp $	*/
 
 /* dhcrelay.c
 
@@ -29,7 +29,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: dhcrelay.c,v 1.3 2020/08/03 21:10:57 christos Exp $");
+__RCSID("$NetBSD: dhcrelay.c,v 1.4 2021/05/21 21:07:37 christos Exp $");
 
 #include "dhcpd.h"
 #include 
@@ -264,7 +264,7 @@ char *progname;
  */
 
 #include 
-__RCSID("$NetBSD: dhcrelay.c,v 1.3 2020/08/03 21:10:57 christos Exp $");
+__RCSID("$NetBSD: dhcrelay.c,v 1.4 2021/05/21 21:07:37 christos Exp $");
 static const char use_noarg[] = "No argument for command: %s";
 #ifdef RELAY_PORT
 static const char use_port_defined[] = "Port already set, %s inappropriate";
@@ -317,6 +317,8 @@ main(int argc, char **argv) {
 	int local_family_set = 0;
 #endif
 
+	libdhcp_callbacks_register(_callbacks);
+
 #ifdef OLD_LOG_NAME
 	progname = "dhcrelay";
 #else

CVS commit: src/external/cddl/osnet/dist/common/nvpair

[Juergen Hannken-Illjes]

Module Name:src
Committed By:   hannken
Date:   Fri May 21 17:32:49 UTC 2021

Modified Files:
src/external/cddl/osnet/dist/common/nvpair: nvpair.c

Log Message:
Replace the Solaris style endian check (exactly one of
_LITTLE_ENDIAN or _BIG_ENDIAN is defined) with standard check
"#if BYTE_ORDER == BIG_ENDIAN" like we do it elseware.

Should fix PR 56191 (ZFS tests fail on sparc64)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dist/common/nvpair/nvpair.c

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

Modified files:

Index: src/external/cddl/osnet/dist/common/nvpair/nvpair.c
diff -u src/external/cddl/osnet/dist/common/nvpair/nvpair.c:1.5 src/external/cddl/osnet/dist/common/nvpair/nvpair.c:1.6
--- src/external/cddl/osnet/dist/common/nvpair/nvpair.c:1.5	Mon Mar  2 15:45:33 2020
+++ src/external/cddl/osnet/dist/common/nvpair/nvpair.c	Fri May 21 17:32:49 2021
@@ -2255,11 +2255,11 @@ nvlist_common(nvlist_t *nvl, char *buf, 
 	int err = 0;
 	nvstream_t nvs;
 	int nvl_endian;
-#ifdef	_LITTLE_ENDIAN
-	int host_endian = 1;
-#else
+#if BYTE_ORDER == BIG_ENDIAN
 	int host_endian = 0;
-#endif	/* _LITTLE_ENDIAN */
+#else
+	int host_endian = 1;
+#endif	/* BYTE_ORDER */
 	nvs_header_t *nvh = (void *)buf;
 
 	if (buflen == NULL || nvl == NULL ||

CVS commit: src/external/gpl3

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue May 18 21:34:04 UTC 2021

Modified Files:
src/external/gpl3/gcc.old/dist/libcpp: macro.c
src/external/gpl3/gcc/dist/libcpp: macro.c

Log Message:
restore -iremap functionality which was omitted by a merge botch, and then
remove as unused later.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc.old/dist/libcpp/macro.c
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/dist/libcpp/macro.c

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

Modified files:

Index: src/external/gpl3/gcc.old/dist/libcpp/macro.c
diff -u src/external/gpl3/gcc.old/dist/libcpp/macro.c:1.10 src/external/gpl3/gcc.old/dist/libcpp/macro.c:1.11
--- src/external/gpl3/gcc.old/dist/libcpp/macro.c:1.10	Fri Apr  9 19:14:40 2021
+++ src/external/gpl3/gcc.old/dist/libcpp/macro.c	Tue May 18 17:34:03 2021
@@ -406,6 +406,33 @@ add_cpp_remap_path (const char *arg)
 	++remap_pairs;
 }
 
+static const char *
+cpp_remap_file (const char *arg, char **tmp_name)
+{
+	char *result;
+	size_t i, len;
+
+	for (i = 0; i < remap_pairs; ++i) {
+		len = strlen (remap_src[i]);
+		if (strncmp (remap_src[i], arg, len))
+			continue;
+		if (arg[len] == '\0')
+			return remap_dst[i];
+		if (arg[len] != '/')
+			continue;
+		arg += len;
+		len = strlen (remap_dst[i]);
+		result = (char *) xmalloc (len + strlen (arg) + 1);
+		memcpy(result, remap_dst[i], len);
+		strcpy(result + len, arg);
+		*tmp_name = result;
+
+		return result;
+	}
+
+	return arg;
+}
+
 /* Helper function for builtin_macro.  Returns the text generated by
a builtin macro. */
 const uchar *
@@ -469,6 +496,7 @@ _cpp_builtin_macro_text (cpp_reader *pfi
   {
 	unsigned int len;
 	const char *name;
+	char *tmp_name;
 	uchar *buf;
 	
 	if (node->value.builtin == BT_FILE)
@@ -482,11 +510,14 @@ _cpp_builtin_macro_text (cpp_reader *pfi
 	  }
 	if (pfile->cb.remap_filename)
 	  name = pfile->cb.remap_filename (name);
+	tmp_name = NULL;
+	name = cpp_remap_file (name, _name);
 	len = strlen (name);
 	buf = _cpp_unaligned_alloc (pfile, len * 2 + 3);
 	result = buf;
 	*buf = '"';
 	buf = cpp_quote_string (buf + 1, (const unsigned char *) name, len);
+	free (tmp_name);
 	*buf++ = '"';
 	*buf = '\0';
   }

Index: src/external/gpl3/gcc/dist/libcpp/macro.c
diff -u src/external/gpl3/gcc/dist/libcpp/macro.c:1.13 src/external/gpl3/gcc/dist/libcpp/macro.c:1.14
--- src/external/gpl3/gcc/dist/libcpp/macro.c:1.13	Sat Apr 10 20:02:18 2021
+++ src/external/gpl3/gcc/dist/libcpp/macro.c	Tue May 18 17:34:03 2021
@@ -502,6 +502,33 @@ add_cpp_remap_path (const char *arg)
 	++remap_pairs;
 }
 
+static const char *
+cpp_remap_file (const char *arg, char **tmp_name)
+{
+	char *result;
+	size_t i, len;
+
+	for (i = 0; i < remap_pairs; ++i) {
+		len = strlen (remap_src[i]);
+		if (strncmp (remap_src[i], arg, len))
+			continue;
+		if (arg[len] == '\0')
+			return remap_dst[i];
+		if (arg[len] != '/')
+			continue;
+		arg += len;
+		len = strlen (remap_dst[i]);
+		result = (char *) xmalloc (len + strlen (arg) + 1);
+		memcpy(result, remap_dst[i], len);
+		strcpy(result + len, arg);
+		*tmp_name = result;
+
+		return result;
+	}
+
+	return arg;
+}
+
 /* Helper function for builtin_macro.  Returns the text generated by
a builtin macro. */
 const uchar *
@@ -565,6 +592,7 @@ _cpp_builtin_macro_text (cpp_reader *pfi
   {
 	unsigned int len;
 	const char *name;
+	char *tmp_name;
 	uchar *buf;
 	
 	if (node->value.builtin == BT_FILE)
@@ -578,11 +606,14 @@ _cpp_builtin_macro_text (cpp_reader *pfi
 	  }
 	if (pfile->cb.remap_filename)
 	  name = pfile->cb.remap_filename (name);
+	tmp_name = NULL;
+	name = cpp_remap_file (name, _name);
 	len = strlen (name);
 	buf = _cpp_unaligned_alloc (pfile, len * 2 + 3);
 	result = buf;
 	*buf = '"';
 	buf = cpp_quote_string (buf + 1, (const unsigned char *) name, len);
+	free (tmp_name);
 	*buf++ = '"';
 	*buf = '\0';
   }

CVS commit: src/external/bsd/nvi/dist/regex

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Mon May 17 04:01:58 UTC 2021

Modified Files:
src/external/bsd/nvi/dist/regex: regcomp.c

Log Message:
Fix search for collating symbols in form of [[.foo.]], as in a similar
manner as already done for POSIX character classes by upstream:

https://github.com/visrc/nvi/commit/fd5795cc9890581b9783a0ff96e0b44d6b38e26a#diff-42d58222b328681b9923634991312932089876a0242f78cf488157aa24969c1a

(We already have this change since initial import to external/bsd/nvi.)

Found by tnozaki. Thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/nvi/dist/regex/regcomp.c

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

Modified files:

Index: src/external/bsd/nvi/dist/regex/regcomp.c
diff -u src/external/bsd/nvi/dist/regex/regcomp.c:1.7 src/external/bsd/nvi/dist/regex/regcomp.c:1.8
--- src/external/bsd/nvi/dist/regex/regcomp.c:1.7	Sun Nov 12 16:33:31 2017
+++ src/external/bsd/nvi/dist/regex/regcomp.c	Mon May 17 04:01:57 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: regcomp.c,v 1.7 2017/11/12 16:33:31 christos Exp $ */
+/*	$NetBSD: regcomp.c,v 1.8 2021/05/17 04:01:57 rin Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994 Henry Spencer.
  * Copyright (c) 1992, 1993, 1994
@@ -44,7 +44,7 @@
 static char sccsid[] = "@(#)regcomp.c	8.4 (Berkeley) 3/19/94";
 #endif /* LIBC_SCCS and not lint */
 #else
-__RCSID("$NetBSD: regcomp.c,v 1.7 2017/11/12 16:33:31 christos Exp $");
+__RCSID("$NetBSD: regcomp.c,v 1.8 2021/05/17 04:01:57 rin Exp $");
 #endif
 
 #include 
@@ -934,7 +934,7 @@ p_b_coll_elem(struct parse *p, int endc)
 	}
 	len = p->next - sp;
 	for (cp = cnames; cp->name != NULL; cp++)
-		if (STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
+		if (STRLEN(cp->name) == len && !MEMCMP(cp->name, sp, len))
 			return(cp->code);	/* known name */
 	if (len == 1)
 		return(*sp);	/* single character */

CVS commit: src/external/bsd/wpa/dist/src/common

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat May 15 19:19:55 UTC 2021

Modified Files:
src/external/bsd/wpa/dist/src/common: dpp.c

Log Message:
wpa: fix Clang build

src/external/bsd/wpa/bin/hostapd/../../dist/src/common/dpp.c:5377:7:
error: format specifies type 'unsigned long' but the argument has type
'os_time_t' (aka 'long long') [-Werror,-Wformat]


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/wpa/dist/src/common/dpp.c

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

Modified files:

Index: src/external/bsd/wpa/dist/src/common/dpp.c
diff -u src/external/bsd/wpa/dist/src/common/dpp.c:1.1.1.2 src/external/bsd/wpa/dist/src/common/dpp.c:1.2
--- src/external/bsd/wpa/dist/src/common/dpp.c:1.1.1.2	Mon Mar  1 01:37:55 2021
+++ src/external/bsd/wpa/dist/src/common/dpp.c	Sat May 15 19:19:55 2021
@@ -5373,8 +5373,9 @@ int dpp_key_expired(const char *timestam
 	}
 
 	if (now.sec > utime) {
-		wpa_printf(MSG_DEBUG, "DPP: Key has expired (%lu < %lu)",
-			   utime, now.sec);
+		wpa_printf(MSG_DEBUG, "DPP: Key has expired (%llu < %llu)",
+			   (unsigned long long)utime,
+			   (unsigned long long)now.sec);
 		return 1;
 	}
 

CVS commit: src/external/cddl/osnet/dist/lib/libzfs/common

[Nia Alarie]

Module Name:src
Committed By:   nia
Date:   Thu May 13 09:05:19 UTC 2021

Modified Files:
src/external/cddl/osnet/dist/lib/libzfs/common: libzfs_dataset.c

Log Message:
this is not FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c

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

Modified files:

Index: src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c
diff -u src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c:1.4 src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c:1.5
--- src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c:1.4	Mon May 28 21:05:06 2018
+++ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c	Thu May 13 09:05:19 2021
@@ -1135,7 +1135,7 @@ badlabel:
 			m_label_free(new_sl);	/* OK if null */
 #else	/* !illumos */
 			zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
-			"mlslabel is not supported on FreeBSD"));
+			"mlslabel is not supported on NetBSD"));
 			(void) zfs_error(hdl, EZFS_BADPROP, errbuf);
 #endif	/* illumos */
 			goto error;
@@ -1644,7 +1644,7 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvl
 		case ZFS_PROP_NBMAND:
 		case ZFS_PROP_MLSLABEL:
 			(void) snprintf(errbuf, sizeof (errbuf),
-			"property '%s' not supported on FreeBSD",
+			"property '%s' not supported on NetBSD",
 			nvpair_name(elem));
 			ret = zfs_error(hdl, EZFS_PERM, errbuf);
 			goto error;

CVS commit: src/external/cddl/osnet/dist/cmd/zfs

[Nia Alarie]

Module Name:src
Committed By:   nia
Date:   Thu May 13 09:03:35 UTC 2021

Modified Files:
src/external/cddl/osnet/dist/cmd/zfs: zfs_main.c

Log Message:
zfs: this is not FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c

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

Modified files:

Index: src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c
diff -u src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.7 src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.8
--- src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.7	Sun Sep 15 19:38:09 2019
+++ src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c	Thu May 13 09:03:35 2021
@@ -6130,7 +6130,7 @@ share_mount(int op, int argc, char **arg
 			break;
 
 		case 'O':
-			warnx("no overlay mounts support on FreeBSD, ignoring");
+			warnx("no overlay mounts support on NetBSD, ignoring");
 			break;
 		case ':':
 			(void) fprintf(stderr, gettext("missing argument for "

CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Tue May 11 01:47:21 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist/gcc/config/rs6000: rs6000.c

Log Message:
Cherry-pick upstream fix for GCC10 regression to -misel option.

Assembler codes generated by GCC are identical with that of our local
fix in rev 1.26 for 32-bit processors, and no significant changes for
64-bit processors also.

master: https://gcc.gnu.org/g:6156df483fa50a08f561b6c248819f2992aa380d
gcc-10: https://gcc.gnu.org/g:5f665c1ca452673e9812cd92b07bd31441c0ac5b
(diffs are same)

commit r12-9-g6156df483fa50a08f561b6c248819f2992aa380d
Author: Segher Boessenkool 
Date:   Tue Apr 20 12:00:50 2021 +

rs6000: Fix cpu selection w/ isel (PR100108)

There are various non-IBM CPUs with isel as well, so it is easiest if we
just don't consider that flag here (it is not needed).

2021-04-20  Segher Boessenkool  

PR target/100108
* config/rs6000/rs6000.c (rs6000_machine_from_flags): Do not 
consider
OPTION_MASK_ISEL.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.28 src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.29
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.28	Tue May 11 01:39:09 2021
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c	Tue May 11 01:47:20 2021
@@ -5550,7 +5550,7 @@ rs6000_machine_from_flags (void)
   HOST_WIDE_INT flags = rs6000_isa_flags;
 
   /* Disable the flags that should never influence the .machine selection.  */
-  flags &= ~(OPTION_MASK_PPC_GFXOPT | OPTION_MASK_PPC_GPOPT);
+  flags &= ~(OPTION_MASK_PPC_GFXOPT | OPTION_MASK_PPC_GPOPT | OPTION_MASK_ISEL);
 
   if ((flags & (ISA_3_1_MASKS_SERVER & ~ISA_3_0_MASKS_SERVER)) != 0)
 return "power10";

CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Tue May 11 01:39:09 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist/gcc/config/rs6000: rs6000.c

Log Message:
In preparation to import upstream fix, revert our local fix in rev 1.26:

http://cvsweb.netbsd.org/bsdweb.cgi/src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c#rev1.26

> Fix regression introduced to GCC10, where it wrongly recognizes 32-bit
> processors as POWER9 if -misel flag is specified.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.27 src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.28
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.27	Fri Apr 16 02:33:28 2021
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c	Tue May 11 01:39:09 2021
@@ -5552,8 +5552,6 @@ rs6000_machine_from_flags (void)
   /* Disable the flags that should never influence the .machine selection.  */
   flags &= ~(OPTION_MASK_PPC_GFXOPT | OPTION_MASK_PPC_GPOPT);
 
-  if ((flags & OPTION_MASK_POWERPC64) == 0)
-return "ppc";
   if ((flags & (ISA_3_1_MASKS_SERVER & ~ISA_3_0_MASKS_SERVER)) != 0)
 return "power10";
   if ((flags & (ISA_3_0_MASKS_SERVER & ~ISA_2_7_MASKS_SERVER)) != 0)
@@ -5568,7 +5566,9 @@ rs6000_machine_from_flags (void)
 return "power5";
   if ((flags & ISA_2_1_MASKS) != 0)
 return "power4";
-  return "ppc64";
+  if ((flags & OPTION_MASK_POWERPC64) != 0)
+return "ppc64";
+  return "ppc";
 }
 
 void

CVS commit: src/external/gpl3/gdb/dist/gnulib/import

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat May  8 12:23:47 UTC 2021

Modified Files:
src/external/gpl3/gdb/dist/gnulib/import: canonicalize-lgpl.c

Log Message:
PR/56153: Rin Okuyama: alpha miscompiles malloca() macro.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gdb/dist/gnulib/import/canonicalize-lgpl.c

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

Modified files:

Index: src/external/gpl3/gdb/dist/gnulib/import/canonicalize-lgpl.c
diff -u src/external/gpl3/gdb/dist/gnulib/import/canonicalize-lgpl.c:1.1.1.1 src/external/gpl3/gdb/dist/gnulib/import/canonicalize-lgpl.c:1.2
--- src/external/gpl3/gdb/dist/gnulib/import/canonicalize-lgpl.c:1.1.1.1	Mon Sep 14 21:43:50 2020
+++ src/external/gpl3/gdb/dist/gnulib/import/canonicalize-lgpl.c	Sat May  8 08:23:47 2021
@@ -114,6 +114,13 @@ alloc_failed (void)
holds the same value as the value returned.  */
 
 char *
+#ifdef __alpha__
+/*
+ * toolchain/56153
+ * GCC 10 and 9 miscompile malloca() macro for alpha.
+ */
+__attribute__((optimize("O0")))
+#endif
 __realpath (const char *name, char *resolved)
 {
   char *rpath, *dest, *extra_buf = NULL;

CVS commit: src/external/gpl3/gdb.old/lib/libgdb

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri May  7 12:19:48 UTC 2021

Modified Files:
src/external/gpl3/gdb.old/lib/libgdb: Makefile

Log Message:
For GCC10, add -Wno-unused-result for alloca(0) here and there.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gdb.old/lib/libgdb/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/gdb.old/lib/libgdb/Makefile
diff -u src/external/gpl3/gdb.old/lib/libgdb/Makefile:1.11 src/external/gpl3/gdb.old/lib/libgdb/Makefile:1.12
--- src/external/gpl3/gdb.old/lib/libgdb/Makefile:1.11	Thu Oct  8 08:31:37 2020
+++ src/external/gpl3/gdb.old/lib/libgdb/Makefile	Fri May  7 12:19:48 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2020/10/08 08:31:37 rin Exp $
+#	$NetBSD: Makefile,v 1.12 2021/05/07 12:19:48 rin Exp $
 
 NOCTF=
 HOSTPROG_CXX=   1
@@ -79,3 +79,6 @@ CLEANDIRFILES+= \
 
 # corelow.c
 CWARNFLAGS.gcc+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-error=alloca-larger-than= :}
+
+# for alloca(0)
+CWARNFLAGS.gcc+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-unused-result :}

CVS commit: src/external/bsd/tmux/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri May  7 11:11:11 UTC 2021

Modified Files:
src/external/bsd/tmux/dist: mode-tree.c

Log Message:
Don't free things twice (Kengo Nakahara)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tmux/dist/mode-tree.c

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

Modified files:

Index: src/external/bsd/tmux/dist/mode-tree.c
diff -u src/external/bsd/tmux/dist/mode-tree.c:1.7 src/external/bsd/tmux/dist/mode-tree.c:1.8
--- src/external/bsd/tmux/dist/mode-tree.c:1.7	Sat Apr 17 16:42:09 2021
+++ src/external/bsd/tmux/dist/mode-tree.c	Fri May  7 07:11:11 2021
@@ -139,7 +139,7 @@ mode_tree_free_item(struct mode_tree_ite
 	mode_tree_free_items(>children);
 
 	free(__UNCONST(mti->name));
-	free(__UNCONST(mti->name));
+	free(__UNCONST(mti->text));
 	free(__UNCONST(mti->keystr));
 
 	free(mti);

CVS commit: src/external/gpl3/gdb.old/lib/libbfd

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu May  6 06:52:19 UTC 2021

Modified Files:
src/external/gpl3/gdb.old/lib/libbfd: Makefile

Log Message:
avoid GCC-10 warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gdb.old/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/gdb.old/lib/libbfd/Makefile
diff -u src/external/gpl3/gdb.old/lib/libbfd/Makefile:1.9 src/external/gpl3/gdb.old/lib/libbfd/Makefile:1.10
--- src/external/gpl3/gdb.old/lib/libbfd/Makefile:1.9	Fri Oct  9 23:55:48 2020
+++ src/external/gpl3/gdb.old/lib/libbfd/Makefile	Thu May  6 06:52:18 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2020/10/09 23:55:48 rin Exp $
+#	$NetBSD: Makefile,v 1.10 2021/05/06 06:52:18 mrg Exp $
 
 .include 
 .include "../Makefile.inc"
@@ -30,6 +30,7 @@ CLEANFILES+=	elf32-target.h elf64-target
 .include 
 
 COPTS+= -Wno-stack-protector
+COPTS+= -Wno-overflow
 
 ${OBJS} ${SOBJS}: elf32-target.h elf64-target.h
 targets.o targets.pico: targmatch.h Makefile

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

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Tue May  4 17:47:05 UTC 2021

Modified Files:
src/external/mit/xorg/lib/libXaw: Makefile.common

Log Message:
libXaw: fix Clang build

--- Pixmap.pico ---
error: unknown warning option '-Wno-discarded-qualifiers'; did you mean
'-Wno-ignored-qualifiers'? [-Werror,-Wunknown-warning-option]


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libXaw/Makefile.common

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/libXaw/Makefile.common
diff -u src/external/mit/xorg/lib/libXaw/Makefile.common:1.1 src/external/mit/xorg/lib/libXaw/Makefile.common:1.2
--- src/external/mit/xorg/lib/libXaw/Makefile.common:1.1	Mon Apr 26 21:53:53 2021
+++ src/external/mit/xorg/lib/libXaw/Makefile.common	Tue May  4 17:47:05 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.common,v 1.1 2021/04/26 21:53:53 mrg Exp $
+#	$NetBSD: Makefile.common,v 1.2 2021/05/04 17:47:05 rillig Exp $
 
 CPPFLAGS+=	-DHAVE_WCHAR_H		\
 		-DHAVE_WCTYPE_H		\
@@ -17,5 +17,5 @@ LIBDPLIBS=\
 	Xext	${.CURDIR}/../libXext \
 	X11	${.CURDIR}/../libX11/dynamic
 
-COPTS.Pixmap.c+=	-Wno-discarded-qualifiers
-COPTS.TextAction.c+=	-Wno-discarded-qualifiers
+COPTS.Pixmap.c+=	${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :}
+COPTS.TextAction.c+=	${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :}

CVS commit: src/external/bsd/compiler_rt/lib/clang/lib/netbsd

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Tue May  4 17:23:54 UTC 2021

Modified Files:
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64: Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64:
Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64: Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64:
Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64: Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64:
Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64:
Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64:
Makefile

src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64:
Makefile

Log Message:
compiler_rt: build .a.syms files as part of dependall

The previous target 'all' is a top-level target intended to be specified
by the user.  During the regular build, 'dependall' is used instead of
'all'.  The target 'realall' is common to those two.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile
cvs rdiff -u -r1.5 -r1.6 \

src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile
cvs rdiff -u -r1.5 -r1.6 \

src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile

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

Modified files:

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.5 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.6
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.5	Fri Apr 30 22:48:37 2021
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile	Tue May  4 17:23:53 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2021/04/30 22:48:37 rillig Exp $
+#	$NetBSD: Makefile,v 1.6 2021/05/04 17:23:53 rillig Exp $
 
 NOSANITIZER=# defined
 
@@ -57,7 +57,7 @@ COPTS+=		-fPIC
 SYMS=		libclang_rt.asan-x86_64.a.syms
 SYMS_EXTRA=	${TOPDIR}/lib/asan/asan.syms.extra
 
-all:		${SYMS}
+realall:	${SYMS}
 
 CLEANFILES+=	${SYMS}
 FILES=		${SYMS}

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.5 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.6
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.5	Fri Apr 30 22:48:37 2021
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile	Tue May  4 17:23:53 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2021/04/30 22:48:37 rillig Exp $
+#	$NetBSD: Makefile,v 1.6 2021/05/04 17:23:53 rillig Exp $
 
 NOSANITIZER=# defined
 
@@ -40,7 +40,7 @@ COPTS+=		-fPIC
 SYMS=		libclang_rt.asan_cxx-x86_64.a.syms
 SYMS_EXTRA=	${TOPDIR}/lib/asan/asan.syms.extra # Overlooked in upstream compiler-rt (8.0) ?
 
-all:		${SYMS}
+realall:	${SYMS}
 
 CLEANFILES+=	${SYMS}
 FILES=		${SYMS}

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.5 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.6
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.5	Fri Apr 30 22:48:37 2021
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile	Tue May  4 17:23:54 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2021/04/30 22:48:37 rillig Exp $
+#	$NetBSD: Makefile,v 1.6 2021/05/04 17:23:54 rillig Exp $
 
 NOSANITIZER=# defined
 
@@ -52,7 +52,7 @@ COPTS+=		-fPIC
 SYMS=		libclang_rt.msan-x86_64.a.syms
 SYMS_EXTRA=	${TOPDIR}/lib/msan/msan.syms.extra
 
-all:		${SYMS}
+realall:	${SYMS}
 
 CLEANFILES+=	${SYMS}
 FILES=		${SYMS}

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile:1.5 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile:1.6
--- 

CVS commit: src/external/mpl/bind/dist/lib/isc/include/isc

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Tue May  4 13:40:35 UTC 2021

Modified Files:
src/external/mpl/bind/dist/lib/isc/include/isc: radix.h

Log Message:
bind: remove unnecessary CONSTCOND

Lint does not need this anymore, since 2021-01-31.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mpl/bind/dist/lib/isc/include/isc/radix.h

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

Modified files:

Index: src/external/mpl/bind/dist/lib/isc/include/isc/radix.h
diff -u src/external/mpl/bind/dist/lib/isc/include/isc/radix.h:1.6 src/external/mpl/bind/dist/lib/isc/include/isc/radix.h:1.7
--- src/external/mpl/bind/dist/lib/isc/include/isc/radix.h:1.6	Mon Apr  5 11:29:49 2021
+++ src/external/mpl/bind/dist/lib/isc/include/isc/radix.h	Tue May  4 13:40:34 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radix.h,v 1.6 2021/04/05 11:29:49 rillig Exp $	*/
+/*	$NetBSD: radix.h,v 1.7 2021/05/04 13:40:34 rillig Exp $	*/
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -219,6 +219,6 @@ isc_radix_process(isc_radix_tree_t *radi
 	}\
 	}\
 	}\
-	while (/*CONSTCOND*/0)
+	while (0)
 
 #endif /* _RADIX_H */

CVS commit: src/external/mpl/bind/include/isc

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Tue May  4 13:16:06 UTC 2021

Modified Files:
src/external/mpl/bind/include/isc: stdatomic.h

Log Message:
bind: fix Clang build

I had already fixed this on 2021-03-27, but the fix was accidentally
reverted on 2021-04-29 when updating to bind 9.16.15.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/include/isc/stdatomic.h

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

Modified files:

Index: src/external/mpl/bind/include/isc/stdatomic.h
diff -u src/external/mpl/bind/include/isc/stdatomic.h:1.6 src/external/mpl/bind/include/isc/stdatomic.h:1.7
--- src/external/mpl/bind/include/isc/stdatomic.h:1.6	Thu Apr 29 17:26:14 2021
+++ src/external/mpl/bind/include/isc/stdatomic.h	Tue May  4 13:16:06 2021
@@ -142,7 +142,7 @@ typedef uintmax_t	   atomic_uintmax_t;
 	__c11_atomic_compare_exchange_weak_explicit(obj, expected, desired, \
 		succ, fail)
 #define atomic_exchange_explicit(obj, desired, order) \
-	__c11_atomic_exchange_explicit(obj, expected, order)
+	__c11_atomic_exchange_explicit(obj, desired, order)
 #elif defined(__GNUC_ATOMICS) /* __atomic builtins */
 #define atomic_init(obj, desired)	 (*obj = desired)
 #define atomic_load_explicit(obj, order) __atomic_load_n(obj, order)

CVS commit: src/external/mit/xorg/server/xorg-server.old

[Takeshi Nakayama]

Module Name:src
Committed By:   nakayama
Date:   Mon May  3 08:44:05 UTC 2021

Modified Files:
src/external/mit/xorg/server/xorg-server.old: Makefile.serverlib
Makefile.servermod

Log Message:
Remove duplicate lines.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib \
src/external/mit/xorg/server/xorg-server.old/Makefile.servermod

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/server/xorg-server.old/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.3 src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.4
--- src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.3	Tue Apr 13 07:53:59 2021
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib	Mon May  3 08:44:05 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.serverlib,v 1.3 2021/04/13 07:53:59 mrg Exp $
+#	$NetBSD: Makefile.serverlib,v 1.4 2021/05/03 08:44:05 nakayama Exp $
 
 .include 		# for NETBSDSRCDIR and mk.conf processing
 
@@ -27,6 +27,3 @@ CPPFLAGS+=	-D__GLX_ALIGN64
 
 # IOPortBase is particularly annoying to fix
 COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
-
-# IOPortBase is particularly annoying to fix
-COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
Index: src/external/mit/xorg/server/xorg-server.old/Makefile.servermod
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.3 src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.4
--- src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.3	Tue Apr 13 07:53:59 2021
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.servermod	Mon May  3 08:44:05 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.servermod,v 1.3 2021/04/13 07:53:59 mrg Exp $
+#	$NetBSD: Makefile.servermod,v 1.4 2021/05/03 08:44:05 nakayama Exp $
 
 .include 	# For /etc/mk.conf processing
 
@@ -25,7 +25,4 @@ CPPFLAGS+=	${X11FLAGS.LOADABLE}
 .endif
 
 # IOPortBase is particularly annoying to fix
-
-# IOPortBase is particularly annoying to fix
-COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
 COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}

CVS commit: src/external/bsd/compiler_rt/lib/clang/lib/netbsd

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Fri Apr 30 22:48:38 UTC 2021

Modified Files:
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64: Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64:
Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64: Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64:
Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64: Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64:
Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64:
Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64:
Makefile

src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64:
Makefile

Log Message:
compiler_rt: generate symbol table early

These libraries have the special feature that they install both the .a
library as well as the .a.syms that is generated from them.  To avoid
the transformation rule .a.a.syms to apply to the files in ${DESTDIR},
that rule has to be disabled during the installation phase.

If the transformation rule were active during installation, the .a.syms
file in ${DESTDIR} would have more than one possible source file, which
eventually leads to an error during installation since in the command
"install a b c", the last argument must be a directory, not a file.

The installation phase should be as minimal as possible anyway,
therefore move the generation of the .syms files to the build phase.

This hopefully fixes the build for HAVE_LLVM=yes, which has been broken
for several weeks now, at least for the official builds.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \

src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \

src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile

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

Modified files:

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.5
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.4	Fri Aug 30 23:36:40 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile	Fri Apr 30 22:48:37 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
+#	$NetBSD: Makefile,v 1.5 2021/04/30 22:48:37 rillig Exp $
 
 NOSANITIZER=# defined
 
@@ -57,7 +57,7 @@ COPTS+=		-fPIC
 SYMS=		libclang_rt.asan-x86_64.a.syms
 SYMS_EXTRA=	${TOPDIR}/lib/asan/asan.syms.extra
 
-beforeinstall: ${SYMS}
+all:		${SYMS}
 
 CLEANFILES+=	${SYMS}
 FILES=		${SYMS}

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.5
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.4	Fri Aug 30 23:36:40 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile	Fri Apr 30 22:48:37 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
+#	$NetBSD: Makefile,v 1.5 2021/04/30 22:48:37 rillig Exp $
 
 NOSANITIZER=# defined
 
@@ -40,7 +40,7 @@ COPTS+=		-fPIC
 SYMS=		libclang_rt.asan_cxx-x86_64.a.syms
 SYMS_EXTRA=	${TOPDIR}/lib/asan/asan.syms.extra # Overlooked in upstream compiler-rt (8.0) ?
 
-beforeinstall: ${SYMS}
+all:		${SYMS}
 
 CLEANFILES+=	${SYMS}
 FILES=		${SYMS}

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.5
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.4	Fri Aug 30 23:36:40 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile	Fri Apr 30 22:48:37 2021
@@ -1,4 +1,4 

CVS commit: src/external/cddl/osnet/dist/cmd

[Nia Alarie]

Module Name:src
Committed By:   nia
Date:   Fri Apr 30 18:59:31 UTC 2021

Modified Files:
src/external/cddl/osnet/dist/cmd/zfs: zfs.8
src/external/cddl/osnet/dist/cmd/zpool: zpool.8

Log Message:
zfs: Fix up references to FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/dist/cmd/zfs/zfs.8
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/dist/cmd/zpool/zpool.8

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

Modified files:

Index: src/external/cddl/osnet/dist/cmd/zfs/zfs.8
diff -u src/external/cddl/osnet/dist/cmd/zfs/zfs.8:1.1 src/external/cddl/osnet/dist/cmd/zfs/zfs.8:1.2
--- src/external/cddl/osnet/dist/cmd/zfs/zfs.8:1.1	Mon Jun 24 08:27:20 2019
+++ src/external/cddl/osnet/dist/cmd/zfs/zfs.8	Fri Apr 30 18:59:30 2021
@@ -285,12 +285,6 @@
 .Op Fl FHt
 .Ar snapshot
 .Op Ar snapshot Ns | Ns Ar filesystem
-.Nm
-.Cm jail
-.Ar jailid Ns | Ns Ar jailname filesystem
-.Nm
-.Cm unjail
-.Ar jailid Ns | Ns Ar jailname filesystem
 .Sh DESCRIPTION
 The
 .Nm
@@ -445,32 +439,6 @@ If a file system's mount point is set to
 .Tn ZFS
 makes no attempt to manage the file system, and the administrator is
 responsible for mounting and unmounting the file system.
-.Ss Jails
-.No A Tn ZFS
-dataset can be attached to a jail by using the
-.Qq Nm Cm jail
-subcommand. You cannot attach a dataset to one jail and the children of the
-same dataset to another jails. To allow management of the dataset from within
-a jail, the
-.Sy jailed
-property has to be set and the jail needs access to the
-.Pa /dev/zfs
-device. The
-.Sy quota
-property cannot be changed from within a jail. See
-.Xr jail 8
-for information on how to allow mounting
-.Tn ZFS
-datasets from within a jail.
-.Pp
-.No A Tn ZFS
-dataset can be detached from a jail using the
-.Qq Nm Cm unjail
-subcommand.
-.Pp
-After a dataset is attached to a jail and the jailed property is set, a jailed
-file system cannot be mounted outside the jail, since the jail administrator
-might have set the mount point to an unacceptable value.
 .Ss Deduplication
 Deduplication is the process for removing redundant data at the block-level,
 reducing the total amount of data stored. If a file system has the
@@ -1070,7 +1038,7 @@ signature to make sure the block content
 The
 .Sy devices
 property is currently not supported on
-.Fx .
+.Nx .
 .It Sy exec Ns = Ns Cm on | off
 Controls whether processes can be executed from within this file system. The
 default value is
@@ -1079,7 +1047,7 @@ default value is
 The
 .Sy mlslabel
 property is currently not supported on
-.Fx .
+.Nx .
 .It Sy filesystem_limit Ns = Ns Ar count | Cm none
 Limits the number of filesystems and volumes that can exist under this point in
 the dataset tree.
@@ -1118,7 +1086,7 @@ shared file systems are unshared and sha
 The
 .Sy nbmand
 property is currently not supported on
-.Fx .
+.Nx .
 .It Sy primarycache Ns = Ns Cm all | none | metadata
 Controls what is cached in the primary cache (ARC). If this property is set to
 .Cm all ,
@@ -1343,7 +1311,7 @@ bit is respected for the file system. Th
 The
 .Sy sharesmb
 property currently has no effect on
-.Fx .
+.Nx .
 .It Sy sharenfs Ns = Ns Cm on | off | Ar opts
 Controls whether the file system is shared via
 .Tn NFS ,
@@ -1493,17 +1461,12 @@ during volume creation and pool import.
 The
 .Sy vscan
 property is currently not supported on
-.Fx .
+.Nx .
 .It Sy xattr Ns = Ns Cm off | on
 The
 .Sy xattr
 property is currently not supported on
-.Fx .
-.It Sy jailed Ns = Ns Cm off | on
-Controls whether the dataset is managed from a jail. See the
-.Qq Sx Jails
-section for more information. The default value is
-.Cm off .
+.Nx .
 .El
 .Pp
 The following three properties cannot be changed after the file system is
@@ -2360,7 +2323,7 @@ The default is
 The default can be changed to include group types.
 .It Fl i
 Translate SID to POSIX ID. This flag currently has no effect on
-.Fx .
+.Nx .
 .El
 .It Xo
 .Nm
@@ -2405,7 +2368,7 @@ file systems.
 Report mount progress.
 .It Fl O
 Perform an overlay mount. Overlay mounts are not supported on
-.Fx .
+.Nx .
 .It Fl o Ar property Ns Oo , Ns Ar property Oc Ns ...
 An optional, comma-separated list of mount options to use temporarily for the
 duration of the mount. See the
@@ -2416,7 +2379,7 @@ Mount all available
 .Tn ZFS
 file systems.
 This command may be executed on
-.Fx
+.Nx
 system startup by
 .Pa /etc/rc.d/zfs .
 For more information, see variable
@@ -2467,7 +2430,7 @@ file systems that have the
 .Sy sharenfs
 property set.
 This command may be executed on
-.Fx
+.Nx
 system startup by
 .Pa /etc/rc.d/zfs .
 For more information, see variable
@@ -2500,7 +2463,7 @@ file systems that have the
 .Sy sharenfs
 property set.
 This command may be executed on
-.Fx
+.Nx
 system shutdown by
 .Pa /etc/rc.d/zfs .
 For more information, see variable
@@ -3034,7 +2997,6 @@ protocol
 .It exec Ta property
 .It filesystem_limit Ta 

CVS commit: src/external/bsd/elftoolchain/dist/common

[Joseph Koshy]

Module Name:src
Committed By:   jkoshy
Date:   Thu Apr 29 17:38:08 UTC 2021

Modified Files:
src/external/bsd/elftoolchain/dist/common: elfdefinitions.h

Log Message:
Add a version control system marker.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/elftoolchain/dist/common/elfdefinitions.h

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

Modified files:

Index: src/external/bsd/elftoolchain/dist/common/elfdefinitions.h
diff -u src/external/bsd/elftoolchain/dist/common/elfdefinitions.h:1.6 src/external/bsd/elftoolchain/dist/common/elfdefinitions.h:1.7
--- src/external/bsd/elftoolchain/dist/common/elfdefinitions.h:1.6	Thu Apr  8 19:37:43 2021
+++ src/external/bsd/elftoolchain/dist/common/elfdefinitions.h	Thu Apr 29 17:38:08 2021
@@ -1,3 +1,5 @@
+/*	$NetBSD: elfdefinitions.h,v 1.7 2021/04/29 17:38:08 jkoshy Exp $	*/
+
 /*-
  * Copyright (c) 2010,2021 Joseph Koshy
  * All rights reserved.

CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Apr 29 01:51:40 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist/gcc/config/arm: arm.h bpabi.h netbsd-eabi.h
netbsd-elf.h

Log Message:
netbsd-eabi.h was never merged from the now present upstream version.
reduce diffs to upstream here and in other files in this subdir.

remove unused ARM_EABI_UNWIND_TABLES and __UNWIND_TABLES__.

clang defines __UNWIND_TABLES__, but doing this in GCC triggers the
need for more libgcc / libc unwind functionality to be added, and this
code has never been enabled for netbsd/earm.  (could potentially clean
up unused code in libc now, or, revive this once the full support has
been implemented..)


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/gpl3/gcc/dist/gcc/config/arm/arm.h
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/dist/gcc/config/arm/bpabi.h
cvs rdiff -u -r1.16 -r1.17 \
src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
cvs rdiff -u -r1.17 -r1.18 \
src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config/arm/arm.h
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/arm.h:1.22 src/external/gpl3/gcc/dist/gcc/config/arm/arm.h:1.23
--- src/external/gpl3/gcc/dist/gcc/config/arm/arm.h:1.22	Sun Apr 11 00:02:13 2021
+++ src/external/gpl3/gcc/dist/gcc/config/arm/arm.h	Thu Apr 29 01:51:39 2021
@@ -963,8 +963,8 @@ extern const int arm_arch_cde_coproc_bit
 /* ttype entries (the only interesting data references used)
use TARGET2 relocations.  */
 #define ASM_PREFERRED_EH_DATA_FORMAT(code, data) \
-(((code) == 0 && (data) == 1 && ARM_UNWIND_INFO) ? ARM_TARGET2_DWARF_FORMAT \
- : DW_EH_PE_absptr)
+  (((code) == 0 && (data) == 1 && ARM_UNWIND_INFO) ? ARM_TARGET2_DWARF_FORMAT \
+			   : DW_EH_PE_absptr)
 #endif
 
 /* The native (Norcroft) Pascal compiler for the ARM passes the static chain

Index: src/external/gpl3/gcc/dist/gcc/config/arm/bpabi.h
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/bpabi.h:1.12 src/external/gpl3/gcc/dist/gcc/config/arm/bpabi.h:1.13
--- src/external/gpl3/gcc/dist/gcc/config/arm/bpabi.h:1.12	Sun Apr 11 00:02:13 2021
+++ src/external/gpl3/gcc/dist/gcc/config/arm/bpabi.h	Thu Apr 29 01:51:39 2021
@@ -28,12 +28,9 @@
 #define ARM_DEFAULT_ABI ARM_ABI_AAPCS
 
 /* Assume that AAPCS ABIs should adhere to the full BPABI.  */
-//#undef TARGET_BPABI
 #define TARGET_BPABI (TARGET_AAPCS_BASED)
 
 /* BPABI targets use EABI frame unwinding tables.  */
-#undef ARM_EABI_UNWIND_TABLES
-#define ARM_EABI_UNWIND_TABLES 1
 #undef ARM_UNWIND_INFO
 #define ARM_UNWIND_INFO 1
 

Index: src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.16 src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.17
--- src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.16	Tue Dec  1 02:39:08 2020
+++ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h	Thu Apr 29 01:51:39 2021
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler, NetBSD/arm ELF version.
-   Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002-2020 Free Software Foundation, Inc.
Contributed by Wasabi Systems, Inc.
 
This file is part of GCC.
@@ -22,10 +22,16 @@
 #undef MULTILIB_DEFAULTS
 #define MULTILIB_DEFAULTS { "mabi=aapcs-linux" }
 
-#define TARGET_LINKER_EABI_SUFFIX \
-(TARGET_DEFAULT_FLOAT_ABI == ARM_FLOAT_ABI_SOFT \
- ? "%{!mabi=apcs-gnu:%{!mabi=atpcs:%{mfloat-abi=hard:_eabihf;:_eabi}}}" \
- : "%{!mabi=apcs-gnu:%{!mabi=atpcs:%{mfloat-abi=soft:_eabi;:_eabihf}}}")
+#define TARGET_LINKER_EABI_SUFFIX_SOFT \
+  "%{!mabi=apcs-gnu:%{!mabi=atpcs:%{mfloat-abi=hard:_eabihf;:_eabi}}}"
+#define TARGET_LINKER_EABI_SUFFIX_HARD \
+  "%{!mabi=apcs-gnu:%{!mabi=atpcs:%{mfloat-abi=soft:_eabi;:_eabihf}}}"
+
+#define TARGET_LINKER_EABI_SUFFIX			\
+  (TARGET_DEFAULT_FLOAT_ABI == ARM_FLOAT_ABI_SOFT	\
+   ? TARGET_LINKER_EABI_SUFFIX_SOFT			\
+   : TARGET_LINKER_EABI_SUFFIX_HARD)
+
 #define TARGET_LINKER_BIG_EMULATION "armelfb_nbsd%(linker_eabi_suffix)"
 #define TARGET_LINKER_LITTLE_EMULATION "armelf_nbsd%(linker_eabi_suffix)"
 
@@ -41,8 +47,6 @@
 #undef ARM_DEFAULT_ABI
 #define ARM_DEFAULT_ABI ARM_ABI_AAPCS_LINUX
 
-#undef ARM_EABI_UNWIND_TABLES
-#define ARM_EABI_UNWIND_TABLES 0
 #undef ARM_UNWIND_INFO
 #define ARM_UNWIND_INFO 0
 #undef ARM_DWARF_UNWIND_TABLES
@@ -57,8 +61,6 @@
   NETBSD_OS_CPP_BUILTINS_ELF();		\
   if (ARM_DWARF_UNWIND_TABLES)		\
 	builtin_define ("__ARM_DWARF_EH__");	\
-  if (ARM_EABI_UNWIND_TABLES)		\
-	builtin_define ("__UNWIND_TABLES__");	\
 }		\
   while (0)
 
@@ -73,13 +75,15 @@
 
 #undef SIZE_TYPE
 #define SIZE_TYPE "long unsigned int"
- 
+
 #undef PTRDIFF_TYPE
 #define PTRDIFF_TYPE "long int"
 
 #undef SUBTARGET_EXTRA_ASM_SPEC
-#define 

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Apr 27 14:18:25 UTC 2021

Modified Files:
src/external/gpl3/gcc/usr.bin/cc1objplus: Makefile
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile

Log Message:
Revert the change for the c-common.c hack. It is meant to be only for 32
bit mips. (Thanks Rin)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc/usr.bin/cc1plus/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/cc1objplus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile:1.2 src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile:1.2	Sun Apr 25 18:25:00 2021
+++ src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile	Tue Apr 27 10:18:25 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2021/04/25 22:25:00 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2021/04/27 14:18:25 christos Exp $
 
 # XXX: Pull this (G_OBJCXX_OBJS) out with mknative-gcc.  Needs some
 # minor re-org of cc1plus and perhaps cc1obj.  G_CXX_AND_OBJCXX_OBJS
@@ -81,7 +81,7 @@ COPTS.cc1obj-checksum.c+=-O0
 COPTS.decl.c+=-O0
 .endif
 
-.if ${MACHINE_MIPS64}
+.if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
 COPTS.c-common.c+=-O3
 .endif
 

Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.16 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.17
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.16	Sun Apr 25 18:25:55 2021
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile	Tue Apr 27 10:18:25 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2021/04/25 22:25:55 christos Exp $
+#	$NetBSD: Makefile,v 1.17 2021/04/27 14:18:25 christos Exp $
 
 PROG=		cc1plus
 SRCS=		${G_CXX_OBJS:S,c-family/,,:S,cp/,,:S,constraint.o,constraint.cc,:S,logic.o,logic.cc,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:S,coroutines.o,coroutines.cc,:Nlibcpp.a:.o=.c}
@@ -48,7 +48,7 @@ COPTS.c-ubsan.c+=-O0
 COPTS.cc1plus-checksum.c+=-O0
 .endif
 
-.if ${MACHINE_MIPS64}
+.if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
 COPTS.c-common.c+=-O3
 .endif
 

CVS commit: src/external/mit/xorg/lib/xkeyboard-config

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Apr 27 03:58:55 UTC 2021

Modified Files:
src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man
src/external/mit/xorg/lib/xkeyboard-config/rules: Makefile base
base.lst evdev evdev.lst

Log Message:
updates for xkeyboard-config 2.32.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/lib/xkeyboard-config/rules/base \
src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \
src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/lib/xkeyboard-config/rules/evdev

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/xkeyboard-config/xkeyboard-config.man
diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.8 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.9
--- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.8	Sun Nov  1 12:07:09 2020
+++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man	Tue Apr 27 03:58:55 2021
@@ -1,11 +1,11 @@
 .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
-.TH XKEYBOARD-CONFIG @miscmansuffix@ @vendorversion@
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.32" "X Version 11"
 .SH NAME
 xkeyboard-config \- XKB data description files
 .SH DESCRIPTION
 xkeyboard-config provides the description files for the X Keyboard
 Extension (XKB). The configuration options below are usually applied with
-setxkbmap(@appmansuffix@).
+setxkbmap(1).
 .SH MODELS
 .TS
 left,box;
@@ -203,8 +203,6 @@ teck227	Truly Ergonomic 227
 teck229	Truly Ergonomic 229
 apex300	SteelSeries Apex 300 (Apex RAW)
 chromebook	Chromebook
-teck227	Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)
-teck229	Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)
 
 .TE
 .SH LAYOUTS
@@ -221,6 +219,7 @@ us(euro)	English (US, euro on 5)
 us(intl)	English (US, intl., with dead keys)
 us(alt-intl)	English (US, alt. intl.)
 us(colemak)	English (Colemak)
+us(colemak_dh)	English (Colemak-DH)
 us(dvorak)	English (Dvorak)
 us(dvorak-intl)	English (Dvorak, intl., with dead keys)
 us(dvorak-alt-intl)	English (Dvorak, alt. intl.)
@@ -273,7 +272,6 @@ am(eastern-alt)	Armenian (alt. eastern)
 _
 at	German (Austria)
 at(nodeadkeys)	German (Austria, no dead keys)
-at(sundeadkeys)	German (Austria, Sun dead keys)
 at(mac)	German (Austria, Macintosh)
 
 _
@@ -294,10 +292,8 @@ _
 be	Belgian
 be(oss)	Belgian (alt.)
 be(oss_latin9)	Belgian (Latin-9 only, alt.)
-be(oss_sundeadkeys)	Belgian (Sun dead keys, alt.)
 be(iso-alternate)	Belgian (ISO, alt.)
 be(nodeadkeys)	Belgian (no dead keys)
-be(sundeadkeys)	Belgian (Sun dead keys)
 be(wang)	Belgian (Wang 724 AZERTY)
 
 _
@@ -340,7 +336,7 @@ in(hin-kagapa)	Hindi (KaGaPa, phonetic)
 in(san-kagapa)	Sanskrit (KaGaPa, phonetic)
 in(mar-kagapa)	Marathi (KaGaPa, phonetic)
 in(eng)	English (India, with rupee)
-in(iipa)	Indic (phonetic, IPA)
+in(iipa)	Indic IPA
 in(marathi)	Marathi (enhanced Inscript)
 
 _
@@ -366,11 +362,11 @@ bg(bas_phonetic)	Bulgarian (new phonetic
 bg(bekl)	Bulgarian (enhanced)
 
 _
-dz	Kabylian (azerty layout, no dead keys)
-dz(azerty-deadkeys)	Kabylian (azerty layout, with dead keys)
-dz(qwerty-gb-deadkeys)	Kabylian (qwerty-gb layout, with dead keys)
-dz(qwerty-us-deadkeys)	Kabylian (qwerty-us layout, with dead keys)
-dz(ber)	Kabylian (Algeria, Tifinagh)
+dz	Berber (Algeria, Latin)
+dz(azerty-deadkeys)	Kabyle (azerty layout, dead keys)
+dz(qwerty-gb-deadkeys)	Kabyle (qwerty-gb layout, dead keys)
+dz(qwerty-us-deadkeys)	Kabyle (qwerty-us layout, dead keys)
+dz(ber)	Berber (Algeria, Tifinagh)
 dz(ar)	Arabic (Algeria)
 
 _
@@ -449,7 +445,6 @@ dk(dvorak)	Danish (Dvorak)
 
 _
 nl	Dutch
-nl(sundeadkeys)	Dutch (Sun dead keys)
 nl(mac)	Dutch (Macintosh)
 nl(std)	Dutch (standard)
 
@@ -492,14 +487,11 @@ fi(mac)	Finnish (Macintosh)
 _
 fr	French
 fr(nodeadkeys)	French (no dead keys)
-fr(sundeadkeys)	French (Sun dead keys)
 fr(oss)	French (alt.)
 fr(oss_latin9)	French (alt., Latin-9 only)
 fr(oss_nodeadkeys)	French (alt., no dead keys)
-fr(oss_sundeadkeys)	French (alt., Sun dead keys)
 fr(latin9)	French (legacy, alt.)
 fr(latin9_nodeadkeys)	French (legacy, alt., no dead keys)
-fr(latin9_sundeadkeys)	French (legacy, alt., Sun dead keys)
 fr(bepo)	French (BEPO)
 fr(bepo_latin9)	French (BEPO, Latin-9 only)
 fr(bepo_afnor)	French (BEPO, AFNOR)
@@ -524,7 +516,7 @@ gh(avn)	Avatime
 gh(gillbt)	English (Ghana, GILLBT)
 
 _
-gn	French (Guinea)
+gn	N'Ko (azerty)
 
 _
 ge	Georgian
@@ -545,7 +537,6 @@ de(us)	German (US)
 de(ro)	Romanian (Germany)
 

CVS commit: src/external/mit/xorg/bin/xterm

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Apr 27 02:11:55 UTC 2021

Modified Files:
src/external/mit/xorg/bin/xterm: Makefile

Log Message:
disable attribute warnings.  new libXt triggers them for now..


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/bin/xterm/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/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.21 src/external/mit/xorg/bin/xterm/Makefile:1.22
--- src/external/mit/xorg/bin/xterm/Makefile:1.21	Wed Feb 17 03:06:07 2021
+++ src/external/mit/xorg/bin/xterm/Makefile	Tue Apr 27 02:11:55 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.21 2021/02/17 03:06:07 mrg Exp $
+#	$NetBSD: Makefile,v 1.22 2021/04/27 02:11:55 mrg Exp $
 
 .include 
 
@@ -24,6 +24,7 @@ CPPFLAGS+=	-I. \
 		${X11FLAGS.VERSION}
 
 CWARNFLAGS.clang+=	-Wno-empty-body
+CWARNFLAGS.gcc+=	-Wno-error=attributes
 
 APPDEFS=XTerm.ad XTerm-color.ad
 

CVS commit: src/external/gpl3/gdb/lib/libctf

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Mon Apr 26 23:51:08 UTC 2021

Removed Files:
src/external/gpl3/gdb/lib/libctf: ctf-error.h

Log Message:
Remove accidentally committed autogen file.
Should fix periodic snapshot builds with RO mounted /usr/src.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/external/gpl3/gdb/lib/libctf/ctf-error.h

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Apr 26 22:04:51 UTC 2021

Modified Files:
src/external/mit/xorg/bin/xdm/chooser: Makefile
src/external/mit/xorg/bin/xsm: Makefile

Log Message:
make build with new libXt.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xdm/chooser/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xsm/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/mit/xorg/bin/xdm/chooser/Makefile
diff -u src/external/mit/xorg/bin/xdm/chooser/Makefile:1.5 src/external/mit/xorg/bin/xdm/chooser/Makefile:1.6
--- src/external/mit/xorg/bin/xdm/chooser/Makefile:1.5	Wed Mar  6 12:40:23 2019
+++ src/external/mit/xorg/bin/xdm/chooser/Makefile	Mon Apr 26 22:04:51 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2019/03/06 12:40:23 nakayama Exp $
+#	$NetBSD: Makefile,v 1.6 2021/04/26 22:04:51 mrg Exp $
 
 NOMAN=	1
 
@@ -6,7 +6,8 @@ NOMAN=	1
 
 PROG=	chooser
 
-CPPFLAGS.chooser.c+=	-DBSD44SOCKETS -DRETSIGTYPE=void
+CPPFLAGS+=	-DBSD44SOCKETS -DRETSIGTYPE=void
+CPPFLAGS+=	-D_CONST_X_STRING=1
 
 APPDEFS=Chooser
 
@@ -21,3 +22,6 @@ BINDIR=	${XDMCHOOSERPATH:H}
 .include 
 
 .PATH: ${X11SRCDIR.xdm}/app-defaults
+
+# XXX libXt
+COPTS.chooser.c+=	-Wno-incompatible-pointer-types

Index: src/external/mit/xorg/bin/xsm/Makefile
diff -u src/external/mit/xorg/bin/xsm/Makefile:1.3 src/external/mit/xorg/bin/xsm/Makefile:1.4
--- src/external/mit/xorg/bin/xsm/Makefile:1.3	Fri May 31 08:02:00 2013
+++ src/external/mit/xorg/bin/xsm/Makefile	Mon Apr 26 22:04:51 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2013/05/31 08:02:00 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2021/04/26 22:04:51 mrg Exp $
 
 .include 
 
@@ -26,5 +26,8 @@ DPADD+=	${LIBXAW} ${LIBXMU} ${LIBXT} ${L
 .PATH:	${X11SRCDIR.${PROG}}
 .PATH:	${X11SRCDIR.${PROG}}/man
 
+# XXX libXt
+COPTS+=		-Wno-incompatible-pointer-types
+
 .include 
 .include 

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Apr 26 21:53:54 UTC 2021

Modified Files:
src/external/mit/xorg/lib/libXaw: Makefile
src/external/mit/xorg/lib/libXaw6: Makefile
Added Files:
src/external/mit/xorg/lib/libXaw: Makefile.common

Log Message:
make libXaw6 build with the new libXt as well.  consolidate common code.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/lib/libXaw/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libXaw/Makefile.common
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libXaw6/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/mit/xorg/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.15 src/external/mit/xorg/lib/libXaw/Makefile:1.16
--- src/external/mit/xorg/lib/libXaw/Makefile:1.15	Mon Apr 26 21:43:19 2021
+++ src/external/mit/xorg/lib/libXaw/Makefile	Mon Apr 26 21:53:53 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2021/04/26 21:43:19 mrg Exp $
+#	$NetBSD: Makefile,v 1.16 2021/04/26 21:53:53 mrg Exp $
 
 .include 
 
@@ -49,23 +49,14 @@ INCS=	AllWidgets.h AsciiSink.h AsciiSink
 
 INCSDIR=${X11INCDIR}/X11/Xaw
 
+.include "Makefile.common"
 
-CPPFLAGS+=	-DHAVE_WCHAR_H -DHAVE_WCTYPE_H -DNO_WIDEC_H -DHAVE_ISWALNUM
-CPPFLAGS+=	-DHAVE_GETPAGESIZE
-CPPFLAGS+=	-DHAVE_UNISTD_H
-CPPFLAGS+=	-D_CONST_X_STRING=1
-CPPFLAGS+=	-DPROJECT_ROOT=\"${X11ROOTDIR}\" -DXAW7
-CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/Xaw
-CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/extensions
-
-LIBDPLIBS=\
-	Xmu	${.CURDIR}/../libXmu \
-	Xt	${.CURDIR}/../libXt \
-	SM	${.CURDIR}/../libSM \
-	ICE	${.CURDIR}/../libICE \
-	Xpm	${.CURDIR}/../libXpm \
-	Xext	${.CURDIR}/../libXext \
-	X11	${.CURDIR}/../libX11/dynamic
+CPPFLAGS+=	-DXAW7 \
+		-I${DESTDIR}${X11INCDIR}/X11/Xaw \
+		-I${DESTDIR}${X11INCDIR}/X11/extensions
+
+LIBDPLIBS+=\
+	Xpm	${.CURDIR}/../libXpm
 
 PKGCONFIG=	xaw7
 PKGDIST=	${LIBOLD}
@@ -77,6 +68,3 @@ X11EXTRAMANTRANSFORMS+= \
 .include 
 
 CWARNFLAGS.clang+=	-Wno-format
-
-COPTS.Pixmap.c+=	-Wno-discarded-qualifiers
-COPTS.TextAction.c+=	-Wno-discarded-qualifiers

Index: src/external/mit/xorg/lib/libXaw6/Makefile
diff -u src/external/mit/xorg/lib/libXaw6/Makefile:1.10 src/external/mit/xorg/lib/libXaw6/Makefile:1.11
--- src/external/mit/xorg/lib/libXaw6/Makefile:1.10	Tue Jan  7 07:27:50 2020
+++ src/external/mit/xorg/lib/libXaw6/Makefile	Mon Apr 26 21:53:54 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2020/01/07 07:27:50 mrg Exp $
+#	$NetBSD: Makefile,v 1.11 2021/04/26 21:53:54 mrg Exp $
 
 NOCHECKVER=	yes	# we want to install an older version ...
 MKLINKLIB=	no
@@ -19,18 +19,9 @@ SRCS=	Actions.c AllWidgets.c AsciiSink.c
 	TextSrc.c TextTr.c Toggle.c Tree.c Vendor.c Viewport.c \
 	XawI18n.c XawIm.c XawInit.c
 
-CPPFLAGS+=	-DHAVE_WCHAR_H -DHAVE_WCTYPE_H -DNO_WIDEC_H -DOLDXAW \
-		-DHAVE_GETPAGESIZE \
-		-DHAVE_UNISTD_H \
-		-DHAVE_ISWALNUM -DPROJECT_ROOT=\"${X11ROOTDIR}\"
-
-LIBDPLIBS=\
-	Xmu	${.CURDIR}/../libXmu \
-	Xt	${.CURDIR}/../libXt \
-	SM	${.CURDIR}/../libSM \
-	ICE	${.CURDIR}/../libICE \
-	Xext	${.CURDIR}/../libXext \
-	X11	${.CURDIR}/../libX11/dynamic
+.include "../libXaw/Makefile.common"
+
+CPPFLAGS+=	-DOLDXAW
 
 PKGCONFIG=	xaw6
 PKGDIST=	${LIBOLD}

Added files:

Index: src/external/mit/xorg/lib/libXaw/Makefile.common
diff -u /dev/null src/external/mit/xorg/lib/libXaw/Makefile.common:1.1
--- /dev/null	Mon Apr 26 21:53:54 2021
+++ src/external/mit/xorg/lib/libXaw/Makefile.common	Mon Apr 26 21:53:53 2021
@@ -0,0 +1,21 @@
+#	$NetBSD: Makefile.common,v 1.1 2021/04/26 21:53:53 mrg Exp $
+
+CPPFLAGS+=	-DHAVE_WCHAR_H		\
+		-DHAVE_WCTYPE_H		\
+		-DNO_WIDEC_H		\
+		-DHAVE_ISWALNUM		\
+		-DHAVE_GETPAGESIZE	\
+		-DHAVE_UNISTD_H		\
+		-D_CONST_X_STRING=1	\
+		-DPROJECT_ROOT=\"${X11ROOTDIR}\"
+
+LIBDPLIBS=\
+	Xmu	${.CURDIR}/../libXmu \
+	Xt	${.CURDIR}/../libXt \
+	SM	${.CURDIR}/../libSM \
+	ICE	${.CURDIR}/../libICE \
+	Xext	${.CURDIR}/../libXext \
+	X11	${.CURDIR}/../libX11/dynamic
+
+COPTS.Pixmap.c+=	-Wno-discarded-qualifiers
+COPTS.TextAction.c+=	-Wno-discarded-qualifiers

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Apr 26 21:43:19 UTC 2021

Modified Files:
src/external/mit/xorg/lib/libXaw: Makefile

Log Message:
define _CONST_X_STRING.  avoid remaining const issues new libXt.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/libXaw/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/mit/xorg/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.14 src/external/mit/xorg/lib/libXaw/Makefile:1.15
--- src/external/mit/xorg/lib/libXaw/Makefile:1.14	Tue Jan  7 07:27:50 2020
+++ src/external/mit/xorg/lib/libXaw/Makefile	Mon Apr 26 21:43:19 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2020/01/07 07:27:50 mrg Exp $
+#	$NetBSD: Makefile,v 1.15 2021/04/26 21:43:19 mrg Exp $
 
 .include 
 
@@ -53,6 +53,7 @@ INCSDIR=${X11INCDIR}/X11/Xaw
 CPPFLAGS+=	-DHAVE_WCHAR_H -DHAVE_WCTYPE_H -DNO_WIDEC_H -DHAVE_ISWALNUM
 CPPFLAGS+=	-DHAVE_GETPAGESIZE
 CPPFLAGS+=	-DHAVE_UNISTD_H
+CPPFLAGS+=	-D_CONST_X_STRING=1
 CPPFLAGS+=	-DPROJECT_ROOT=\"${X11ROOTDIR}\" -DXAW7
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/Xaw
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/extensions
@@ -76,3 +77,6 @@ X11EXTRAMANTRANSFORMS+= \
 .include 
 
 CWARNFLAGS.clang+=	-Wno-format
+
+COPTS.Pixmap.c+=	-Wno-discarded-qualifiers
+COPTS.TextAction.c+=	-Wno-discarded-qualifiers

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Apr 26 21:32:49 UTC 2021

Modified Files:
src/external/mit/xorg/lib/pixman: Makefile

Log Message:
Don't try to override an existing -march


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/external/mit/xorg/lib/pixman/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/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.37 src/external/mit/xorg/lib/pixman/Makefile:1.38
--- src/external/mit/xorg/lib/pixman/Makefile:1.37	Sun Apr 25 19:23:19 2021
+++ src/external/mit/xorg/lib/pixman/Makefile	Mon Apr 26 17:32:49 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.37 2021/04/25 23:23:19 christos Exp $
+#	$NetBSD: Makefile,v 1.38 2021/04/26 21:32:49 christos Exp $
 
 NOLINT=	1	# defined
 
@@ -90,7 +90,7 @@ AFLAGS+=	${${ACTIVE_CC} == "clang" :? -f
 #CPPFLAGS+=	-DUSE_ARM_IWMMXT
 .endif
 
-.if !empty(MACHINE_ARCH:Mmips*64el)
+.if !empty(MACHINE_ARCH:Mmips*64el) && empty(COPTS:M-march=*)
 # Loongson MMI
 SRCS+=		pixman-mmx.c
 CPPFLAGS+=	-DUSE_LOONGSON_MMI