[PATCH] configure.ac: remove remaining TLS references

[Emil Velikov]

No longer used with the removal of the GL dispatch (glapi) from libglx a
few releases ago.

Cc: Adam Jackson <ajax at redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 configure.ac            | 16 +-------------
 include/dix-config.h.in |  3 ---
 m4/xorg-tls.m4          | 55 -------------------------------------------------
 3 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 m4/xorg-tls.m4

diff --git a/configure.ac b/configure.ac
index 280c369..7fa5030 100644
--- a/configure.ac
+++ b/configure.ac
@@ -560,17 +560,7 @@ dnl GLX build options
 AC_ARG_ENABLE(aiglx,          AS_HELP_STRING([--enable-aiglx], [Build accelerated indirect GLX (default: enabled)]),
                                 [AIGLX=$enableval],
                                 [AIGLX=yes])
-XORG_TLS
-AC_ARG_ENABLE(glx-tls,        AS_HELP_STRING([--enable-glx-tls], [Build GLX with TLS support (default: auto)]),
-                                [GLX_USE_TLS=$enableval
-                                 if test "x$GLX_USE_TLS" = "xyes" && test "${ac_cv_tls}" = "none" ; then
-                                   AC_MSG_ERROR([GLX with TLS support requested, but the compiler does not support it.])
-                                 fi],
-                                [GLX_USE_TLS=no
-                                 if test "${ac_cv_tls}" != "none" ; then
-                                   GLX_USE_TLS=yes
-                                 fi])
-AC_SUBST(GLX_TLS, ${GLX_USE_TLS})
+
 AC_ARG_WITH(khronos-spec-dir, AS_HELP_STRING([--with-khronos-spec-dir=PATH], [Path to Khronos OpenGL registry database files (default: auto)]),
 				[KHRONOS_SPEC_DIR="${withval}"],
 				[KHRONOS_SPEC_DIR=auto])
@@ -1324,10 +1314,6 @@ if test "x$AIGLX" = xyes -a \( "x$DRI2" = xyes \); then
 fi
 AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI2" = xyes; } && test "x$AIGLX" = xyes)
 
-if test "x$GLX_USE_TLS" = xyes ; then
-	GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
-	GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread"
-fi
 AC_SUBST([GLX_DEFINES])
 AC_SUBST([GLX_SYS_LIBS])
 
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 1aa77a5..bd479cf 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -454,9 +454,6 @@
 /* Define to __typeof__ if your compiler spells it that way. */
 #undef typeof
 
-/* The compiler supported TLS storage class, prefering initial-exec if tls_model is supported */
-#undef TLS
-
 /* Correctly set _XSERVER64 for OSX fat binaries */
 #ifdef __APPLE__
 #include "dix-config-apple-verbatim.h"
diff --git a/m4/xorg-tls.m4 b/m4/xorg-tls.m4
deleted file mode 100644
index 5768775..0000000
--- a/m4/xorg-tls.m4
+++ /dev/null
@@ -1,55 +0,0 @@
-dnl Copyright © 2011 Apple Inc.
-dnl
-dnl Permission is hereby granted, free of charge, to any person obtaining a
-dnl copy of this software and associated documentation files (the "Software"),
-dnl to deal in the Software without restriction, including without limitation
-dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
-dnl and/or sell copies of the Software, and to permit persons to whom the
-dnl Software is furnished to do so, subject to the following conditions:
-dnl
-dnl The above copyright notice and this permission notice (including the next
-dnl paragraph) shall be included in all copies or substantial portions of the
-dnl Software.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-dnl DEALINGS IN THE SOFTWARE.
-dnl
-dnl Authors: Jeremy Huddleston <jeremyhu at apple.com>
-
-AC_DEFUN([XORG_TLS], [
-    AC_REQUIRE([XORG_STRICT_OPTION])
-    AC_MSG_CHECKING(for thread local storage (TLS) support)
-    AC_CACHE_VAL(ac_cv_tls, [
-        ac_cv_tls=none
-        keywords="__thread __declspec(thread)"
-        for kw in $keywords ; do
-            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int $kw test;]], [])], ac_cv_tls=$kw ; break ;)
-        done
-    ])
-    AC_MSG_RESULT($ac_cv_tls)
-
-    if test "$ac_cv_tls" != "none"; then
-        AC_MSG_CHECKING(for tls_model attribute support)
-        AC_CACHE_VAL(ac_cv_tls_model, [
-            save_CFLAGS="$CFLAGS"
-            CFLAGS="$CFLAGS $STRICT_CFLAGS"
-            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int $ac_cv_tls __attribute__((tls_model("initial-exec"))) test;]], [])],
-                           ac_cv_tls_model=yes, ac_cv_tls_model=no)
-            CFLAGS="$save_CFLAGS"
-        ])
-        AC_MSG_RESULT($ac_cv_tls_model)
-
-        if test "x$ac_cv_tls_model" = "xyes" ; then
-            xorg_tls=$ac_cv_tls' __attribute__((tls_model("initial-exec")))'
-        else
-            xorg_tls=$ac_cv_tls
-        fi
-
-        AC_DEFINE_UNQUOTED([TLS], $xorg_tls, [The compiler supported TLS storage class, prefering initial-exec if tls_model is supported])
-    fi
-])
-- 
2.3.1