[src/trunk]: src/external/mit/xorg/lib mesa: re-enable GLX TLS to help i386

[nia <nia%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f71bca77c050
branches:  trunk
changeset: 956485:f71bca77c050
user:      nia <nia%NetBSD.org@localhost>
date:      Sat Oct 31 13:28:22 2020 +0000

description:
mesa: re-enable GLX TLS to help i386

mesa's assembly code for i386 only seems to be position independent
when compiled with ELF TLS, so having it disabled causes worse problems
than the edge cases ELF TLS causes.

potentially the assembly code could be fixed (it looks like it not
being safe is a bug), it could also be disabled, but i don't currently
have the means to measure the impact of that.

diffstat:

 external/mit/xorg/lib/libGL/Makefile    |  6 +++---
 external/mit/xorg/lib/libglapi/Makefile |  3 ++-
 external/mit/xorg/lib/libmesa.mk        |  3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diffs (61 lines):

diff -r ac70e55e0868 -r f71bca77c050 external/mit/xorg/lib/libGL/Makefile
--- a/external/mit/xorg/lib/libGL/Makefile      Sat Oct 31 13:17:34 2020 +0000
+++ b/external/mit/xorg/lib/libGL/Makefile      Sat Oct 31 13:28:22 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.30 2020/09/16 18:19:23 nia Exp $
+#      $NetBSD: Makefile,v 1.31 2020/10/31 13:28:22 nia Exp $
 
 .include <bsd.own.mk>
 
@@ -180,7 +180,7 @@
        -DHAVE_FUNC_ATTRIBUTE_NORETURN=1 -DHAVE_ENDIAN_H=1 -DHAVE_DLADDR=1 \
        -DHAVE_CLOCK_GETTIME=1 -DHAVE_PTHREAD_PRIO_INHERIT=1 \
        -DHAVE_PTHREAD=1 -DENABLE_ST_OMX_BELLAGIO=0 -DENABLE_ST_OMX_TIZONIA=0 \
-       -DHAVE_TIMESPEC_GET
+       -DHAVE_TIMESPEC_GET -DGLX_USE_TLS
 
 .include "../asm.mk"
 
@@ -224,7 +224,7 @@
            s,@GL_PKGCONF_LIB@,GL,; \
            s,@GL_PC_LIB_PRIV@,-lm -lpthread -pthread,; \
            s,@GL_PC_CFLAGS@,,; \
-           s,@GLX_TLS@,no,"
+           s,@GLX_TLS@,yes,"
 
 
 CWARNFLAGS.clang+=     -Wno-tautological-compare -Wno-format -Wno-constant-conversion \
diff -r ac70e55e0868 -r f71bca77c050 external/mit/xorg/lib/libglapi/Makefile
--- a/external/mit/xorg/lib/libglapi/Makefile   Sat Oct 31 13:17:34 2020 +0000
+++ b/external/mit/xorg/lib/libglapi/Makefile   Sat Oct 31 13:28:22 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2020/09/16 18:19:24 nia Exp $
+#      $NetBSD: Makefile,v 1.9 2020/10/31 13:28:22 nia Exp $
 
 .include <bsd.own.mk>
 
@@ -68,6 +68,7 @@
        -DGLX_USE_DRM \
        -DGLX_INDIRECT_RENDERING \
        -DGLX_DIRECT_RENDERING \
+       -DGLX_USE_TLS \
        -DHAVE_X11_PLATFORM \
        -DHAVE_DRM_PLATFORM \
        -DENABLE_SHADER_CACHE \
diff -r ac70e55e0868 -r f71bca77c050 external/mit/xorg/lib/libmesa.mk
--- a/external/mit/xorg/lib/libmesa.mk  Sat Oct 31 13:17:34 2020 +0000
+++ b/external/mit/xorg/lib/libmesa.mk  Sat Oct 31 13:28:22 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: libmesa.mk,v 1.12 2020/09/16 18:19:23 nia Exp $
+#      $NetBSD: libmesa.mk,v 1.13 2020/10/31 13:28:22 nia Exp $
 #
 # Consumer of this Makefile should set MESA_SRC_MODULES.
 
@@ -526,6 +526,7 @@
        -DHAVE_LIBDRM -DGLX_USE_DRM \
        -DGLX_INDIRECT_RENDERING \
        -DGLX_DIRECT_RENDERING \
+       -DGLX_USE_TLS \
        -DHAVE_X11_PLATFORM \
        -DHAVE_DRM_PLATFORM \
        -DENABLE_SHADER_CACHE \