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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sat Nov 25 20:00:25 UTC 2023

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

Log Message:
Make building of more files conditional on MKLLVMRT.

Make r300_state_derived.c compile with gcc 12.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/external/mit/xorg/lib/gallium/Makefile

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

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sat Nov 25 20:00:25 UTC 2023

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

Log Message:
Make building of more files conditional on MKLLVMRT.

Make r300_state_derived.c compile with gcc 12.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.52 src/external/mit/xorg/lib/gallium/Makefile:1.53
--- src/external/mit/xorg/lib/gallium/Makefile:1.52	Wed Nov 22 17:48:35 2023
+++ src/external/mit/xorg/lib/gallium/Makefile	Sat Nov 25 20:00:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2023/11/22 17:48:35 rjs Exp $
+# $NetBSD: Makefile,v 1.53 2023/11/25 20:00:25 rjs Exp $
 
 # Link the gallium mega driver.
 
@@ -343,8 +343,12 @@ GALLIUM_SOURCES.auxiliary/util= \
 GALLIUM_SOURCES.auxiliary/nir = \
 	nir_draw_helpers.c \
 	nir_to_tgsi.c \
-	nir_to_tgsi_info.c \
 	tgsi_to_nir.c
+
+.if ${MKLLVMRT} != "no"
+GALLIUM_SOURCES.auxiliary/nir+=	nir_to_tgsi_info.c
+.endif
+
 GALLIUM_SOURCES.auxiliary/vl= \
 	vl_bicubic_filter.c \
 	vl_compositor.c \
@@ -384,6 +388,7 @@ CPPFLAGS.${_f} +=	-I${X11SRCDIR.Mesa}/sr
 GALLIUM_SOURCES.auxiliary/renderonly= \
 	renderonly.c
 
+.if ${MKLLVMRT} != "no"
 GALLIUM_SOURCES.auxiliary/gallivm= \
 	lp_bld_arit.c \
 	lp_bld_arit_overflow.c \
@@ -422,8 +427,9 @@ GALLIUM_SOURCES.auxiliary/gallivm= \
 	lp_bld_tgsi.c \
 	lp_bld_tgsi_info.c \
 	lp_bld_tgsi_soa.c \
-	lp_bld_type.c
-	#lp_bld_debug.cpp
+	lp_bld_type.c \
+	lp_bld_debug.cpp
+.endif
 
 .for _f in ${GALLIUM_SOURCES.auxiliary/gallivm}
 CPPFLAGS.${_f} +=	-I${X11SRCDIR.Mesa}/src/gallium/auxiliary/util
@@ -736,6 +742,8 @@ GALLIUM_SOURCES.drivers/r300 = \
 	r300_vs.c \
 	r300_vs_draw.c
 
+CPPFLAGS.r300_state_derived.c = ${CC_WNO_STRINGOP_OVERREAD}
+
 GALLIUM_SOURCES.drivers/r300/compiler = \
 	memory_pool.c \
 	r300_fragprog.c \

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Wed Nov 22 17:48:35 UTC 2023

Modified Files:
src/external/mit/xorg/lib: driver.mk libglsl.mk
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libEGL: Makefile
src/external/mit/xorg/lib/libgbm: Makefile

Log Message:
Include some more files.

Add a build-id note to gallium.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/driver.mk
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libglsl.mk
cvs rdiff -u -r1.51 -r1.52 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libEGL/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libgbm/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.mk
diff -u src/external/mit/xorg/lib/driver.mk:1.5 src/external/mit/xorg/lib/driver.mk:1.6
--- src/external/mit/xorg/lib/driver.mk:1.5	Sun Jul 16 22:20:54 2023
+++ src/external/mit/xorg/lib/driver.mk	Wed Nov 22 17:48:35 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: driver.mk,v 1.5 2023/07/16 22:20:54 rjs Exp $
+#	$NetBSD: driver.mk,v 1.6 2023/11/22 17:48:35 rjs Exp $
 
 # stuff both dri and gallium drivers need.
 
@@ -28,6 +28,7 @@ SRCS.util=	\
 	mesa-sha1.c \
 	os_file.c \
 	os_memory_fd.c \
+	os_misc.c \
 	os_time.c \
 	ralloc.c \
 	UTILdebug.c \
@@ -39,6 +40,7 @@ SRCS.util=	\
 	set.c \
 	slab.c \
 	softfloat.c \
+	sparse_array.c \
 	string_buffer.c \
 	strtod.c \
 	u_atomic.c \

Index: src/external/mit/xorg/lib/libglsl.mk
diff -u src/external/mit/xorg/lib/libglsl.mk:1.7 src/external/mit/xorg/lib/libglsl.mk:1.8
--- src/external/mit/xorg/lib/libglsl.mk:1.7	Sun Jul 16 22:20:54 2023
+++ src/external/mit/xorg/lib/libglsl.mk	Wed Nov 22 17:48:35 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: libglsl.mk,v 1.7 2023/07/16 22:20:54 rjs Exp $
+#	$NetBSD: libglsl.mk,v 1.8 2023/11/22 17:48:35 rjs Exp $
 
 LIBGLSL_GENERATED_CXX_FILES = \
 	glsl_lexer.cpp \
@@ -56,6 +56,7 @@ LIBGLSL_FILES = \
 	ir_function_detect_recursion.cpp \
 	ir_hierarchical_visitor.cpp \
 	ir_hv_accept.cpp \
+	ir_builder_print_visitor.cpp \
 	ir_print_visitor.cpp \
 	ir_reader.cpp \
 	ir_rvalue_visitor.cpp \
@@ -159,10 +160,10 @@ NIR_GENERATED_FILES = \
 	nir_opcodes.c \
 	nir_opt_algebraic.c
 
-#BUILDSYMLINKS+=	${X11SRCDIR.Mesa}/src/compiler/nir/nir.c nir_nir.c
+BUILDSYMLINKS+=	${X11SRCDIR.Mesa}/src/compiler/nir/nir.c nir_nir.c
 
 NIR_FILES = \
-	nir.c \
+	nir_nir.c \
 	nir_builtin_builder.c \
 	nir_clone.c \
 	nir_control_flow.c \
@@ -187,6 +188,7 @@ NIR_FILES = \
 	nir_lower_atomics_to_ssbo.c \
 	nir_lower_bit_size.c \
 	nir_lower_bitmap.c \
+	nir_lower_blend.c \
 	nir_lower_bool_to_float.c \
 	nir_lower_bool_to_int32.c \
 	nir_lower_clamp_color_outputs.c \
@@ -199,6 +201,7 @@ NIR_FILES = \
 	nir_lower_flatshade.c \
 	nir_lower_flrp.c \
 	nir_lower_fp16_conv.c \
+	nir_lower_fragcolor.c \
 	nir_lower_fragcoord_wtrans.c \
 	nir_lower_frexp.c \
 	nir_lower_global_vars_to_local.c \
@@ -209,6 +212,7 @@ NIR_FILES = \
 	nir_lower_indirect_derefs.c \
 	nir_lower_int64.c \
 	nir_lower_int_to_float.c \
+	nir_lower_interpolation.c \
 	nir_lower_io.c \
 	nir_lower_io_arrays_to_elements.c \
 	nir_lower_io_to_scalar.c \
@@ -228,6 +232,7 @@ NIR_FILES = \
 	nir_lower_returns.c \
 	nir_lower_samplers.c \
 	nir_lower_scratch.c \
+	nir_lower_ssbo.c \
 	nir_lower_subgroups.c \
 	nir_lower_system_values.c \
 	nir_lower_sysvals_to_varyings.c \
@@ -236,6 +241,7 @@ NIR_FILES = \
 	nir_lower_to_source_mods.c \
 	nir_lower_two_sided_color.c \
 	nir_lower_ubo_vec4.c \
+	nir_lower_undef_to_zero.c \
 	nir_lower_uniforms_to_ubo.c \
 	nir_lower_var_copies.c \
 	nir_lower_variable_initializers.c \
@@ -244,6 +250,7 @@ NIR_FILES = \
 	nir_lower_viewport_transform.c \
 	nir_lower_wpos_center.c \
 	nir_lower_wpos_ytransform.c \
+	nir_lower_wrmasks.c \
 	nir_metadata.c \
 	nir_move_vec_src_uses_to_dest.c \
 	nir_normalize_cubemap_coords.c \

Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.51 src/external/mit/xorg/lib/gallium/Makefile:1.52
--- src/external/mit/xorg/lib/gallium/Makefile:1.51	Sat Oct  7 12:15:52 2023
+++ src/external/mit/xorg/lib/gallium/Makefile	Wed Nov 22 17:48:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2023/10/07 12:15:52 rin Exp $
+# $NetBSD: Makefile,v 1.52 2023/11/22 17:48:35 rjs Exp $
 
 # Link the gallium mega driver.
 
@@ -28,6 +28,8 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libd
 CFLAGS+=	-pthread
 LDFLAGS+=	-pthread
 
+LDFLAGS+=	-Wl,--build-id=sha1
+
 # Reduce debugging for these extremely large objects.
 .if ${MKDEBUG:Uno} != "no"
 #CXXFLAGS+=	-g1
@@ -296,7 +298,6 @@ GALLIUM_SOURCES.auxiliary/translate= \
 	translate_generic.c \
 	translate_sse.c
 GALLIUM_SOURCES.auxiliary/util= \
-	os_misc.c \
 	u_async_debug.c \
 	u_bitmask.c \
 	u_blitter.c \

Index: src/external/mit/xorg/lib/libEGL/Makefile
diff -u 

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Wed Nov 22 17:48:35 UTC 2023

Modified Files:
src/external/mit/xorg/lib: driver.mk libglsl.mk
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libEGL: Makefile
src/external/mit/xorg/lib/libgbm: Makefile

Log Message:
Include some more files.

Add a build-id note to gallium.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/driver.mk
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libglsl.mk
cvs rdiff -u -r1.51 -r1.52 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libEGL/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libgbm/Makefile

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

CVS commit: src

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Tue Oct 17 13:51:52 UTC 2023

Modified Files:
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/tests/kernel: Makefile

Log Message:
The t_fdrestart test requires rump.


To generate a diff of this commit:
cvs rdiff -u -r1.420 -r1.421 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1294 -r1.1295 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.76 -r1.77 src/tests/kernel/Makefile

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

Modified files:

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.420 src/distrib/sets/lists/debug/mi:1.421
--- src/distrib/sets/lists/debug/mi:1.420	Tue Oct 17 13:45:37 2023
+++ src/distrib/sets/lists/debug/mi	Tue Oct 17 13:51:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.420 2023/10/17 13:45:37 rjs Exp $
+# $NetBSD: mi,v 1.421 2023/10/17 13:51:52 rjs Exp $
 ./etc/mtree/set.debug   comp-sys-root
 ./usr/lib	comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -1792,7 +1792,7 @@
 ./usr/libdata/debug/usr/tests/kernel/t_extattrctl.debug			tests-kernel-tests	debug,atf,rump
 ./usr/libdata/debug/usr/tests/kernel/t_extent.debug			tests-kernel-tests	debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/kernel/t_fcntl.debug			tests-kernel-tests	debug,atf
-./usr/libdata/debug/usr/tests/kernel/t_fdrestart.debug			tests-kernel-tests	debug,atf
+./usr/libdata/debug/usr/tests/kernel/t_fdrestart.debug			tests-kernel-tests	debug,atf,rump
 ./usr/libdata/debug/usr/tests/kernel/t_filedesc.debug			tests-kernel-tests	debug,atf,rump
 ./usr/libdata/debug/usr/tests/kernel/t_kauth_pr_47598.debug		tests-kernel-tests	debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/kernel/t_ksem.debug			tests-kernel-tests	debug,atf,compattestfile

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1294 src/distrib/sets/lists/tests/mi:1.1295
--- src/distrib/sets/lists/tests/mi:1.1294	Sun Oct 15 13:22:52 2023
+++ src/distrib/sets/lists/tests/mi	Tue Oct 17 13:51:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1294 2023/10/15 13:22:52 riastradh Exp $
+# $NetBSD: mi,v 1.1295 2023/10/17 13:51:52 rjs Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2311,7 +2311,7 @@
 ./usr/tests/kernel/t_extattrctltests-kernel-tests	atf,rump
 ./usr/tests/kernel/t_extenttests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/t_fcntltests-kernel-tests	atf
-./usr/tests/kernel/t_fdrestarttests-kernel-tests	atf
+./usr/tests/kernel/t_fdrestarttests-kernel-tests	atf,rump
 ./usr/tests/kernel/t_fexecvetests-kernel-tests	atf
 ./usr/tests/kernel/t_filedesctests-kernel-tests	atf,rump
 ./usr/tests/kernel/t_fpuforktests-kernel-tests	atf

Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.76 src/tests/kernel/Makefile:1.77
--- src/tests/kernel/Makefile:1.76	Sun Oct 15 13:22:52 2023
+++ src/tests/kernel/Makefile	Tue Oct 17 13:51:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2023/10/15 13:22:52 riastradh Exp $
+# $NetBSD: Makefile,v 1.77 2023/10/17 13:51:52 rjs Exp $
 
 NOMAN=		# defined
 
@@ -9,7 +9,9 @@ TESTSDIR=	${TESTSBASE}/kernel
 TESTS_SUBDIRS+=	kqueue
 #TESTS_C=	t_epoll
 TESTS_C+=	t_fcntl
+.if ${MKRUMP} != "no"
 TESTS_C+=	t_fdrestart
+.endif
 TESTS_C+=	t_lock
 TESTS_C+=	t_lockf
 TESTS_C+=	t_pty

CVS commit: src

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Tue Oct 17 13:51:52 UTC 2023

Modified Files:
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/tests/kernel: Makefile

Log Message:
The t_fdrestart test requires rump.


To generate a diff of this commit:
cvs rdiff -u -r1.420 -r1.421 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1294 -r1.1295 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.76 -r1.77 src/tests/kernel/Makefile

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

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Tue Oct 17 13:45:37 UTC 2023

Modified Files:
src/distrib/sets/lists/debug: mi

Log Message:
The inpcb tests are only built when rump is enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.419 -r1.420 src/distrib/sets/lists/debug/mi

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

Modified files:

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.419 src/distrib/sets/lists/debug/mi:1.420
--- src/distrib/sets/lists/debug/mi:1.419	Sun Oct 15 13:22:52 2023
+++ src/distrib/sets/lists/debug/mi	Tue Oct 17 13:45:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.419 2023/10/15 13:22:52 riastradh Exp $
+# $NetBSD: mi,v 1.420 2023/10/17 13:45:37 rjs Exp $
 ./etc/mtree/set.debug   comp-sys-root
 ./usr/lib	comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -2432,8 +2432,8 @@
 ./usr/libdata/debug/usr/tests/net/if_tap/rump_open_tap.debug	tests-net-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/net/if_vlan/bpfopen.debug		tests-net-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/net/if_vlan/siocXmulti.debug	tests-net-debug		debug,atf,rump
-./usr/libdata/debug/usr/tests/net/inpcb/broadcast_bind.debug	tests-net-debug		debug,atf,compattestfile
-./usr/libdata/debug/usr/tests/net/inpcb/inpcb_bind.debug	tests-net-debug		debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/net/inpcb/broadcast_bind.debug	tests-net-debug		debug,atf,rump,compattestfile
+./usr/libdata/debug/usr/tests/net/inpcb/inpcb_bind.debug	tests-net-debug		debug,atf,rump,compattestfile
 ./usr/libdata/debug/usr/tests/net/in_cksum/in_cksum.debug	tests-net-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/net/ipsec/natt_terminator.debug	tests-net-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/net/mcast/mcast.debug		tests-net-debug		debug,atf,rump

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Tue Oct 17 13:45:37 UTC 2023

Modified Files:
src/distrib/sets/lists/debug: mi

Log Message:
The inpcb tests are only built when rump is enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.419 -r1.420 src/distrib/sets/lists/debug/mi

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

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Thu Sep 14 12:27:55 UTC 2023

Added Files:
src/sys/arch/arm/dts: rk3399-pinebook-pro.dts

Log Message:
Enable crypto engine on Pinebook Pro.

Only used for rng at present.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.7 src/sys/arch/arm/dts/rk3399-pinebook-pro.dts

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

Added files:

Index: src/sys/arch/arm/dts/rk3399-pinebook-pro.dts
diff -u /dev/null src/sys/arch/arm/dts/rk3399-pinebook-pro.dts:1.7
--- /dev/null	Thu Sep 14 12:27:56 2023
+++ src/sys/arch/arm/dts/rk3399-pinebook-pro.dts	Thu Sep 14 12:27:55 2023
@@ -0,0 +1,30 @@
+/* $NetBSD: rk3399-pinebook-pro.dts,v 1.7 2023/09/14 12:27:55 rjs Exp $ */
+
+/*-
+ * Copyright (c) 2023 Robert Swindells 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts"
+#include "rk3399-crypto.dtsi"

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Thu Sep 14 12:27:55 UTC 2023

Added Files:
src/sys/arch/arm/dts: rk3399-pinebook-pro.dts

Log Message:
Enable crypto engine on Pinebook Pro.

Only used for rng at present.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.7 src/sys/arch/arm/dts/rk3399-pinebook-pro.dts

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

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Wed Aug 30 21:26:05 UTC 2023

Modified Files:
src/sys/arch/arm/dts: rk3399-rockpro64.dts

Log Message:
Re-enable the fan.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/dts/rk3399-rockpro64.dts

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

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Wed Aug 30 21:26:05 UTC 2023

Modified Files:
src/sys/arch/arm/dts: rk3399-rockpro64.dts

Log Message:
Re-enable the fan.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/dts/rk3399-rockpro64.dts

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

Modified files:

Index: src/sys/arch/arm/dts/rk3399-rockpro64.dts
diff -u src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.14 src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.15
--- src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.14	Sun Nov  7 17:11:43 2021
+++ src/sys/arch/arm/dts/rk3399-rockpro64.dts	Wed Aug 30 21:26:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3399-rockpro64.dts,v 1.14 2021/11/07 17:11:43 jmcneill Exp $ */
+/* $NetBSD: rk3399-rockpro64.dts,v 1.15 2023/08/30 21:26:05 rjs Exp $ */
 
 /*-
  * Copyright (c) 2019,2021 Jared McNeill 
@@ -113,6 +113,10 @@
 		};
 	};
 
+	fan: pwm-fan {
+	 	cooling-levels = <0 100 150 200 255>;
+	};
+
 #if 0
 	edp@ff97 {
 		status = "okay";

CVS commit: src/distrib/sets/lists

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sat Aug 19 14:22:41 UTC 2023

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: shl.mi

Log Message:
More libpcap changes.

There were two entries for /usr/lib/libpcap.so.


To generate a diff of this commit:
cvs rdiff -u -r1.962 -r1.963 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.322 -r1.323 src/distrib/sets/lists/debug/shl.mi

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

CVS commit: src/distrib/sets/lists

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sat Aug 19 14:22:41 UTC 2023

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: shl.mi

Log Message:
More libpcap changes.

There were two entries for /usr/lib/libpcap.so.


To generate a diff of this commit:
cvs rdiff -u -r1.962 -r1.963 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.322 -r1.323 src/distrib/sets/lists/debug/shl.mi

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

Modified files:

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.962 src/distrib/sets/lists/base/shl.mi:1.963
--- src/distrib/sets/lists/base/shl.mi:1.962	Thu Aug 17 15:23:33 2023
+++ src/distrib/sets/lists/base/shl.mi	Sat Aug 19 14:22:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.962 2023/08/17 15:23:33 christos Exp $
+# $NetBSD: shl.mi,v 1.963 2023/08/19 14:22:41 rjs Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -517,8 +517,8 @@
 ./usr/lib/libpanel.so.3base-sys-shlib		compatfile
 ./usr/lib/libpanel.so.3.0			base-sys-shlib		compatfile
 ./usr/lib/libpcap.sobase-net-shlib		compatfile
-./usr/lib/libpcap.so.8base-obsolete		obsolete
-./usr/lib/libpcap.sobase-obsolete		obsolete
+./usr/lib/libpcap.so.8base-obsolete		obsolete,compatfile
+./usr/lib/libpcap.so.8.1			base-obsolete		obsolete,compatfile
 ./usr/lib/libpcap.so.9base-net-shlib		compatfile
 ./usr/lib/libpcap.so.9.0			base-net-shlib		compatfile
 ./usr/lib/libpci.sobase-sys-shlib		compatfile

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.322 src/distrib/sets/lists/debug/shl.mi:1.323
--- src/distrib/sets/lists/debug/shl.mi:1.322	Thu Aug 17 15:23:33 2023
+++ src/distrib/sets/lists/debug/shl.mi	Sat Aug 19 14:22:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.322 2023/08/17 15:23:33 christos Exp $
+# $NetBSD: shl.mi,v 1.323 2023/08/19 14:22:41 rjs Exp $
 ./usr/lib/libbfd_g.a		comp-c-debuglib	debuglib,compatfile,binutils
 ./usr/libdata/debug/lib		base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libavl.so.0.0.debug			comp-zfs-debug	debug,dynamicroot,zfs
@@ -198,7 +198,7 @@
 ./usr/libdata/debug/usr/lib/libpanel.so.1.0.debug		comp-sys-debug	debug,obsolete,compatfile
 ./usr/libdata/debug/usr/lib/libpanel.so.2.0.debug		comp-sys-debug	debug,obsolete,compatfile
 ./usr/libdata/debug/usr/lib/libpanel.so.3.0.debug		comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libpcap.so.8.1.debug		comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/libpcap.so.8.1.debug		comp-obsolete	obsolete,compatfile
 ./usr/libdata/debug/usr/lib/libpcap.so.9.0.debug		comp-net-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libpci.so.2.2.debug			comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libperfuse.so.0.0.debug		comp-perfuse-debug	debug,compatfile

CVS commit: src/dist/pf/sbin/pflogd

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sat Aug 19 05:57:34 UTC 2023

Modified Files:
src/dist/pf/sbin/pflogd: pflogd.c

Log Message:
pflogd: adapt to new libpcap API.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/dist/pf/sbin/pflogd/pflogd.c

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

Modified files:

Index: src/dist/pf/sbin/pflogd/pflogd.c
diff -u src/dist/pf/sbin/pflogd/pflogd.c:1.10 src/dist/pf/sbin/pflogd/pflogd.c:1.11
--- src/dist/pf/sbin/pflogd/pflogd.c:1.10	Fri Aug 28 12:17:41 2015
+++ src/dist/pf/sbin/pflogd/pflogd.c	Sat Aug 19 05:57:34 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: pflogd.c,v 1.10 2015/08/28 12:17:41 joerg Exp $	*/
+/*	$NetBSD: pflogd.c,v 1.11 2023/08/19 05:57:34 rjs Exp $	*/
 /*	$OpenBSD: pflogd.c,v 1.45 2007/06/06 14:11:26 henning Exp $	*/
 
 /*
@@ -349,7 +349,6 @@ try_reset_dump(int nomove)
 		hdr.magic = TCPDUMP_MAGIC;
 		hdr.version_major = PCAP_VERSION_MAJOR;
 		hdr.version_minor = PCAP_VERSION_MINOR;
-		hdr.thiszone = hpcap->tzoff;
 		hdr.snaplen = hpcap->snapshot;
 		hdr.sigfigs = 0;
 		hdr.linktype = hpcap->linktype;

CVS commit: src/dist/pf/sbin/pflogd

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sat Aug 19 05:57:34 UTC 2023

Modified Files:
src/dist/pf/sbin/pflogd: pflogd.c

Log Message:
pflogd: adapt to new libpcap API.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/dist/pf/sbin/pflogd/pflogd.c

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

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Tue Aug  1 22:06:23 UTC 2023

Modified Files:
src/sys/arch/riscv/conf: GENERIC.common

Log Message:
Include compat config for NetBSD-10.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/riscv/conf/GENERIC.common

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

Modified files:

Index: src/sys/arch/riscv/conf/GENERIC.common
diff -u src/sys/arch/riscv/conf/GENERIC.common:1.5 src/sys/arch/riscv/conf/GENERIC.common:1.6
--- src/sys/arch/riscv/conf/GENERIC.common:1.5	Sun Jul 16 07:30:54 2023
+++ src/sys/arch/riscv/conf/GENERIC.common	Tue Aug  1 22:06:23 2023
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.common,v 1.5 2023/07/16 07:30:54 skrll Exp $
+#	$NetBSD: GENERIC.common,v 1.6 2023/08/01 22:06:23 rjs Exp $
 #
 #	GENERIC common RISC-V kernel config items shared between 32 and 64
 #	kernels
@@ -57,7 +57,7 @@ options 	DDB_HISTORY_SIZE=512	# enable h
 #options 	SYSCALL_TIMES_HASCOUNTER	# use 'broken' rdtsc (soekris)
 
 # Compatibility options
-#include 	"conf/compat_netbsd90.config"
+include 	"conf/compat_netbsd100.config"
 
 # Wedge support
 options 	DKWEDGE_AUTODISCOVER	# Automatically add dk(4) instances

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Tue Aug  1 22:06:23 UTC 2023

Modified Files:
src/sys/arch/riscv/conf: GENERIC.common

Log Message:
Include compat config for NetBSD-10.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/riscv/conf/GENERIC.common

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

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sun Jul 16 22:20:54 UTC 2023

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

Log Message:
Make most of MesaLib build.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/driver.mk
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libglsl.mk \
src/external/mit/xorg/lib/libloader.mk
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/libmesa.mk
cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.49 -r1.50 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libEGL/Makefile
cvs rdiff -u -r1.33 -r1.34 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libGL/mesa-ver.mk
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libgbm/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libglapi/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.mk
diff -u src/external/mit/xorg/lib/driver.mk:1.4 src/external/mit/xorg/lib/driver.mk:1.5
--- src/external/mit/xorg/lib/driver.mk:1.4	Tue Sep 24 19:29:41 2019
+++ src/external/mit/xorg/lib/driver.mk	Sun Jul 16 22:20:54 2023
@@ -1,50 +1,98 @@
-#	$NetBSD: driver.mk,v 1.4 2019/09/24 19:29:41 maya Exp $
+#	$NetBSD: driver.mk,v 1.5 2023/07/16 22:20:54 rjs Exp $
 
 # stuff both dri and gallium drivers need.
 
 # util
 .PATH:		${X11SRCDIR.Mesa}/src/util
 .PATH:		${X11SRCDIR.Mesa}/../src/util
+.PATH:		${X11SRCDIR.Mesa}/src/util/format
+.PATH:		${X11SRCDIR.Mesa}/../src/util/format
+.PATH:		${X11SRCDIR.Mesa}/src/util/perf
+.PATH:		${X11SRCDIR.Mesa}/../src/util/perf
 
 SRCS.util=	\
-	hash_table.c \
+	anon_file.c \
 	build_id.c \
+	compress.c \
 	crc32.c \
+	dag.c \
 	disk_cache.c \
+	disk_cache_os.c \
+	double.c \
+	format_srgb.c \
+	fossilize_db.c \
+	hash_table.c \
 	fast_idiv_by_const.c \
 	half_float.c \
-	format_srgb.c \
+	memstream.c \
 	mesa-sha1.c \
+	os_file.c \
+	os_memory_fd.c \
 	os_time.c \
 	ralloc.c \
 	UTILdebug.c \
+	UTILlog.c \
 	rand_xor.c \
 	rb_tree.c \
 	register_allocate.c \
 	rgtc.c \
 	set.c \
 	slab.c \
+	softfloat.c \
 	string_buffer.c \
 	strtod.c \
 	u_atomic.c \
 	u_cpu_detect.c \
+	u_debug.c \
+	u_hash_table.c \
+	u_idalloc.c \
 	u_math.c \
+	u_mm.c \
+	u_qsort.cpp \
 	u_queue.c \
+	u_printf.cpp \
 	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
+CPPFLAGS.format_srgb.c+=	-I${X11SRCDIR.Mesa}/src/util
+CPPFLAGS.u_hash_table.c+=	-I${X11SRCDIR.Mesa}/src/gallium/auxiliary
 
 BUILDSYMLINKS+=	${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c
+BUILDSYMLINKS+=	${X11SRCDIR.Mesa}/src/util/log.c UTILlog.c
+
+SRCS.format= \
+	u_format.c \
+	u_format_bptc.c \
+	u_format_etc.c \
+	u_format_fxt1.c \
+	u_format_latc.c \
+	u_format_other.c \
+	u_format_rgtc.c \
+	u_format_s3tc.c \
+	u_format_unpack_neon.c \
+	u_format_yuv.c \
+	u_format_zs.c \
+	u_format_table.c
+
+.for _f in ${SRCS.format}
+CPPFLAGS.${_f} +=	-I${X11SRCDIR.Mesa}/src/util/format
+CPPFLAGS.${_f} +=	-I${X11SRCDIR.Mesa}/../src/util/format
+CPPFLAGS.${_f} +=	-I${X11SRCDIR.Mesa}/../src
+.endfor
+
+SRCS.perf= \
+	u_trace.c
+
+CPPFLAGS.u_trace.c+=	-I${X11SRCDIR.Mesa}/src/util/perf
+CPPFLAGS.u_trace.c+=	-I${X11SRCDIR.Mesa}/src/gallium/auxiliary
 
-SRCS+=	${SRCS.util}
+SRCS+=	${SRCS.util} ${SRCS.format} ${SRCS.perf}
 
 # also need to pull in libdricommon.la libmegadriver_stub.la
 .PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common

Index: src/external/mit/xorg/lib/libglsl.mk
diff -u src/external/mit/xorg/lib/libglsl.mk:1.6 src/external/mit/xorg/lib/libglsl.mk:1.7
--- src/external/mit/xorg/lib/libglsl.mk:1.6	Tue Sep 24 19:29:41 2019
+++ src/external/mit/xorg/lib/libglsl.mk	Sun Jul 16 22:20:54 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: libglsl.mk,v 1.6 2019/09/24 19:29:41 maya Exp $
+#	$NetBSD: libglsl.mk,v 1.7 2023/07/16 22:20:54 rjs Exp $
 
 LIBGLSL_GENERATED_CXX_FILES = \
 	glsl_lexer.cpp \
@@ -15,7 +15,8 @@ CPPFLAGS+=	-I${X11SRCDIR.Mesa}/src/compi
 		-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
+		-I${X11SRCDIR.Mesa}/src/compiler/spirv \
+		

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sun Jul 16 22:20:54 UTC 2023

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

Log Message:
Make most of MesaLib build.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/driver.mk
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libglsl.mk \
src/external/mit/xorg/lib/libloader.mk
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/libmesa.mk
cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.49 -r1.50 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libEGL/Makefile
cvs rdiff -u -r1.33 -r1.34 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libGL/mesa-ver.mk
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libgbm/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libglapi/Makefile

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

CVS commit: xsrc/external/mit/MesaLib/dist/src/util

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 22:01:36 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_cpu_detect.c

Log Message:
sizeof() returns size_t type.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c

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

Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c
diff -u xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c:1.1.1.3 xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c:1.1.1.3	Mon May  9 01:23:43 2022
+++ xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c	Sun Jul 16 22:01:35 2023
@@ -623,7 +623,7 @@ util_cpu_detect_once(void)
if (available_cpus == 0) {
   const int mib[] = { CTL_HW, HW_NCPUONLINE };
   int ncpu;
-  int len = sizeof(ncpu);
+  size_t len = sizeof(ncpu);
 
   sysctl(mib, 2, , , NULL, 0);
   available_cpus = ncpu;

CVS commit: xsrc/external/mit/MesaLib/dist/src/util

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 22:01:36 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_cpu_detect.c

Log Message:
sizeof() returns size_t type.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c

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

CVS commit: xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:58:14 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon:
radeon_vcn_enc.c

Log Message:
Fix enum name in cast.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/radeon_vcn_enc.c

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

Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/radeon_vcn_enc.c
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/radeon_vcn_enc.c:1.4 xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/radeon_vcn_enc.c:1.5
--- xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/radeon_vcn_enc.c:1.4	Mon May  9 01:27:23 2022
+++ xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/radeon_vcn_enc.c	Sun Jul 16 21:58:14 2023
@@ -103,7 +103,7 @@ static void radeon_vcn_enc_get_param(str
   }
} else if (u_reduce_video_profile(picture->profile) == PIPE_VIDEO_FORMAT_HEVC) {
   struct pipe_h265_enc_picture_desc *pic = (struct pipe_h265_enc_picture_desc *)picture;
-  enc->enc_pic.picture_type = (enum pipe_h264_enc_picture_type)pic->picture_type;
+  enc->enc_pic.picture_type = (enum pipe_h2645_enc_picture_type)pic->picture_type;
   enc->enc_pic.frame_num = pic->frame_num;
   enc->enc_pic.pic_order_cnt = pic->pic_order_cnt;
   enc->enc_pic.pic_order_cnt_type = pic->pic_order_cnt_type;

CVS commit: xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:58:14 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon:
radeon_vcn_enc.c

Log Message:
Fix enum name in cast.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/radeon_vcn_enc.c

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

CVS commit: xsrc/external/mit/MesaLib/dist/src/util

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:55:45 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_printf.h

Log Message:
include cstdarg for va_list

Copied from graphics/MesaLib pkg.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/util/u_printf.h

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

Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/util/u_printf.h
diff -u xsrc/external/mit/MesaLib/dist/src/util/u_printf.h:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/util/u_printf.h:1.2
--- xsrc/external/mit/MesaLib/dist/src/util/u_printf.h:1.1.1.1	Mon May  9 01:23:43 2022
+++ xsrc/external/mit/MesaLib/dist/src/util/u_printf.h	Sun Jul 16 21:55:45 2023
@@ -25,6 +25,7 @@
 #ifdef __cplusplus
 
 #include 
+#include 
 
 /* find next valid printf specifier in a C++ std::string */
 size_t util_printf_next_spec_pos(const std::string , size_t pos);

CVS commit: xsrc/external/mit/MesaLib/dist/src/util

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:55:45 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_printf.h

Log Message:
include cstdarg for va_list

Copied from graphics/MesaLib pkg.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/util/u_printf.h

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

CVS commit: xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:54:34 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm:
lp_bld_misc.cpp

Log Message:
setOverrideStackAlignment() isn't in our llvm runtime library.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp

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

CVS commit: xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:54:34 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm:
lp_bld_misc.cpp

Log Message:
setOverrideStackAlignment() isn't in our llvm runtime library.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp

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

Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:1.3 xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:1.4
--- xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:1.3	Mon May  9 01:27:18 2022
+++ xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp	Sun Jul 16 21:54:33 2023
@@ -619,8 +619,10 @@ lp_is_function(LLVMValueRef v)
 extern "C" void
 lp_set_module_stack_alignment_override(LLVMModuleRef MRef, unsigned align)
 {
+#if 0
 #if LLVM_VERSION_MAJOR >= 13
llvm::Module *M = llvm::unwrap(MRef);
M->setOverrideStackAlignment(align);
 #endif
+#endif
 }

CVS commit: xsrc/external/mit/MesaLib/src

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:41:57 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/src/amd/common: sid_tables.h
xsrc/external/mit/MesaLib/src/compiler: ir_expression_operation.h
xsrc/external/mit/MesaLib/src/compiler/glsl: float64_glsl.h
glsl_lexer.cpp glsl_parser.cpp glsl_parser.h
ir_expression_operation_constant.h
ir_expression_operation_strings.h
xsrc/external/mit/MesaLib/src/compiler/glsl/glcpp: glcpp-lex.c
glcpp-parse.c glcpp-parse.h
xsrc/external/mit/MesaLib/src/compiler/nir: nir_builder_opcodes.h
nir_constant_expressions.c nir_intrinsics.c nir_intrinsics.h
nir_opcodes.c nir_opcodes.h nir_opt_algebraic.c
xsrc/external/mit/MesaLib/src/compiler/spirv: spirv_info.c
vtn_gather_types.c
xsrc/external/mit/MesaLib/src/gallium/auxiliary: u_indices_gen.c
xsrc/external/mit/MesaLib/src/intel/genxml: gen11_pack.h gen45_pack.h
gen4_pack.h gen5_pack.h gen6_pack.h gen75_pack.h gen7_pack.h
gen8_pack.h gen9_pack.h genX_bits.h genX_xml.h
xsrc/external/mit/MesaLib/src/mesa: format_info.h get_hash.h
xsrc/external/mit/MesaLib/src/mesa/main: dispatch.h marshal_generated.h
remap_helper.h
xsrc/external/mit/MesaLib/src/mesa/program: program_parse.tab.c
program_parse.tab.h
xsrc/external/mit/MesaLib/src/util: format_srgb.c
Added Files:
xsrc/external/mit/MesaLib/src: git_sha1.h
xsrc/external/mit/MesaLib/src/amd/common: amdgfxregs.h
gfx10_format_table.c
xsrc/external/mit/MesaLib/src/compiler/nir: nir_intrinsics_indices.h
xsrc/external/mit/MesaLib/src/compiler/spirv: vtn_generator_ids.h
xsrc/external/mit/MesaLib/src/gallium/auxiliary: u_tracepoints.c
u_tracepoints.h
xsrc/external/mit/MesaLib/src/gallium/drivers/lima:
lima_nir_algebraic.c
xsrc/external/mit/MesaLib/src/gallium/frontends/xa: xa_tracker.h
xsrc/external/mit/MesaLib/src/intel/compiler:
brw_nir_trig_workarounds.c
xsrc/external/mit/MesaLib/src/intel/genxml: gen125_pack.h gen12_pack.h
gen_rt_pack.h
xsrc/external/mit/MesaLib/src/intel/isl: isl_format_layout.c
xsrc/external/mit/MesaLib/src/intel/perf: intel_perf_metrics.c
intel_perf_metrics.h
xsrc/external/mit/MesaLib/src/mapi/es1api: glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mapi/es2api: glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mapi/glapi/gen: api_exec.c enums.c
glapi_mapi_tmp.h indirect.c indirect.h indirect_init.c
indirect_size.c indirect_size.h marshal_generated0.c
marshal_generated1.c marshal_generated2.c marshal_generated3.c
marshal_generated4.c marshal_generated5.c marshal_generated6.c
marshal_generated7.c
xsrc/external/mit/MesaLib/src/mapi/shared-glapi: glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mesa: format_fallback.c
xsrc/external/mit/MesaLib/src/mesa/program: lex.yy.c
xsrc/external/mit/MesaLib/src/panfrost/bifrost: bi_builder.h
bi_opcodes.c bi_opcodes.h bi_packer.c bi_printer.c
bifrost_gen_disasm.c bifrost_nir_algebraic.c
xsrc/external/mit/MesaLib/src/panfrost/lib/genxml: common_pack.h
v4_pack.h v5_pack.h v6_pack.h v7_pack.h
xsrc/external/mit/MesaLib/src/panfrost/midgard: midgard_nir_algebraic.c
xsrc/external/mit/MesaLib/src/panfrost/perf: pan_perf_metrics.c
pan_perf_metrics.h
xsrc/external/mit/MesaLib/src/util: driconf_static.h
xsrc/external/mit/MesaLib/src/util/format: u_format_pack.h
u_format_table.c
Removed Files:
xsrc/external/mit/MesaLib/src/gallium/auxiliary: u_format_table.c
xsrc/external/mit/MesaLib/src/intel: brw_nir_trig_workarounds.c
isl_format_layout.c
xsrc/external/mit/MesaLib/src/intel/perf: gen_perf_metrics.c
gen_perf_metrics.h
xsrc/external/mit/MesaLib/src/mapi: shared-glapi_glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mapi/glapi: api_exec.c enums.c
glapi_mapi_tmp.h indirect.c indirect.h indirect_init.c
indirect_size.c indirect_size.h marshal_generated.c
xsrc/external/mit/MesaLib/src/mesa: matypes.h
xsrc/external/mit/MesaLib/src/mesa/main: Makefile format_fallback.c
format_pack.c format_unpack.c git_sha1.h
xsrc/external/mit/MesaLib/src/mesa/program: Makefile
xsrc/external/mit/MesaLib/src/util: Makefile
xsrc/external/mit/MesaLib/src/util/xmlpool: options.h

Log Message:
Update generated files to match 21.3.7.

Created using a dummy pkg.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/MesaLib/src/git_sha1.h
cvs rdiff -u -r0 -r1.1 

CVS commit: xsrc/external/mit/MesaLib/src

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:41:57 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/src/amd/common: sid_tables.h
xsrc/external/mit/MesaLib/src/compiler: ir_expression_operation.h
xsrc/external/mit/MesaLib/src/compiler/glsl: float64_glsl.h
glsl_lexer.cpp glsl_parser.cpp glsl_parser.h
ir_expression_operation_constant.h
ir_expression_operation_strings.h
xsrc/external/mit/MesaLib/src/compiler/glsl/glcpp: glcpp-lex.c
glcpp-parse.c glcpp-parse.h
xsrc/external/mit/MesaLib/src/compiler/nir: nir_builder_opcodes.h
nir_constant_expressions.c nir_intrinsics.c nir_intrinsics.h
nir_opcodes.c nir_opcodes.h nir_opt_algebraic.c
xsrc/external/mit/MesaLib/src/compiler/spirv: spirv_info.c
vtn_gather_types.c
xsrc/external/mit/MesaLib/src/gallium/auxiliary: u_indices_gen.c
xsrc/external/mit/MesaLib/src/intel/genxml: gen11_pack.h gen45_pack.h
gen4_pack.h gen5_pack.h gen6_pack.h gen75_pack.h gen7_pack.h
gen8_pack.h gen9_pack.h genX_bits.h genX_xml.h
xsrc/external/mit/MesaLib/src/mesa: format_info.h get_hash.h
xsrc/external/mit/MesaLib/src/mesa/main: dispatch.h marshal_generated.h
remap_helper.h
xsrc/external/mit/MesaLib/src/mesa/program: program_parse.tab.c
program_parse.tab.h
xsrc/external/mit/MesaLib/src/util: format_srgb.c
Added Files:
xsrc/external/mit/MesaLib/src: git_sha1.h
xsrc/external/mit/MesaLib/src/amd/common: amdgfxregs.h
gfx10_format_table.c
xsrc/external/mit/MesaLib/src/compiler/nir: nir_intrinsics_indices.h
xsrc/external/mit/MesaLib/src/compiler/spirv: vtn_generator_ids.h
xsrc/external/mit/MesaLib/src/gallium/auxiliary: u_tracepoints.c
u_tracepoints.h
xsrc/external/mit/MesaLib/src/gallium/drivers/lima:
lima_nir_algebraic.c
xsrc/external/mit/MesaLib/src/gallium/frontends/xa: xa_tracker.h
xsrc/external/mit/MesaLib/src/intel/compiler:
brw_nir_trig_workarounds.c
xsrc/external/mit/MesaLib/src/intel/genxml: gen125_pack.h gen12_pack.h
gen_rt_pack.h
xsrc/external/mit/MesaLib/src/intel/isl: isl_format_layout.c
xsrc/external/mit/MesaLib/src/intel/perf: intel_perf_metrics.c
intel_perf_metrics.h
xsrc/external/mit/MesaLib/src/mapi/es1api: glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mapi/es2api: glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mapi/glapi/gen: api_exec.c enums.c
glapi_mapi_tmp.h indirect.c indirect.h indirect_init.c
indirect_size.c indirect_size.h marshal_generated0.c
marshal_generated1.c marshal_generated2.c marshal_generated3.c
marshal_generated4.c marshal_generated5.c marshal_generated6.c
marshal_generated7.c
xsrc/external/mit/MesaLib/src/mapi/shared-glapi: glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mesa: format_fallback.c
xsrc/external/mit/MesaLib/src/mesa/program: lex.yy.c
xsrc/external/mit/MesaLib/src/panfrost/bifrost: bi_builder.h
bi_opcodes.c bi_opcodes.h bi_packer.c bi_printer.c
bifrost_gen_disasm.c bifrost_nir_algebraic.c
xsrc/external/mit/MesaLib/src/panfrost/lib/genxml: common_pack.h
v4_pack.h v5_pack.h v6_pack.h v7_pack.h
xsrc/external/mit/MesaLib/src/panfrost/midgard: midgard_nir_algebraic.c
xsrc/external/mit/MesaLib/src/panfrost/perf: pan_perf_metrics.c
pan_perf_metrics.h
xsrc/external/mit/MesaLib/src/util: driconf_static.h
xsrc/external/mit/MesaLib/src/util/format: u_format_pack.h
u_format_table.c
Removed Files:
xsrc/external/mit/MesaLib/src/gallium/auxiliary: u_format_table.c
xsrc/external/mit/MesaLib/src/intel: brw_nir_trig_workarounds.c
isl_format_layout.c
xsrc/external/mit/MesaLib/src/intel/perf: gen_perf_metrics.c
gen_perf_metrics.h
xsrc/external/mit/MesaLib/src/mapi: shared-glapi_glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mapi/glapi: api_exec.c enums.c
glapi_mapi_tmp.h indirect.c indirect.h indirect_init.c
indirect_size.c indirect_size.h marshal_generated.c
xsrc/external/mit/MesaLib/src/mesa: matypes.h
xsrc/external/mit/MesaLib/src/mesa/main: Makefile format_fallback.c
format_pack.c format_unpack.c git_sha1.h
xsrc/external/mit/MesaLib/src/mesa/program: Makefile
xsrc/external/mit/MesaLib/src/util: Makefile
xsrc/external/mit/MesaLib/src/util/xmlpool: options.h

Log Message:
Update generated files to match 21.3.7.

Created using a dummy pkg.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/MesaLib/src/git_sha1.h
cvs rdiff -u -r0 -r1.1 

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sat Jul 15 21:24:47 UTC 2023

Modified Files:
src/external/mit/xorg/lib: Makefile 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
src/external/mit/xorg/lib/libgbm.old: Makefile
src/external/mit/xorg/lib/libglapi.old: Makefile

Log Message:
Fixup more references to "old" components.

ok mrg@.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libmesa.old.mk
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri.old/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/gallium.old/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libGL.old/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libgbm.old/Makefile
cvs rdiff -u -r1.2 -r1.3 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/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.57 src/external/mit/xorg/lib/Makefile:1.58
--- src/external/mit/xorg/lib/Makefile:1.57	Thu Jul 14 07:41:49 2022
+++ src/external/mit/xorg/lib/Makefile	Sat Jul 15 21:24:46 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.57 2022/07/14 07:41:49 mrg Exp $
+#	$NetBSD: Makefile,v 1.58 2023/07/15 21:24:46 rjs Exp $
 
 # build libraries for xorg
 
@@ -58,7 +58,7 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw lib
 SUBDIR+=libgbm${OLD_SUFFIX}
 .if ${HAVE_XORG_GLAMOR} != "no"
 # libEGL depends upon libgbm
-SUBDIR+=.WAIT libEGL
+SUBDIR+=.WAIT libEGL${OLD_SUFFIX}
 .endif
 
 .include 

Index: src/external/mit/xorg/lib/libmesa.old.mk
diff -u src/external/mit/xorg/lib/libmesa.old.mk:1.2 src/external/mit/xorg/lib/libmesa.old.mk:1.3
--- src/external/mit/xorg/lib/libmesa.old.mk:1.2	Sun Jul 11 20:53:35 2021
+++ src/external/mit/xorg/lib/libmesa.old.mk	Sat Jul 15 21:24:46 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: libmesa.old.mk,v 1.2 2021/07/11 20:53:35 mrg Exp $
+#	$NetBSD: libmesa.old.mk,v 1.3 2023/07/15 21:24:46 rjs Exp $
 #
 # Consumer of this Makefile should set MESA_SRC_MODULES.
 
@@ -550,4 +550,4 @@ CPPFLAGS+=	\
 
 CFLAGS+=	-fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp -fcommon
 
-.include "libGL/mesa-ver.mk"
+.include "libGL.old/mesa-ver.mk"

Index: src/external/mit/xorg/lib/dri.old/Makefile
diff -u src/external/mit/xorg/lib/dri.old/Makefile:1.6 src/external/mit/xorg/lib/dri.old/Makefile:1.7
--- src/external/mit/xorg/lib/dri.old/Makefile:1.6	Sun Jul  2 23:56:12 2023
+++ src/external/mit/xorg/lib/dri.old/Makefile	Sat Jul 15 21:24:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/07/02 23:56:12 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2023/07/15 21:24:46 rjs Exp $
 
 # Link the mesa_dri_drivers mega driver.
 
@@ -449,8 +449,8 @@ LIBDPLIBS+= 	drm_intel	${.CURDIR}/../lib
 LIBDPLIBS+= 	drm_radeon	${.CURDIR}/../libdrm_radeon
 
 MESA_SRC_MODULES=  main math math_xform vbo tnl swrast ss common asm_c program asm_s
-.include "../libmesa.old.mk"
-.include "../libglsl.old.mk"
+.include "../libmesa${OLD_SUFFIX}.mk"
+.include "../libglsl${OLD_SUFFIX}.mk"
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 SRCS+=	streaming-load-memcpy.c
@@ -460,7 +460,7 @@ CPPFLAGS.isl_tiled_memcpy_sse41.c+=	-mss
 
 CFLAGS+= ${${ACTIVE_CC} == "clang":? -Wno-error=atomic-alignment :}
 
-.include "../driver.mk"
+.include "../driver${OLD_SUFFIX}.mk"
 
 .for _d in ${DRIVERS}
 SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR} 
@@ -474,7 +474,7 @@ SYMLINKS+= mesa_dri_drivers.so.${SHLIB_M
 
 PKGCONFIG=	dri
 PKGDIST.dri=	${X11SRCDIR.Mesa}/../src/pkgconfig
-.include "${.CURDIR}/../libGL/mesa-ver.mk"
+.include "${.CURDIR}/../libGL${OLD_SUFFIX}/mesa-ver.mk"
 PKGCONFIG_VERSION.dri=	${MESA_VER}
 
 # XXX remove these from bsd.x11.mk

Index: src/external/mit/xorg/lib/gallium.old/Makefile
diff -u src/external/mit/xorg/lib/gallium.old/Makefile:1.5 src/external/mit/xorg/lib/gallium.old/Makefile:1.6
--- src/external/mit/xorg/lib/gallium.old/Makefile:1.5	Tue Feb  7 06:19:03 2023
+++ src/external/mit/xorg/lib/gallium.old/Makefile	Sat Jul 15 21:24:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/02/07 06:19:03 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/07/15 21:24:46 rjs Exp $
 
 # Transparent struct/union broken
 NOLINT=yes
@@ -1133,7 +1133,7 @@ CPPFLAGS+=	${CPPFLAGS.${XORG_MACHINE_ARC
 CPPFLAGS.r600_pipe_common.c+=	-DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
 CPPFLAGS.si_get.c+=	-DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
 
-.include "../driver.mk"
+.include "../driver${OLD_SUFFIX}.mk"
 
 
 .PATH: ${X11SRCDIR.Mesa}/src/gallium/targets/dri

Index: src/external/mit/xorg/lib/libGL.old/Makefile
diff -u src/external/mit/xorg/lib/libGL.old/Makefile:1.4 src/external/mit/xorg/lib/libGL.old/Makefile:1.5

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sat Jul 15 21:24:47 UTC 2023

Modified Files:
src/external/mit/xorg/lib: Makefile 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
src/external/mit/xorg/lib/libgbm.old: Makefile
src/external/mit/xorg/lib/libglapi.old: Makefile

Log Message:
Fixup more references to "old" components.

ok mrg@.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libmesa.old.mk
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri.old/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/gallium.old/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libGL.old/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libgbm.old/Makefile
cvs rdiff -u -r1.2 -r1.3 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.

CVS commit: src/external/apache2/llvm/librt

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sat Jul 15 21:14:01 UTC 2023

Modified Files:
src/external/apache2/llvm/librt: Makefile
Added Files:
src/external/apache2/llvm/librt/libLLVMAMDGPUDisassembler: Makefile

Log Message:
Add AMDGPUDisassembler to LLVM runtime.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/apache2/llvm/librt/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/apache2/llvm/librt/libLLVMAMDGPUDisassembler/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/apache2/llvm/librt/Makefile
diff -u src/external/apache2/llvm/librt/Makefile:1.4 src/external/apache2/llvm/librt/Makefile:1.5
--- src/external/apache2/llvm/librt/Makefile:1.4	Sun May 30 01:56:58 2021
+++ src/external/apache2/llvm/librt/Makefile	Sat Jul 15 21:14:01 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2021/05/30 01:56:58 joerg Exp $
+#	$NetBSD: Makefile,v 1.5 2023/07/15 21:14:01 rjs Exp $
 
 .include 
 
@@ -92,6 +92,7 @@ SUBDIR+= \
 	libLLVMAMDGPUMCTargetDesc \
 	libLLVMAMDGPUTargetInfo \
 	libLLVMAMDGPUAsmParser \
+	libLLVMAMDGPUDisassembler \
 	libLLVMAMDGPUUtils
 .endif
 

Added files:

Index: src/external/apache2/llvm/librt/libLLVMAMDGPUDisassembler/Makefile
diff -u /dev/null src/external/apache2/llvm/librt/libLLVMAMDGPUDisassembler/Makefile:1.1
--- /dev/null	Sat Jul 15 21:14:01 2023
+++ src/external/apache2/llvm/librt/libLLVMAMDGPUDisassembler/Makefile	Sat Jul 15 21:14:01 2023
@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2023/07/15 21:14:01 rjs Exp $
+
+.include 

CVS commit: src/external/apache2/llvm/librt

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sat Jul 15 21:14:01 UTC 2023

Modified Files:
src/external/apache2/llvm/librt: Makefile
Added Files:
src/external/apache2/llvm/librt/libLLVMAMDGPUDisassembler: Makefile

Log Message:
Add AMDGPUDisassembler to LLVM runtime.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/apache2/llvm/librt/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/apache2/llvm/librt/libLLVMAMDGPUDisassembler/Makefile

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

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Thu Sep 29 18:58:04 UTC 2022

Modified Files:
src/external/mit/xorg/lib/dri.old: Makefile
src/external/mit/xorg/lib/gallium.old: Makefile
src/external/mit/xorg/lib/libGL.old: Makefile
src/external/mit/xorg/lib/libgbm.old: Makefile

Log Message:
Only include other "old" makefiles from old MesaLib ones. Ok @mrg.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri.old/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/gallium.old/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libGL.old/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libgbm.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/dri.old/Makefile
diff -u src/external/mit/xorg/lib/dri.old/Makefile:1.3 src/external/mit/xorg/lib/dri.old/Makefile:1.4
--- src/external/mit/xorg/lib/dri.old/Makefile:1.3	Mon Dec 13 20:53:22 2021
+++ src/external/mit/xorg/lib/dri.old/Makefile	Thu Sep 29 18:58:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/12/13 20:53:22 christos Exp $
+# $NetBSD: Makefile,v 1.4 2022/09/29 18:58:04 rjs Exp $
 
 # Link the mesa_dri_drivers mega driver.
 
@@ -438,8 +438,8 @@ LIBDPLIBS+= 	drm_intel	${.CURDIR}/../lib
 LIBDPLIBS+= 	drm_radeon	${.CURDIR}/../libdrm_radeon
 
 MESA_SRC_MODULES=  main math math_xform vbo tnl swrast ss common asm_c program asm_s
-.include "../libmesa.mk"
-.include "../libglsl.mk"
+.include "../libmesa.old.mk"
+.include "../libglsl.old.mk"
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 SRCS+=	streaming-load-memcpy.c

Index: src/external/mit/xorg/lib/gallium.old/Makefile
diff -u src/external/mit/xorg/lib/gallium.old/Makefile:1.3 src/external/mit/xorg/lib/gallium.old/Makefile:1.4
--- src/external/mit/xorg/lib/gallium.old/Makefile:1.3	Tue Dec 14 21:37:06 2021
+++ src/external/mit/xorg/lib/gallium.old/Makefile	Thu Sep 29 18:58:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/12/14 21:37:06 christos Exp $
+# $NetBSD: Makefile,v 1.4 2022/09/29 18:58:04 rjs Exp $
 
 # Transparent struct/union broken
 NOLINT=yes
@@ -952,7 +952,7 @@ CPPFLAGS.${_s}+= -I${X11SRCDIR.Mesa}/src
 #SRCS+=	${GALLIUM_SOURCES.${_d}}
 #. endif
 
-.include "../libloader.mk"
+.include "../libloader.old.mk"
 
 .if ${BUILD_RADEON} == 1
 CFLAGS+=	-pthread
@@ -1108,8 +1108,8 @@ MESA_SRC_MODULES=  main math vbo state_t
 MESA_SRC_MODULES+= amd
 .endif
 
-.include "../libmesa.mk"
-.include "../libglsl.mk"
+.include "../libmesa.old.mk"
+.include "../libglsl.old.mk"
 
 # Special addition for just gallium; it misses the rest of asm_c files.
 .PATH: ${X11SRCDIR.Mesa}/src/mesa/x86

Index: src/external/mit/xorg/lib/libGL.old/Makefile
diff -u src/external/mit/xorg/lib/libGL.old/Makefile:1.2 src/external/mit/xorg/lib/libGL.old/Makefile:1.3
--- src/external/mit/xorg/lib/libGL.old/Makefile:1.2	Sun Jul 11 20:53:35 2021
+++ src/external/mit/xorg/lib/libGL.old/Makefile	Thu Sep 29 18:58:04 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2021/07/11 20:53:35 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2022/09/29 18:58:04 rjs Exp $
 
 .include 
 
@@ -126,7 +126,7 @@ CPPFLAGS.${fn}= \
 
 SRCS.util+=	u_process.c
 
-.include "../libloader.mk"
+.include "../libloader.old.mk"
 
 .PATH:		${X11SRCDIR.Mesa}/src/glw
 .PATH:		${X11SRCDIR.Mesa}/include/GL

Index: src/external/mit/xorg/lib/libgbm.old/Makefile
diff -u src/external/mit/xorg/lib/libgbm.old/Makefile:1.2 src/external/mit/xorg/lib/libgbm.old/Makefile:1.3
--- src/external/mit/xorg/lib/libgbm.old/Makefile:1.2	Sun Jul 11 20:53:35 2021
+++ src/external/mit/xorg/lib/libgbm.old/Makefile	Thu Sep 29 18:58:04 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2021/07/11 20:53:35 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2022/09/29 18:58:04 rjs Exp $
 
 .include 
 
@@ -40,7 +40,7 @@ CFLAGS+=	-fno-strict-aliasing -fexceptio
 
 COPTS.gbm_dri.c+=	-Wno-error
 
-.include "../libloader.mk"
+.include "../libloader.old.mk"
 
 .PATH:	${X11SRCDIR.Mesa}/src/gbm/main
 .PATH:	${X11SRCDIR.Mesa}/src/gbm/backends/dri

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Thu Sep 29 18:58:04 UTC 2022

Modified Files:
src/external/mit/xorg/lib/dri.old: Makefile
src/external/mit/xorg/lib/gallium.old: Makefile
src/external/mit/xorg/lib/libGL.old: Makefile
src/external/mit/xorg/lib/libgbm.old: Makefile

Log Message:
Only include other "old" makefiles from old MesaLib ones. Ok @mrg.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri.old/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/gallium.old/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libGL.old/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libgbm.old/Makefile

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

CVS commit: src/sys/dev/ppbus

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sun Sep  4 15:59:08 UTC 2022

Modified Files:
src/sys/dev/ppbus: if_plip.c

Log Message:
Add standard inet headers.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ppbus/if_plip.c

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

CVS commit: src/sys/dev/ppbus

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sun Sep  4 15:59:08 UTC 2022

Modified Files:
src/sys/dev/ppbus: if_plip.c

Log Message:
Add standard inet headers.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ppbus/if_plip.c

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

Modified files:

Index: src/sys/dev/ppbus/if_plip.c
diff -u src/sys/dev/ppbus/if_plip.c:1.37 src/sys/dev/ppbus/if_plip.c:1.38
--- src/sys/dev/ppbus/if_plip.c:1.37	Fri Sep  2 23:48:10 2022
+++ src/sys/dev/ppbus/if_plip.c	Sun Sep  4 15:59:08 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_plip.c,v 1.37 2022/09/02 23:48:10 thorpej Exp $ */
+/* $NetBSD: if_plip.c,v 1.38 2022/09/04 15:59:08 rjs Exp $ */
 
 /*-
  * Copyright (c) 1997 Poul-Henning Kamp
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.37 2022/09/02 23:48:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.38 2022/09/04 15:59:08 rjs Exp $");
 
 /*
  * Parallel port TCP/IP interfaces added.  I looked at the driver from
@@ -103,8 +103,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 
 #include 
 
 #ifdef INET
+#include 
+#include 
 #include 
-/* #include  */
+#include 
 #else
 #error Cannot config lp/plip without inet
 #endif

CVS commit: src/sys/conf

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sun Jun  5 13:35:52 UTC 2022

Modified Files:
src/sys/conf: files

Log Message:
bwfm(4) uses firmload.


To generate a diff of this commit:
cvs rdiff -u -r1.1297 -r1.1298 src/sys/conf/files

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

CVS commit: src/sys/conf

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sun Jun  5 13:35:52 UTC 2022

Modified Files:
src/sys/conf: files

Log Message:
bwfm(4) uses firmload.


To generate a diff of this commit:
cvs rdiff -u -r1.1297 -r1.1298 src/sys/conf/files

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1297 src/sys/conf/files:1.1298
--- src/sys/conf/files:1.1297	Sat May  7 04:30:41 2022
+++ src/sys/conf/files	Sun Jun  5 13:35:52 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1297 2022/05/07 04:30:41 rin Exp $
+#	$NetBSD: files,v 1.1298 2022/06/05 13:35:52 rjs Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20171118
@@ -1414,7 +1414,7 @@ attach	ld at nvme with ld_nvme
 file	dev/ic/ld_nvme.c		ld_nvme
 
 # Broadcom FullMAC 802.11 driver
-device	bwfm: arp, ifnet, wlan
+device	bwfm: arp, ifnet, wlan, firmload
 file	dev/ic/bwfm.c			bwfm
 
 # QEMU Firmware Configuration (fw_cfg) device

Re: CVS import: src/sys/external/bsd/drm2/dist

[Robert Swindells]

"Taylor R Campbell" 
>Update of /cvsroot/src/sys/external/bsd/drm2/dist
>In directory ivanova.netbsd.org:/tmp/cvs-serv344
>
>Log Message:
>Import drm from Linux v5.6-rc3 (commit 
>f8788d86ab28f61f7b46eb6be375f8a726783636)
>
>drivers/gpu/drm -> sys/external/bsd/drm2/dist/drm
>include/drm -> sys/external/bsd/drm2/dist/include/drm
>include/uapi/drm-> sys/external/bsd/drm2/dist/include/uapi/drm
>
>GPL exclusions in dist/drm:
>
>- lima/
>
>GPL exclusions in dist/include/uapi/drm:
>
>- lima_drm.h

Almost all of the lima files are dual licenced, is there a reason why
they can't be imported as well?

What do you want to do with GPL only ones? We could have a tree to
mirror the bsd one in sys/external/gpl2/drm2/dist.

Re: CVS commit: src/sys

[Robert Swindells]

matthew green  wrote:
>however, i'm looking at the changes and i'm not 100% convinced
>it's safe to simply replace this file as-is.
>
> - struct v4l2_pix_format is laid out differently
> - enum v4l2_buf_type <-> u_int32_t does not seem safe, in
>   eg struct v4l2_buffer.  i *think* it may be, but it won't
>   work with eg, -fshort-enums now.
> - struct v4l2_rect width/height are now unsigned (probably ok?)
> - struct v4l2_window has a new member (global_alpha)

Both v4l2_pix_format and v4l2_window are used in a union that is
padded to 200 bytes.

Where does -fshort-enums get used ? It looks to me that it would have
broken alignment of other struct members if it had been defined.

Re: CVS commit: src/sys

[Robert Swindells]

matthew green  wrote:
>"Robert Swindells" writes:
>> Module Name: src
>> Committed By:rjs
>> Date:Mon Aug 10 19:27:28 UTC 2020
>> 
>> Modified Files:
>>  src/sys/dev: video.c
>>  src/sys/dev/usb: uvideo.c
>>  src/sys/sys: videoio.h
>> 
>> Log Message:
>> Add some extra V4L ioctl() requests to latest V4L userland to work.
>> 
>> Import sys/videoio.h from OpenBSD, this is just the Linux headers
>> concatenated together.
>
>this seems very problematic in that you've added GPLv2 code
>into src/sys/sys.

It isn't GPLv2, it is dual licenced.

The header was copied from OpenBSD.

>please revert.

The change was discussed on tech-kern.

>also, these updates to video(4) don't require a kernel bump
>so please revert that too.

They change structures that are passed into the kernel.

Re: CVS commit: src [llvm]

[Robert Swindells]

Building aarch64 using gcc I get this:

In file included from /u1/src/external/apache2/llvm/librt/libLLVMAnalysis/../../
lib/../dist/llvm/include/llvm/IR/Attributes.h:22,
 from /u1/src/external/apache2/llvm/librt/libLLVMAnalysis/../../
lib/../dist/llvm/include/llvm/IR/CallSite.h:31,
 from /u1/src/external/apache2/llvm/librt/libLLVMAnalysis/../../
lib/../dist/llvm/include/llvm/Analysis/ValueTracking.h:20,
 from /u1/src/external/apache2/llvm/librt/libLLVMAnalysis/../../
lib/../dist/llvm/lib/Analysis/ValueTracking.cpp:14:
In member function 'size_t llvm::StringRef::find(char, size_t) const',
inlined from 'bool llvm::getConstantStringInfo(const llvm::Value*, llvm::Str
ingRef&, uint64_t, bool)' at /u1/src/external/apache2/llvm/librt/libLLVMAnalysis
/../../lib/../dist/llvm/lib/Analysis/ValueTracking.cpp:3580:39:
/u1/src/external/apache2/llvm/librt/libLLVMAnalysis/../../lib/../dist/llvm/inclu
de/llvm/ADT/StringRef.h:309:37: error: 'void* memchr(const void*, int, size_t)'
specified size 18446744073709551615 exceeds maximum object size 9223372036854775
807 [-Werror=stringop-overflow=]
 if (const void *P = ::memchr(Data + FindBegin, C, Length - FindBegin))
 ^

The 18446744073709551615 value is .

Have built with MKLLVMRT=no for now.

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Tue Aug 27 19:23:23 UTC 2019

Modified Files:
src/external/gpl3/binutils/dist/bfd: ChangeLog elf32-arm.c
src/external/gpl3/binutils/dist/include: ChangeLog
src/external/gpl3/binutils/dist/include/elf: arm.h

Log Message:
Fix to PR port-arm/54159.

From:



Pullup -9


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/binutils/dist/bfd/ChangeLog
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/binutils/dist/bfd/elf32-arm.c
cvs rdiff -u -r1.1.1.8 -r1.2 \
src/external/gpl3/binutils/dist/include/ChangeLog
cvs rdiff -u -r1.1.1.7 -r1.2 \
src/external/gpl3/binutils/dist/include/elf/arm.h

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

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

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Tue Aug 27 19:23:23 UTC 2019

Modified Files:
src/external/gpl3/binutils/dist/bfd: ChangeLog elf32-arm.c
src/external/gpl3/binutils/dist/include: ChangeLog
src/external/gpl3/binutils/dist/include/elf: arm.h

Log Message:
Fix to PR port-arm/54159.

From:



Pullup -9


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/binutils/dist/bfd/ChangeLog
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/binutils/dist/bfd/elf32-arm.c
cvs rdiff -u -r1.1.1.8 -r1.2 \
src/external/gpl3/binutils/dist/include/ChangeLog
cvs rdiff -u -r1.1.1.7 -r1.2 \
src/external/gpl3/binutils/dist/include/elf/arm.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/binutils/dist/bfd/ChangeLog
diff -u src/external/gpl3/binutils/dist/bfd/ChangeLog:1.11 src/external/gpl3/binutils/dist/bfd/ChangeLog:1.12
--- src/external/gpl3/binutils/dist/bfd/ChangeLog:1.11	Wed Nov  7 01:13:51 2018
+++ src/external/gpl3/binutils/dist/bfd/ChangeLog	Tue Aug 27 19:23:22 2019
@@ -1,3 +1,11 @@
+2019-08-22  Alan Modra  
+
+	* elf32-arm.c (cmse_scan): Don't use ARM_GET_SYM_CMSE_SPCL,
+	instead recognize CMSE_PREFIX in symbol name.
+	(elf32_arm_gc_mark_extra_sections): Likewise.
+	(elf32_arm_filter_cmse_symbols): Don't test ARM_GET_SYM_CMSE_SPCL.
+	(elf32_arm_swap_symbol_in): Don't invoke ARM_SET_SYM_CMSE_SPCL.
+
 2018-07-18  Nick Clifton  
 
 	2.31.1 Release point.

Index: src/external/gpl3/binutils/dist/bfd/elf32-arm.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-arm.c:1.14 src/external/gpl3/binutils/dist/bfd/elf32-arm.c:1.15
--- src/external/gpl3/binutils/dist/bfd/elf32-arm.c:1.14	Sun May  5 21:49:53 2019
+++ src/external/gpl3/binutils/dist/bfd/elf32-arm.c	Tue Aug 27 19:23:22 2019
@@ -5930,12 +5930,12 @@ cmse_scan (bfd *input_bfd, struct elf32_
   if (i < ext_start)
 	{
 	  cmse_sym = _syms[i];
-	  /* Not a special symbol.  */
-	  if (!ARM_GET_SYM_CMSE_SPCL (cmse_sym->st_target_internal))
-	continue;
 	  sym_name = bfd_elf_string_from_elf_section (input_bfd,
 		  symtab_hdr->sh_link,
 		  cmse_sym->st_name);
+	  if (!sym_name || !CONST_STRNEQ (sym_name, CMSE_PREFIX))
+	continue;
+
 	  /* Special symbol with local binding.  */
 	  cmse_invalid = TRUE;
 	}
@@ -5943,9 +5943,7 @@ cmse_scan (bfd *input_bfd, struct elf32_
 	{
 	  cmse_hash = elf32_arm_hash_entry (sym_hashes[i - ext_start]);
 	  sym_name = (char *) cmse_hash->root.root.root.string;
-
-	  /* Not a special symbol.  */
-	  if (!ARM_GET_SYM_CMSE_SPCL (cmse_hash->root.target_internal))
+	  if (!CONST_STRNEQ (sym_name, CMSE_PREFIX))
 	continue;
 
 	  /* Special symbol has incorrect binding or type.  */
@@ -15713,7 +15711,8 @@ elf32_arm_gc_mark_extra_sections (struct
 
 		  /* Assume it is a special symbol.  If not, cmse_scan will
 		 warn about it and user can do something about it.  */
-		  if (ARM_GET_SYM_CMSE_SPCL (cmse_hash->root.target_internal))
+		  if (CONST_STRNEQ (cmse_hash->root.root.root.string,
+CMSE_PREFIX))
 		{
 		  cmse_sec = cmse_hash->root.root.u.def.section;
 		  if (!cmse_sec->gc_mark
@@ -18303,9 +18302,6 @@ elf32_arm_filter_cmse_symbols (bfd *abfd
 	  || cmse_hash->root.type != STT_FUNC)
 	continue;
 
-  if (!ARM_GET_SYM_CMSE_SPCL (cmse_hash->root.target_internal))
-	continue;
-
   syms[dst_count++] = sym;
 }
   free (cmse_name);
@@ -19628,9 +19624,6 @@ elf32_arm_swap_symbol_in (bfd * abfd,
 			  const void *pshn,
 			  Elf_Internal_Sym *dst)
 {
-  Elf_Internal_Shdr *symtab_hdr;
-  const char *name = NULL;
-
   if (!bfd_elf32_swap_symbol_in (abfd, psrc, pshn, dst))
 return FALSE;
   dst->st_target_internal = 0;
@@ -19659,13 +19652,6 @@ elf32_arm_swap_symbol_in (bfd * abfd,
   else
 ARM_SET_SYM_BRANCH_TYPE (dst->st_target_internal, ST_BRANCH_UNKNOWN);
 
-  /* Mark CMSE special symbols.  */
-  symtab_hdr = & elf_symtab_hdr (abfd);
-  if (symtab_hdr->sh_size && dst->st_size != 0)
-name = bfd_elf_sym_name (abfd, symtab_hdr, dst, NULL);
-  if (name && CONST_STRNEQ (name, CMSE_PREFIX))
-ARM_SET_SYM_CMSE_SPCL (dst->st_target_internal);
-
   return TRUE;
 }
 

Index: src/external/gpl3/binutils/dist/include/ChangeLog
diff -u src/external/gpl3/binutils/dist/include/ChangeLog:1.1.1.8 src/external/gpl3/binutils/dist/include/ChangeLog:1.2
--- src/external/gpl3/binutils/dist/include/ChangeLog:1.1.1.8	Tue Nov  6 21:18:33 2018
+++ src/external/gpl3/binutils/dist/include/ChangeLog	Tue Aug 27 19:23:22 2019
@@ -1,3 +1,7 @@
+2019-08-22  Alan Modra  
+
+	* elf/arm.h (ARM_GET_SYM_CMSE_SPCL, ARM_SET_SYM_CMSE_SPCL): Delete.
+
 2018-07-18  Nick Clifton  
 
 	2.31.1 Release point.

Index: src/external/gpl3/binutils/dist/include/elf/arm.h
diff -u src/external/gpl3/binutils/dist/include/elf/arm.h:1.1.1.7 

CVS commit: src/sys/netinet

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Tue Aug 13 19:55:40 UTC 2019

Modified Files:
src/sys/netinet: sctp_crc32.c sctp_crc32.h sctputil.c

Log Message:
Remove unused checksum code.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/sctp_crc32.c
cvs rdiff -u -r1.1 -r1.2 src/sys/netinet/sctp_crc32.h
cvs rdiff -u -r1.14 -r1.15 src/sys/netinet/sctputil.c

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

Modified files:

Index: src/sys/netinet/sctp_crc32.c
diff -u src/sys/netinet/sctp_crc32.c:1.2 src/sys/netinet/sctp_crc32.c:1.3
--- src/sys/netinet/sctp_crc32.c:1.2	Fri Aug 12 19:08:54 2016
+++ src/sys/netinet/sctp_crc32.c	Tue Aug 13 19:55:40 2019
@@ -1,5 +1,5 @@
 /*	$KAME: sctp_crc32.c,v 1.12 2005/03/06 16:04:17 itojun Exp $	*/
-/*	$NetBSD: sctp_crc32.c,v 1.2 2016/08/12 19:08:54 jdolecek Exp $ */
+/*	$NetBSD: sctp_crc32.c,v 1.3 2019/08/13 19:55:40 rjs Exp $ */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sctp_crc32.c,v 1.2 2016/08/12 19:08:54 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_crc32.c,v 1.3 2019/08/13 19:55:40 rjs Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sctp.h"
@@ -43,8 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: sctp_crc32.c
 #include 
 #include 
 
-#ifndef SCTP_USE_ADLER32
-
 #define SCTP_CRC32C_POLY 0x1EDC6F41
 #define SCTP_CRC32C(c, d) (c = ((c) >> 8) ^ sctp_crc_c[((c) ^ (d)) & 0xFF])
 
@@ -181,4 +179,3 @@ sctp_csum_finalize(u_int32_t crc32c)
 	return (crc32c);
 }
 
-#endif

Index: src/sys/netinet/sctp_crc32.h
diff -u src/sys/netinet/sctp_crc32.h:1.1 src/sys/netinet/sctp_crc32.h:1.2
--- src/sys/netinet/sctp_crc32.h:1.1	Tue Oct 13 21:28:35 2015
+++ src/sys/netinet/sctp_crc32.h	Tue Aug 13 19:55:40 2019
@@ -1,5 +1,5 @@
 /*	$KAME: sctp_crc32.h,v 1.5 2004/08/17 04:06:16 itojun Exp $	*/
-/*	$NetBSD: sctp_crc32.h,v 1.1 2015/10/13 21:28:35 rjs Exp $ */
+/*	$NetBSD: sctp_crc32.h,v 1.2 2019/08/13 19:55:40 rjs Exp $ */
 
 #ifndef __SCTP_CRC32C_H__
 #define __SCTP_CRC32C_H__
@@ -38,12 +38,10 @@
 
 #include 
 
-#ifndef SCTP_USE_ADLER32
 #if defined(_KERNEL)
 u_int32_t update_crc32(u_int32_t, unsigned char *, unsigned int);
 
 u_int32_t sctp_csum_finalize(u_int32_t);
 
 #endif /* _KERNEL */
-#endif /* !SCTP_USE_ADLER32 */
 #endif /* __SCTP_CRC32C_H__ */

Index: src/sys/netinet/sctputil.c
diff -u src/sys/netinet/sctputil.c:1.14 src/sys/netinet/sctputil.c:1.15
--- src/sys/netinet/sctputil.c:1.14	Thu Nov  8 06:34:40 2018
+++ src/sys/netinet/sctputil.c	Tue Aug 13 19:55:40 2019
@@ -1,5 +1,5 @@
 /*	$KAME: sctputil.c,v 1.39 2005/06/16 20:54:06 jinmei Exp $	*/
-/*	$NetBSD: sctputil.c,v 1.14 2018/11/08 06:34:40 msaitoh Exp $	*/
+/*	$NetBSD: sctputil.c,v 1.15 2019/08/13 19:55:40 rjs Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sctputil.c,v 1.14 2018/11/08 06:34:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctputil.c,v 1.15 2019/08/13 19:55:40 rjs Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1572,47 +1572,6 @@ sctp_timer_stop(int t_type, struct sctp_
 	return (0);
 }
 
-#ifdef SCTP_USE_ADLER32
-static uint32_t
-update_adler32(uint32_t adler, uint8_t *buf, int32_t len)
-{
-	u_int32_t s1 = adler & 0x;
-	u_int32_t s2 = (adler >> 16) & 0x;
-	int n;
-
-	for (n = 0; n < len; n++, buf++) {
-		/* s1 = (s1 + buf[n]) % BASE */
-		/* first we add */
-		s1 = (s1 + *buf);
-		/*
-		 * now if we need to, we do a mod by subtracting. It seems
-		 * a bit faster since I really will only ever do one subtract
-		 * at the MOST, since buf[n] is a max of 255.
-		 */
-		if (s1 >= SCTP_ADLER32_BASE) {
-			s1 -= SCTP_ADLER32_BASE;
-		}
-		/* s2 = (s2 + s1) % BASE */
-		/* first we add */
-		s2 = (s2 + s1);
-		/*
-		 * again, it is more efficent (it seems) to subtract since
-		 * the most s2 will ever be is (BASE-1 + BASE-1) in the worse
-		 * case. This would then be (2 * BASE) - 2, which will still
-		 * only do one subtract. On Intel this is much better to do
-		 * this way and avoid the divide. Have not -pg'd on sparc.
-		 */
-		if (s2 >= SCTP_ADLER32_BASE) {
-			s2 -= SCTP_ADLER32_BASE;
-		}
-	}
-	/* Return the adler32 of the bytes buf[0..len-1] */
-	return ((s2 << 16) + s1);
-}
-
-#endif
-
-
 u_int32_t
 sctp_calculate_len(struct mbuf *m)
 {
@@ -1626,31 +1585,6 @@ sctp_calculate_len(struct mbuf *m)
 	return (tlen);
 }
 
-#if defined(SCTP_WITH_NO_CSUM)
-
-uint32_t
-sctp_calculate_sum(struct mbuf *m, int32_t *pktlen, uint32_t offset)
-{
-	/*
-	 * given a mbuf chain with a packetheader offset by 'offset'
-	 * pointing at a sctphdr (with csum set to 0) go through
-	 * the chain of m_next's and calculate the SCTP checksum.
-	 * This is currently Adler32 but will change to CRC32x
-	 * soon. Also has a side bonus calculate the total length
-	 * of the mbuf chain.
-	 * Note: if offset is greater than the total mbuf length,
-	 

CVS commit: src/sys/netinet

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Tue Aug 13 19:55:40 UTC 2019

Modified Files:
src/sys/netinet: sctp_crc32.c sctp_crc32.h sctputil.c

Log Message:
Remove unused checksum code.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/sctp_crc32.c
cvs rdiff -u -r1.1 -r1.2 src/sys/netinet/sctp_crc32.h
cvs rdiff -u -r1.14 -r1.15 src/sys/netinet/sctputil.c

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

CVS commit: src

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sun Jul 21 12:15:14 UTC 2019

Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/freetype/freetype: Makefile

Log Message:
Add ftcolor.h to build from freetype2.


To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.23 -r1.24 \
src/external/mit/xorg/lib/freetype/freetype/Makefile

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

CVS commit: src

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sun Jul 21 12:15:14 UTC 2019

Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/freetype/freetype: Makefile

Log Message:
Add ftcolor.h to build from freetype2.


To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.23 -r1.24 \
src/external/mit/xorg/lib/freetype/freetype/Makefile

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

Modified files:

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.209 src/distrib/sets/lists/xcomp/mi:1.210
--- src/distrib/sets/lists/xcomp/mi:1.209	Tue Jul  9 22:17:33 2019
+++ src/distrib/sets/lists/xcomp/mi	Sun Jul 21 12:15:13 2019
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.209 2019/07/09 22:17:33 mrg Exp $
+#	 $NetBSD: mi,v 1.210 2019/07/21 12:15:13 rjs Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -581,6 +581,7 @@
 ./usr/X11R7/include/freetype2/freetype/ftcffdrv.h	-unknown-	obsolete
 ./usr/X11R7/include/freetype2/freetype/ftchapters.h	-unknown-	xorg
 ./usr/X11R7/include/freetype2/freetype/ftcid.h		-unknown-	xorg
+./usr/X11R7/include/freetype2/freetype/ftcolor.h	-unknown-	xorg
 ./usr/X11R7/include/freetype2/freetype/ftdriver.h		-unknown-	xorg
 ./usr/X11R7/include/freetype2/freetype/fterrdef.h	-unknown-	xorg
 ./usr/X11R7/include/freetype2/freetype/fterrors.h	-unknown-	xorg

Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.23 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.24
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.23	Wed May  9 07:28:44 2018
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile	Sun Jul 21 12:15:14 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2018/05/09 07:28:44 maya Exp $
+#	$NetBSD: Makefile,v 1.24 2019/07/21 12:15:14 rjs Exp $
 
 .include 
 
@@ -9,7 +9,8 @@ SUBDIR=	config
 INCSDIR=${X11INCDIR}/freetype2/freetype
 
 INCS=	freetype.h ftadvanc.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h \
-	ftchapters.h ftcid.h ftdriver.h fterrdef.h fterrors.h ftfntfmt.h ftgasp.h \
+	ftchapters.h ftcid.h ftcolor.h ftdriver.h fterrdef.h fterrors.h \
+	ftfntfmt.h ftgasp.h \
 	ftglyph.h ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h \
 	ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h \
 	ftparams.h ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h \

CVS commit: src/sys

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Tue Jun 25 15:33:56 UTC 2019

Modified Files:
src/sys/kern: compat_stub.c
src/sys/netinet: sctp_asconf.c sctp_asconf.h sctp_usrreq.c
src/sys/netinet6: sctp6_usrreq.c
Added Files:
src/sys/netinet: sctp_route.h

Log Message:
Split out the prototypes for add/delete address into a separate header file.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/kern/compat_stub.c
cvs rdiff -u -r1.11 -r1.12 src/sys/netinet/sctp_asconf.c
cvs rdiff -u -r1.3 -r1.4 src/sys/netinet/sctp_asconf.h
cvs rdiff -u -r0 -r1.1 src/sys/netinet/sctp_route.h
cvs rdiff -u -r1.18 -r1.19 src/sys/netinet/sctp_usrreq.c
cvs rdiff -u -r1.19 -r1.20 src/sys/netinet6/sctp6_usrreq.c

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

CVS commit: src/sys/netinet

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sat Jun  8 23:23:34 UTC 2019

Modified Files:
src/sys/netinet: sctp_asconf.h sctp_pcb.h

Log Message:
Don't need 'extern' for function prototypes.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/sctp_asconf.h
cvs rdiff -u -r1.1 -r1.2 src/sys/netinet/sctp_pcb.h

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

Modified files:

Index: src/sys/netinet/sctp_asconf.h
diff -u src/sys/netinet/sctp_asconf.h:1.2 src/sys/netinet/sctp_asconf.h:1.3
--- src/sys/netinet/sctp_asconf.h:1.2	Sun Feb 24 17:01:52 2019
+++ src/sys/netinet/sctp_asconf.h	Sat Jun  8 23:23:34 2019
@@ -1,5 +1,5 @@
 /*	$KAME: sctp_asconf.h,v 1.8 2005/03/06 16:04:16 itojun Exp $	*/
-/*	$NetBSD: sctp_asconf.h,v 1.2 2019/02/24 17:01:52 kamil Exp $ */
+/*	$NetBSD: sctp_asconf.h,v 1.3 2019/06/08 23:23:34 rjs Exp $ */
 
 #ifndef _NETINET_SCTP_ASCONF_H_
 #define _NETINET_SCTP_ASCONF_H_
@@ -43,29 +43,29 @@ struct sockaddr;
 struct sctp_inpcb;
 struct sctp_asconf_ack_chunk;
 
-extern void sctp_asconf_cleanup(struct sctp_tcb *, struct sctp_nets *);
+void sctp_asconf_cleanup(struct sctp_tcb *, struct sctp_nets *);
 
-extern struct mbuf *sctp_compose_asconf(struct sctp_tcb *);
+struct mbuf *sctp_compose_asconf(struct sctp_tcb *);
 
-extern void sctp_handle_asconf(struct mbuf *, unsigned int, struct sctp_asconf_chunk *,
+void sctp_handle_asconf(struct mbuf *, unsigned int, struct sctp_asconf_chunk *,
 	struct sctp_tcb *, struct sctp_nets *);
 
-extern void sctp_handle_asconf_ack(struct mbuf *, int,
+void sctp_handle_asconf_ack(struct mbuf *, int,
 	struct sctp_asconf_ack_chunk *, struct sctp_tcb *, struct sctp_nets *);
 
-extern uint32_t sctp_addr_mgmt_ep_sa(struct sctp_inpcb *, struct sockaddr *,
+uint32_t sctp_addr_mgmt_ep_sa(struct sctp_inpcb *, struct sockaddr *,
 	uint16_t);
 
-extern void sctp_add_ip_address(struct ifaddr *);
+void sctp_add_ip_address(struct ifaddr *);
 
-extern void sctp_delete_ip_address(struct ifaddr *);
+void sctp_delete_ip_address(struct ifaddr *);
 
-extern int32_t sctp_set_primary_ip_address_sa(struct sctp_tcb *,
+int32_t sctp_set_primary_ip_address_sa(struct sctp_tcb *,
 	struct sockaddr *);
 
-extern void sctp_set_primary_ip_address(struct ifaddr *);
+void sctp_set_primary_ip_address(struct ifaddr *);
 
-extern void sctp_check_address_list(struct sctp_tcb *, struct mbuf *, int, int,
+void sctp_check_address_list(struct sctp_tcb *, struct mbuf *, int, int,
 	struct sockaddr *, uint16_t, uint16_t, uint16_t, uint16_t);
 
 #endif /* _KERNEL */

Index: src/sys/netinet/sctp_pcb.h
diff -u src/sys/netinet/sctp_pcb.h:1.1 src/sys/netinet/sctp_pcb.h:1.2
--- src/sys/netinet/sctp_pcb.h:1.1	Tue Oct 13 21:28:35 2015
+++ src/sys/netinet/sctp_pcb.h	Sat Jun  8 23:23:34 2019
@@ -1,5 +1,5 @@
 /*	$KAME: sctp_pcb.h,v 1.21 2005/07/16 01:18:47 suz Exp $	*/
-/*	$NetBSD: sctp_pcb.h,v 1.1 2015/10/13 21:28:35 rjs Exp $ */
+/*	$NetBSD: sctp_pcb.h,v 1.2 2019/06/08 23:23:34 rjs Exp $ */
 
 #ifndef __SCTP_PCB_H__
 #define __SCTP_PCB_H__
@@ -754,7 +754,7 @@ int
 sctp_initiate_iterator(asoc_func af, uint32_t, uint32_t, void *, uint32_t,
 		   end_func ef, struct sctp_inpcb *);
 
-extern void in6_sin6_2_sin (struct sockaddr_in *,
+void in6_sin6_2_sin (struct sockaddr_in *,
 struct sockaddr_in6 *sin6);
 
 #endif /* _KERNEL */

CVS commit: src/sys/netinet

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sat Jun  8 23:23:34 UTC 2019

Modified Files:
src/sys/netinet: sctp_asconf.h sctp_pcb.h

Log Message:
Don't need 'extern' for function prototypes.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/sctp_asconf.h
cvs rdiff -u -r1.1 -r1.2 src/sys/netinet/sctp_pcb.h

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

Re: CVS commit: src

[Robert Swindells]

"matthew green"  wrote:
>Module Name:src
>Committed By:   mrg
>Date:   Sun Jun  2 11:35:55 UTC 2019
>
>Modified Files:
>src/external/mit/xorg/lib/gallium: Makefile
>src/share/mk: bsd.own.mk
>
>Log Message:
>fix building x86 with X11 but not LLVM:
>
>- change the defaults for MKLLVMRT and MKX11 so we don't have to
>  force-override later.  this makes "build.sh -V MKLLVMRT=no"
>  work to disable building the LLVM Mesa components.
>
>- in gallium, don't BUILD_RADEON if MKLLVMRT is no.
>
>this stops GL from working, but basic X seems OK enough for Xvideo
>to still work on modern radeon (ie, video mostly works fine, though
>eg, "mpv -vo gpu" won't.  use "mpv -vo xv".)

This change seems to have broken postinstall(8) when it is run from the
command line.

I'm guessing it is because MKX11 is now used before the _MKVARS section.

Re: CVS commit: src/sys/dev/usb

[Robert Swindells]

Rin Okuyama  wrote:
>I tested StarTech USB21000S2 with Pine A64+. It works well
>with multiple outstanding transfers. If I understand correctly,
>Pine A64+ and Pinebook have (almost?) same SoC. If so, there
>should be the problem elsewhere than host controller itself.
>
>Robert, could you please test it with powered USB hub when
>you have a time?

I don't own a USB hub, I would not want to have to use one with
the Pinebook.

Re: CVS commit: src/sys/netinet

[Robert Swindells]

Kamil Rytarowski  wrote:
>Module Name:src
>Committed By:   kamil
>Date:   Sun Feb 24 17:01:52 UTC 2019
>
>Modified Files:
>src/sys/netinet: sctp_asconf.h
>
>Log Message:
>Appease GCC7 in sctp_asconf.h
>
>Do not declare types inside function parameter list.
>Add decklarations of types before these function prototypes.

My local fix for this was to remove sctp_asconf.h from compat_stub.c and
just add prototypes for the two functions needed. This reduces the diffs
to the previous rtsock.c.

I don't think sctp_asconf.h is supposed to be used outside of network
sources.

Index: compat_stub.c
===
RCS file: /cvsroot/src/sys/kern/compat_stub.c,v
retrieving revision 1.8
diff -u -r1.8 compat_stub.c
--- compat_stub.c   5 Feb 2019 23:28:02 -   1.8
+++ compat_stub.c   24 Feb 2019 22:51:12 -
@@ -44,10 +44,6 @@
 #include 
 #endif
 
-#ifdef SCTP
-#include 
-#endif
-
 /*
  * Routine vectors for compat_50___sys_ntp_gettime
  *
@@ -71,6 +67,9 @@
  */
 
 #ifdef SCTP
+extern void sctp_add_ip_address(struct ifaddr *);
+extern void sctp_delete_ip_address(struct ifaddr *);
+
 void (*vec_sctp_add_ip_address)(struct ifaddr *) = sctp_add_ip_address;
 void (*vec_sctp_delete_ip_address)(struct ifaddr *) = sctp_delete_ip_address;
 #else

Re: CVS commit: src/sys/netinet

[Robert Swindells]

Rin Okuyama  wrote:
>Ping? Can I insert "break" here?

Sorry, yes you are correct that it should be a break.

Will commit it now.

Robert Swindells

Re: CVS commit: src/sys/dev/usb

[Robert Swindells]

On 2019-01-31 06:54, Rin Okuyama wrote:

On 2019/01/30 22:21, Robert Swindells wrote:

On 2019-01-30 11:05, Rin Okuyama wrote:

I tested a StarTech USB21000S2 adapter. It works both on RPI3B and
amd64 box with ehci(4) (ThinkPad X60). Revision is same as Z-TEK
ZE582; both have product ID of 0x7500 (LAN7500).


We don't currently read the revision number, low 16 bits of the 
register at offset

0x0 for the LAN7500, maybe worth doing.


Sorry for confusing you. I used the word "revision" for USB product ID.


The revision number of my device is "1".

Robert Swindells

Re: CVS commit: src/sys/dev/usb

[Robert Swindells]

On 2019-01-30 11:05, Rin Okuyama wrote:

I tested a StarTech USB21000S2 adapter. It works both on RPI3B and
amd64 box with ehci(4) (ThinkPad X60). Revision is same as Z-TEK
ZE582; both have product ID of 0x7500 (LAN7500).


We don't currently read the revision number, low 16 bits of the register 
at offset

0x0 for the LAN7500, maybe worth doing.

Robert Swindells

Re: CVS commit: src/sys/dev/usb

[Robert Swindells]

"Michael van Elst"  wrote:

Module Name:src
Committed By:   mlelstv
Date:   Sat Jan  5 07:56:07 UTC 2019

Modified Files:
   src/sys/dev/usb: if_mue.c if_muevar.h

Log Message:
Enable multiple outstanding transfers.

iperf3 now shows 250MBit/s for sending and 225MBit/s for receiving.


Which device was this tested on ?

It doesn't work at all for me on a LAN7500.

Robert Swindells

Re: CVS commit: src

[Robert Swindells]

m...@netbsd.org wrote:
>On Tue, Jan 01, 2019 at 04:02:01PM +0000, Robert Swindells wrote:
>> How does the usage of libLLVM from MesaLib make use of the LLVM headers
>> at *runtime* ?
>> 
>> If they are not needed at runtime then why do they need to be installed
>> on a target machine ?
>
>it doesn't need the headers at runtime. joerg is currently objecting to
>installing the llvm libraries too.

I see two build cases, with clang as the base compiler and with gcc as
the base compiler.

Your post to tech-toolchain@ earlier today looks like it only handles
having clang as the compiler.

We will also want to build a version of the LLVM libraries using gcc
when that is the base compiler, this could be configured to just contain
the GPU targets.

I'm guessing that we would need custom Makefiles for the gcc build.

Maybe use the same Makefiles with a clang build and have two copies of
LLVM, a private one for MesaLib and the public one for use by clang.

Do the headers change when used with different target (or build)
architectures, or could we generate them once and put them in CVS ? We
generate stuff for gcc.

Re: CVS commit: src

[Robert Swindells]

m...@netbsd.org wrote:
>On Tue, Jan 01, 2019 at 03:34:47PM +0100, Martin Husemann wrote:
>> On Tue, Jan 01, 2019 at 02:22:54PM +, maya%netbsd.org@localhost wrote:
>> > I'm stuck between the hammer and the anvil here.
>> > I'd like NetBSD to use a recent MesaLib, the kind that uses LLVM.
>> 
>> Can you explain how the MesaLib build uses llvm?
>> 
>> This kinda sounds like you need a special build time binary that would
>> live in $TOOLDIR and it is not exactly clear how installing some headers
>> helps building this tool (as you can not assume a NetBSD build host).
>> 
>> Martin
>
>I haven't dug up too much into it in the past, so this was fun to
>discover:
>
>MesaLib is a compiler for turning agnostic representations like GLSL and
>SPIR-V into hardware appropriate ones. It has passes and intermediate
>formats (plural!) and everything.
>
>AMD drivers use LLVM as a step in the process, they defined an AMDGPU as
>a target architecture.
>
>I'm not sure how a JIT works, but swrast uses LLVM for its JIT.
>
>at least on the pkgsrc build, swrast and radeonsi are dynamically linked
>with libLLVM.

How does the usage of libLLVM from MesaLib make use of the LLVM headers
at *runtime* ?

If they are not needed at runtime then why do they need to be installed
on a target machine ?

Re: CVS commit: src/sys/arch

[Robert Swindells]

m...@netbsd.org wrote:
>On Tue, Dec 11, 2018 at 11:34:30AM -0600, Greg Oster wrote:
>> On Tue, 11 Dec 2018 15:23:01 +
>> Robert Swindells  wrote:
>> 
>> > "Maya Rashish"  wrote:
>> > >Module Name:src
>> > >Committed By:   maya
>> > >Date:   Tue Dec 11 11:00:18 UTC 2018
>> > >
>> > >Modified Files:
>> > >src/sys/arch/amd64/conf: GENERIC
>> > >src/sys/arch/i386/conf: GENERIC
>> > >
>> > >Log Message:
>> > >disable nouveau. it hasn't been functional since the import of new
>> > >drmkms code.  
>> > 
>> > Nouveau works fine for me.
>> > 
>> > Can we at least get some more data on which GPUs don't work ?
>> 
>> drm kern info: nouveau  [  DEVICE][nouveau0] Chipset: GF108 (NVC1)
>> drm kern info: nouveau  [  DEVICE][nouveau0] Family : NVC0
>> 
>> Works great with 8.0.  Gets into a funky loop of some sort:

[snip]

>> with -current, and fails to display anything more than a black screen.
>> 
>> Additional details happily provided on request.

>My machine does this too, it does however manage to boot and I've even
>see it startx.  The monitor won't display anything though.

I see similar messages on my working system.

>Monitor is connected with DP and then a VGA adapter.

What do you see in dmesg.boot when it is trying to attach a suitable
output device ?

The equivalent stage for me is this:

...
kern info: nouveau: DRM:0039:0039: init children...
kern info: nouveau: DRM:0039:0039: init completed in 378us
nouveau0: info: DRM: MM: using M2MF for buffer copies
nouveau0: info: DRM: Calling LVDS script 6:
nouveau0: info: DRM: 0xD0D8: Parsing digital output script table
nouveau0: info: DRM: Setting dpms mode 3 on TV encoder (output 2)
nouveaufb0 at nouveau0
nouveaufb0: framebuffer at 0x800045c0d000, size 1280x800, depth 16, stride 
2560
nouveau0: info: DRM: Calling LVDS script 2:
nouveau0: info: DRM: 0xD13A: Parsing digital output script table
nouveau0: info: DRM: Calling LVDS script 5:
nouveau0: info: DRM: 0xD0B4: Parsing digital output script table
wsdisplay0 at nouveaufb0 kbdmux 1: console (default, vt100 emulation), using 
wskbd0

Re: CVS commit: src/sys/arch

[Robert Swindells]

m...@netbsd.org wrote:
>On Tue, Dec 11, 2018 at 03:23:01PM +0000, Robert Swindells wrote:
>> 
>> "Maya Rashish"  wrote:
>> >Module Name:src
>> >Committed By:   maya
>> >Date:   Tue Dec 11 11:00:18 UTC 2018
>> >
>> >Modified Files:
>> >src/sys/arch/amd64/conf: GENERIC
>> >src/sys/arch/i386/conf: GENERIC
>> >
>> >Log Message:
>> >disable nouveau. it hasn't been functional since the import of new drmkms
>> >code.
>> 
>> Nouveau works fine for me.
>> 
>> Can we at least get some more data on which GPUs don't work ?
>
>You're not even giving the data yourself

I don't own any machines that it doesn't work on.

Re: CVS commit: src/sys/arch

[Robert Swindells]

m...@netbsd.org wrote:
>On Tue, Dec 11, 2018 at 05:36:56PM +0100, Martin Husemann wrote:
>> On Tue, Dec 11, 2018 at 03:23:01PM +0000, Robert Swindells wrote:
>> > Nouveau works fine for me.
>> 
>> Seems to work fine for me too with -current:
>> 
>> pci1: i/o space, memory space enabled, rd/line, wr/inv ok
>> pci1: info: NVIDIA GF104 (0c4100a1)
>> nouveau0 at pci1 dev 0 function 0: vendor 10de product 0e22 (rev. 0xa1)
>> nouveau0: info: NVIDIA GF104 (0c4100a1)
>
>Are you sure it's not an optimus setup where nvidia failing to function
>would still look fine?

Mine isn't an optimus setup.

It is a fairly old laptop with an AMD CPU, so there isn't another
graphics controller to fall back to.

cpu0 at mainbus0 apid 0
cpu0: AMD Turion(tm) 64 Mobile Technology MT-30, id 0x20f42

pci1: i/o space, memory space enabled, rd/line, wr/inv ok
pci1: info: NVIDIA NV44 (044700a2)
nouveau0 at pci1 dev 0 function 0: vendor 10de product 0167 (rev. 0xa1)
nouveau0: info: NVIDIA NV44 (044700a2)

I did have to make one local change to the nouveau sources to get it to
work, Taylor does know about it. I added calls to printf until I could
see where things were going wrong.

Re: CVS commit: src/sys/arch

[Robert Swindells]

"Maya Rashish"  wrote:
>Module Name:src
>Committed By:   maya
>Date:   Tue Dec 11 11:00:18 UTC 2018
>
>Modified Files:
>src/sys/arch/amd64/conf: GENERIC
>src/sys/arch/i386/conf: GENERIC
>
>Log Message:
>disable nouveau. it hasn't been functional since the import of new drmkms
>code.

Nouveau works fine for me.

Can we at least get some more data on which GPUs don't work ?

Re: CVS commit: src

[Robert Swindells]

"Chuck Silvers"  wrote:
>Module Name:src
>Committed By:   chs
>Date:   Mon May 28 21:05:12 UTC 2018
>
>Modified Files:
[snip]

>src/usr.bin/kdump: Makefile.ioctl-c mkioctls

[snip]

Building with clang and MKDTRACE=no, MKCTF=no, I get:

In file included from kdump-ioctl.c:23:
In file included from /u1/src/sys/net/if.h:82:
/u1/src/sys/sys/mutex.h:155:23: error: redefinition of typedef 'kmutex_t' is a C
11 feature [-Werror,-Wtypedef-redefinition]
typedef struct kmutex kmutex_t;
  ^
kdump-ioctl.c:10:23: note: previous definition is here
typedef struct kmutex kmutex_t;
  ^

CVS commit: src/share/mk

[Robert Swindells]

Christos Zoulas  wrote:
>Module Name:src
>Committed By:   christos
>Date:   Sat Mar  3 00:22:04 UTC 2018
>
>Modified Files:
>src/share/mk: bsd.own.mk
>
>Log Message:
>switch arm to openssl-1.1

I don't think this is working, it needs to use MACHINE_CPU as the
test:

diff -u -r1.1045 bsd.own.mk
--- bsd.own.mk  5 Mar 2018 09:17:42 -   1.1045
+++ bsd.own.mk  5 Mar 2018 19:18:58 -
@@ -101,7 +101,7 @@
 # What OpenSSL is used?
 # 
 .if ${MACHINE} == "amd64" || \
-${MACHINE} == "arm" || \
+${MACHINE_CPU} == "arm" || \
 ${MACHINE} == "i386" || \
 ${MACHINE_CPU} == "powerpc" || \
 ${MACHINE_CPU} == "sh3" || \

Re: CVS commit: src/sys/netinet6

[Robert Swindells]

m...@netbsd.org wrote:
>Module Name:src
>Committed By:   maxv
>Date:   Tue Jan 30 15:54:03 UTC 2018
>
>Modified Files:
>src/sys/netinet6: in6.h ip6_input.c ip6_var.h
>
>Log Message:
>Style, localify, remove dead code, and fix typos. No functional change.

Please could we make ip6_nexthdr() global again ?

It will be used by MobileIPv6.

Robert Swindells

Re: CVS commit: src/sys/dev

[Robert Swindells]

Michael van Elst <mlel...@serpens.de> wrote:
>On Fri, Nov 03, 2017 at 09:22:36AM +0900, Takeshi Nakayama wrote:
>> errno 5 is EIO.
>> 
>> This is why we check WDF_LOADED is not set and !RAW_PART or !S_IFCHR
>> in wdopen().  WDF_LOADED is set only in wd_fistopen(), so we cannot
>> open disks unless open with RAW_PART and S_IFCHR in the first time.
>> 
>> Possible fix is remove useless check as follows or introduce
>> WDF_OPEN if we want to mimic the sd(4).
>
>Please try
>
>http://ftp.netbsd.org/pub/NetBSD/misc/mlelstv/wd.diff
>
>this is the "introduce WDF_OPEN" that is missing.

With the patch my test machine now boots.

Thanks,

Robert Swindells

Re: CVS commit: src/sys/dev

[Robert Swindells]

"Michael van Elst" <mlelstv%netbsd.org@localhost> wrote:
>Module Name:src
>Committed By:   mlelstv
>Date:   Wed Nov  1 19:34:46 UTC 2017
>
>Modified Files:
>src/sys/dev: files.dev
>src/sys/dev/ata: ata_raid_adaptec.c ata_raid_intel.c ata_raid_jmicron.c
>ata_raid_nvidia.c ata_raid_promise.c ata_raid_via.c wd.c wdvar.h
>
>Log Message:
>refactor wd and ataraid drivers to use common disk subroutines.

Should this work if wedges are not being used ?

Without any DKWEDGE_* options I now get:

...
opendisk: can't open dev wd0 (5)
opendisk: can't open dev wd0 (5)
opendisk: can't open dev wd0 (5)
boot device: 
root on wd0a dumps on wd0b
vfs_mountroot: can't open root device
cannot mount root, error = 5

Robert Swindells

Re: CVS commit: src/sys/nfs

[Robert Swindells]

Thor Lancelot Simon wrote:
Module Name:src
Committed By:   tls
Date:   Thu Sep  3 20:59:13 UTC 2009

Modified Files:
src/sys/nfs: nfs_srvsocket.c

Log Message:
Missed this file in previous commit, accidentally checked in fix to local
repository copy!  Sorry about that, folks.

I think we also need the following, not tested:

Index: smb_trantcp.c
===
RCS file: /cvsroot/src/sys/netsmb/smb_trantcp.c,v
retrieving revision 1.42
diff -u -r1.42 smb_trantcp.c
--- smb_trantcp.c   29 Mar 2009 19:21:20 -  1.42
+++ smb_trantcp.c   3 Sep 2009 23:32:25 -
@@ -127,7 +127,7 @@
 }
 
 static void
-nb_upcall(struct socket *so, void *arg, int waitflag)
+nb_upcall(struct socket *so, void *arg, int events, int waitflag)
 {
struct nbpcb *nbp = (void *)arg;
 

Re: CVS commit: src/sys/dev/dec

[Robert Swindells]

Valeriy E. Ushakov wrote:
On Tue, May 12, 2009 at 14:18:16 +, Christoph Egger wrote:

 struct device * - device_t, no functional changes intended.

Why don't you cmp(1) the objects before and after to verify that?
Same object code generated is, unlike intentions, something that can
be verified.

A fair number won't be the same, I would guess half our SCSI drivers
are currently broken.

Do a search in sys/dev/ic for 'adapt_dev', any driver that casts this
to a softc instead of calling device_private() will crash.

Robert Swindells