Module Name: src
Committed By: nia
Date: Wed Sep 16 18:19:24 UTC 2020
Modified Files:
src/external/mit/xorg/lib: libmesa.mk
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libglapi: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/libmesa.mk
cvs rdiff -u -r1.29 -r1.30 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.7 -r1.8 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/libmesa.mk
diff -u src/external/mit/xorg/lib/libmesa.mk:1.11 src/external/mit/xorg/lib/libmesa.mk:1.12
--- src/external/mit/xorg/lib/libmesa.mk:1.11 Sun Feb 23 02:03:19 2020
+++ src/external/mit/xorg/lib/libmesa.mk Wed Sep 16 18:19:23 2020
@@ -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 @@ CPPFLAGS+= \
-DHAVE_LIBDRM -DGLX_USE_DRM \
-DGLX_INDIRECT_RENDERING \
-DGLX_DIRECT_RENDERING \
- -DGLX_USE_TLS \
-DHAVE_X11_PLATFORM \
-DHAVE_DRM_PLATFORM \
-DENABLE_SHADER_CACHE \
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.29 src/external/mit/xorg/lib/libGL/Makefile:1.30
--- src/external/mit/xorg/lib/libGL/Makefile:1.29 Sun Mar 29 21:06:03 2020
+++ src/external/mit/xorg/lib/libGL/Makefile Wed Sep 16 18:19:23 2020
@@ -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 @@ CPPFLAGS+= \
-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 @@ PKGCONFIG_SED_FLAGS= \
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 \
Index: src/external/mit/xorg/lib/libglapi/Makefile
diff -u src/external/mit/xorg/lib/libglapi/Makefile:1.7 src/external/mit/xorg/lib/libglapi/Makefile:1.8
--- src/external/mit/xorg/lib/libglapi/Makefile:1.7 Sun Feb 23 02:02:32 2020
+++ src/external/mit/xorg/lib/libglapi/Makefile Wed Sep 16 18:19:24 2020
@@ -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 @@ CPPFLAGS+= \
-DGLX_USE_DRM \
-DGLX_INDIRECT_RENDERING \
-DGLX_DIRECT_RENDERING \
- -DGLX_USE_TLS \
-DHAVE_X11_PLATFORM \
-DHAVE_DRM_PLATFORM \
-DENABLE_SHADER_CACHE \
