Module Name: xsrc
Committed By: riastradh
Date: Sun Jun 4 11:36:50 UTC 2023
Modified Files:
xsrc/external/mit/MesaLib.old/dist/src/glx: glxcurrent.c
xsrc/external/mit/MesaLib/dist/src/glx: glxcurrent.c
Log Message:
mesa: Remove massive kludge that worked around PR toolchain/50277.
Now that the underlying bug in ld.elf_so is fixed, the workaround is
causing harm.
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/glx/glxcurrent.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/MesaLib/dist/src/glx/glxcurrent.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.old/dist/src/glx/glxcurrent.c
diff -u xsrc/external/mit/MesaLib.old/dist/src/glx/glxcurrent.c:1.1.1.2 xsrc/external/mit/MesaLib.old/dist/src/glx/glxcurrent.c:1.2
--- xsrc/external/mit/MesaLib.old/dist/src/glx/glxcurrent.c:1.1.1.2 Sun Jul 11 20:36:29 2021
+++ xsrc/external/mit/MesaLib.old/dist/src/glx/glxcurrent.c Sun Jun 4 11:36:50 2023
@@ -40,18 +40,6 @@
#include "glx_error.h"
/*
- * MASSIVE KLUDGE!
- * We need these to not be extern in libGL.so because of
- * PR toolchain/50277
- */
-#if defined(GLX_USE_TLS) && defined(__NetBSD__)
-_X_EXPORT __thread struct _glapi_table * _glapi_tls_Dispatch
- __attribute__((tls_model("initial-exec"))) = NULL;
-_X_EXPORT __thread void * _glapi_tls_Context
- __attribute__((tls_model("initial-exec")));
-#endif
-
-/*
** We setup some dummy structures here so that the API can be used
** even if no context is current.
*/
Index: xsrc/external/mit/MesaLib/dist/src/glx/glxcurrent.c
diff -u xsrc/external/mit/MesaLib/dist/src/glx/glxcurrent.c:1.3 xsrc/external/mit/MesaLib/dist/src/glx/glxcurrent.c:1.4
--- xsrc/external/mit/MesaLib/dist/src/glx/glxcurrent.c:1.3 Mon May 9 01:27:33 2022
+++ xsrc/external/mit/MesaLib/dist/src/glx/glxcurrent.c Sun Jun 4 11:36:50 2023
@@ -40,18 +40,6 @@
#include "glx_error.h"
/*
- * MASSIVE KLUDGE!
- * We need these to not be extern in libGL.so because of
- * PR toolchain/50277
- */
-#if defined(GLX_USE_TLS) && defined(__NetBSD__)
-_X_EXPORT __thread struct _glapi_table * _glapi_tls_Dispatch
- __attribute__((tls_model("initial-exec"))) = NULL;
-_X_EXPORT __thread void * _glapi_tls_Context
- __attribute__((tls_model("initial-exec")));
-#endif
-
-/*
** We setup some dummy structures here so that the API can be used
** even if no context is current.
*/
