[src/trunk]: src/external/mit/xorg/lib disable use of ELF TLS in Mesa/libGL

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

details:   https://anonhg.NetBSD.org/src/rev/a786c421fbde
branches:  trunk
changeset: 1014309:a786c421fbde
user:      nia <nia%NetBSD.org@localhost>
date:      Wed Sep 16 18:19:23 2020 +0000

description:
disable use of ELF TLS in Mesa/libGL

this is an optimization that primarily benefits linux/glibc -
most other systems have this disabled. in netbsd we've tried to
patch around it to make things work, but there still appears to be
some edge cases where libGL mysteriously crashes.

discussed on tech-x11 some time ago. already in place in pkgsrc.

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, 5 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r f70f609a8233 -r a786c421fbde external/mit/xorg/lib/libGL/Makefile
--- a/external/mit/xorg/lib/libGL/Makefile      Wed Sep 16 15:04:57 2020 +0000
+++ b/external/mit/xorg/lib/libGL/Makefile      Wed Sep 16 18:19:23 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.29 2020/03/29 21:06:03 maya Exp $
+#      $NetBSD: Makefile,v 1.30 2020/09/16 18:19:23 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 -DGLX_USE_TLS
+       -DHAVE_TIMESPEC_GET
 
 .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@,yes,"
+           s,@GLX_TLS@,no,"
 
 
 CWARNFLAGS.clang+=     -Wno-tautological-compare -Wno-format -Wno-constant-conversion \
diff -r f70f609a8233 -r a786c421fbde external/mit/xorg/lib/libglapi/Makefile
--- a/external/mit/xorg/lib/libglapi/Makefile   Wed Sep 16 15:04:57 2020 +0000
+++ b/external/mit/xorg/lib/libglapi/Makefile   Wed Sep 16 18:19:23 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2020/02/23 02:02:32 joerg Exp $
+#      $NetBSD: Makefile,v 1.8 2020/09/16 18:19:24 nia Exp $
 
 .include <bsd.own.mk>
 
@@ -68,7 +68,6 @@
        -DGLX_USE_DRM \
        -DGLX_INDIRECT_RENDERING \
        -DGLX_DIRECT_RENDERING \
-       -DGLX_USE_TLS \
        -DHAVE_X11_PLATFORM \
        -DHAVE_DRM_PLATFORM \
        -DENABLE_SHADER_CACHE \
diff -r f70f609a8233 -r a786c421fbde external/mit/xorg/lib/libmesa.mk
--- a/external/mit/xorg/lib/libmesa.mk  Wed Sep 16 15:04:57 2020 +0000
+++ b/external/mit/xorg/lib/libmesa.mk  Wed Sep 16 18:19:23 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: libmesa.mk,v 1.11 2020/02/23 02:03:19 joerg Exp $
+#      $NetBSD: libmesa.mk,v 1.12 2020/09/16 18:19:23 nia Exp $
 #
 # Consumer of this Makefile should set MESA_SRC_MODULES.
 
@@ -526,7 +526,6 @@
        -DHAVE_LIBDRM -DGLX_USE_DRM \
        -DGLX_INDIRECT_RENDERING \
        -DGLX_DIRECT_RENDERING \
-       -DGLX_USE_TLS \
        -DHAVE_X11_PLATFORM \
        -DHAVE_DRM_PLATFORM \
        -DENABLE_SHADER_CACHE \