build libmesa_util_sse41 on all archs

swrast_dri.so had an undefined reference to util_streaming_load_memcpy
on non-x86 archs.

Part of streaming-load-memcpy.c / libmesa_util_sse41.
When USE_SSE41 is not defined, memcpy() is used.

problem noticed at runtime on arm64 by mlarkin@
with and ok tb@

8 files changed, 26 insertions, 41 deletions

diff --git a/lib/mesa/mk/Makefile b/lib/mesa/mk/Makefile
index c16e4b552..054633983 100644
--- a/lib/mesa/mk/Makefile
+++ b/lib/mesa/mk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2023/01/28 08:56:33 jsg Exp $
+#	$OpenBSD: Makefile,v 1.6 2023/03/03 06:32:18 jsg Exp $
 
 .include "config.mk"
 
@@ -10,6 +10,7 @@ SUBDIR=		include pkgconfig \
 		libmesa libmesa_format \
 		libmesa_util libmesa_util_c11 \
 		libnir libpipe_loader_static libsoftpipe \
+		libmesa_util_sse41 \
 		libswdri libswkmsdri \
 		libws_null libwsw libxmlconfig
 
@@ -18,7 +19,7 @@ SUBDIR+=	libloader_dri3_helper
 .endif
 
 .if ${WITH_SSE41} == "yes" || make(obj)
-SUBDIR+=	libmesa_sse41 libmesa_util_sse41
+SUBDIR+=	libmesa_sse41
 .endif
 
 .if ${WITH_AMD_VK} == "yes" || ${WITH_GALLIUM_RADEONSI} == "yes" || make(obj)
diff --git a/lib/mesa/mk/libEGL/Makefile b/lib/mesa/mk/libEGL/Makefile
index 609f44dd7..4f1f37467 100644
--- a/lib/mesa/mk/libEGL/Makefile
+++ b/lib/mesa/mk/libEGL/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2023/01/31 03:29:36 jsg Exp $
+#	$OpenBSD: Makefile,v 1.10 2023/03/03 06:32:18 jsg Exp $
 
 .include <bsd.xconf.mk>
 
@@ -41,13 +41,9 @@ CPPFLAGS+=	-I${MESA_SRC}/src/egl/main \
 
 LDADD+= -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,--start-group \
 	${.CURDIR}/../libmesa_util/${__objdir}/libmesa_util.a \
-	${.CURDIR}/../libmesa_format/${__objdir}/libmesa_format.a
-
-.if ${WITH_SSE41} == "yes"
-LDADD+=	${.CURDIR}/../libmesa_util_sse41/${__objdir}/libmesa_util_sse41.a
-.endif
-
-LDADD+=	${.CURDIR}/../libmesa_util_c11/${__objdir}/libmesa_util_c11.a \
+	${.CURDIR}/../libmesa_format/${__objdir}/libmesa_format.a \
+	${.CURDIR}/../libmesa_util_sse41/${__objdir}/libmesa_util_sse41.a \
+	${.CURDIR}/../libmesa_util_c11/${__objdir}/libmesa_util_c11.a \
 	-Wl,--gc-sections \
 	-lz -lm -lpthread \
 	-L${X11BASE}/lib -lX11-xcb -lX11 -lxcb -lxcb-randr -lxcb-xfixes
diff --git a/lib/mesa/mk/libGL/Makefile b/lib/mesa/mk/libGL/Makefile
index 6de6100ed..bbdd50a38 100644
--- a/lib/mesa/mk/libGL/Makefile
+++ b/lib/mesa/mk/libGL/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2023/01/29 12:20:31 jsg Exp $
+#	$OpenBSD: Makefile,v 1.8 2023/03/03 06:32:18 jsg Exp $
 
 .include <bsd.xconf.mk>
 
@@ -67,13 +67,9 @@ LDADD+=	-L${.CURDIR}/../libglapi/${__objdir} -lglapi \
 	${.CURDIR}/../libloader/${__objdir}/libloader.a \
 	${.CURDIR}/../libxmlconfig/${__objdir}/libxmlconfig.a \
 	${.CURDIR}/../libmesa_util/${__objdir}/libmesa_util.a \
-	${.CURDIR}/../libmesa_format/${__objdir}/libmesa_format.a
-
-.if ${WITH_SSE41} == "yes"
-LDADD+=${.CURDIR}/../libmesa_util_sse41/${__objdir}/libmesa_util_sse41.a
-.endif
-
-LDADD+=	-Wl,--gc-sections
+	${.CURDIR}/../libmesa_format/${__objdir}/libmesa_format.a \
+	${.CURDIR}/../libmesa_util_sse41/${__objdir}/libmesa_util_sse41.a \
+	-Wl,--gc-sections
 
 .if ${XENOCARA_BUILD_DRI3:L} == "yes"
 LDADD+=	${.CURDIR}/../libloader_dri3_helper/${__objdir}/libloader_dri3_helper.a
diff --git a/lib/mesa/mk/libOSMesa/Makefile b/lib/mesa/mk/libOSMesa/Makefile
index 7a132716e..f118bfe64 100644
--- a/lib/mesa/mk/libOSMesa/Makefile
+++ b/lib/mesa/mk/libOSMesa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2023/01/31 03:29:36 jsg Exp $
+#	$OpenBSD: Makefile,v 1.8 2023/03/03 06:32:18 jsg Exp $
 
 LIB=	OSMesa
 
@@ -26,6 +26,7 @@ obj: _xenocara_obj
 SLIBS=	libmesa \
 	libmesa_util \
 	libmesa_format \
+	libmesa_util_sse41 \
 	libmesa_util_c11 \
 	libglsl \
 	libglcpp \
@@ -36,8 +37,7 @@ SLIBS=	libmesa \
 	libsoftpipe
 
 .if ${WITH_SSE41} == "yes"
-SLIBS+=	libmesa_sse41 \
-	libmesa_util_sse41
+SLIBS+=	libmesa_sse41
 .endif
 
 .if ${WITH_LLVM} == "yes"
diff --git a/lib/mesa/mk/libgallium_dri/Makefile b/lib/mesa/mk/libgallium_dri/Makefile
index 9dd376cbb..466c41237 100644
--- a/lib/mesa/mk/libgallium_dri/Makefile
+++ b/lib/mesa/mk/libgallium_dri/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2023/01/31 03:29:36 jsg Exp $
+#	$OpenBSD: Makefile,v 1.8 2023/03/03 06:32:18 jsg Exp $
 
 LIB=	gallium_dri
 
@@ -78,6 +78,7 @@ SLIBS=	libdri \
 	libglcpp \
 	libmesa_util \
 	libmesa_format \
+	libmesa_util_sse41 \
 	libmesa_util_c11 \
 	libnir \
 	libcompiler \
@@ -93,8 +94,7 @@ SLIBS=	libdri \
 	libsoftpipe
 
 .if ${WITH_SSE41} == "yes"
-SLIBS+=	libmesa_sse41 \
-	libmesa_util_sse41
+SLIBS+=	libmesa_sse41
 .endif
 
 .if ${WITH_GALLIUM_R300} == "yes" || ${WITH_GALLIUM_R600} == "yes" || \
diff --git a/lib/mesa/mk/libgbm/Makefile b/lib/mesa/mk/libgbm/Makefile
index b8e9a3d73..5cf8549fc 100644
--- a/lib/mesa/mk/libgbm/Makefile
+++ b/lib/mesa/mk/libgbm/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2023/01/31 03:29:36 jsg Exp $
+#	$OpenBSD: Makefile,v 1.9 2023/03/03 06:32:18 jsg Exp $
 
 .include <bsd.xconf.mk>
 
@@ -23,13 +23,9 @@ LDADD+=	-Wl,--as-needed -Wl,--start-group \
 	${.CURDIR}/../libloader/${__objdir}/libloader.a \
 	${.CURDIR}/../libmesa_util/${__objdir}/libmesa_util.a \
 	${.CURDIR}/../libmesa_format/${__objdir}/libmesa_format.a \
-	${.CURDIR}/../libmesa_util_c11/${__objdir}/libmesa_util_c11.a
-
-.if ${WITH_SSE41} == "yes"
-LDADD+=${.CURDIR}/../libmesa_util_sse41/${__objdir}/libmesa_util_sse41.a
-.endif
-
-LDADD+=	${.CURDIR}/../libxmlconfig/${__objdir}/libxmlconfig.a \
+	${.CURDIR}/../libmesa_util_sse41/${__objdir}/libmesa_util_sse41.a \
+	${.CURDIR}/../libmesa_util_c11/${__objdir}/libmesa_util_c11.a \
+	${.CURDIR}/../libxmlconfig/${__objdir}/libxmlconfig.a \
 	-Wl,--gc-sections \
 	-lz -lm -lexpat -lpthread
 
diff --git a/lib/mesa/mk/libmesa_util_sse41/Makefile b/lib/mesa/mk/libmesa_util_sse41/Makefile
index 239933b4a..a42ce2ac9 100644
--- a/lib/mesa/mk/libmesa_util_sse41/Makefile
+++ b/lib/mesa/mk/libmesa_util_sse41/Makefile
@@ -1,14 +1,13 @@
-#	$OpenBSD: Makefile,v 1.1 2023/01/28 08:56:35 jsg Exp $
+#	$OpenBSD: Makefile,v 1.2 2023/03/03 06:32:18 jsg Exp $
 
 LIB=	mesa_util_sse41
 
 NOPROFILE=
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
 SRCS=		streaming-load-memcpy.c
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
 CFLAGS+=	${SSE41_ARGS}
-.else
-SRCS=
 .endif
 
 .include "../Makefile.inc"
diff --git a/lib/mesa/mk/libvulkan_radeon/Makefile b/lib/mesa/mk/libvulkan_radeon/Makefile
index 78779bd95..943105e6a 100644
--- a/lib/mesa/mk/libvulkan_radeon/Makefile
+++ b/lib/mesa/mk/libvulkan_radeon/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2023/01/28 22:09:39 jsg Exp $
+#	$OpenBSD: Makefile,v 1.10 2023/03/03 06:32:18 jsg Exp $
 
 LIB=	vulkan_radeon
 
@@ -135,15 +135,12 @@ SLIBS=	libamd_common \
 	libxmlconfig \
 	libmesa_util \
 	libmesa_format \
+	libmesa_util_sse41 \
 	libmesa_util_c11 \
 	libaco \
 	libnir \
 	libcompiler
 
-.if ${WITH_SSE41} == "yes"
-SLIBS+=	libmesa_util_sse41
-.endif
-
 LDADD+=		-Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,--start-group
 
 LDADD+=		-Wl,--whole-archive