Commit acc65445 authored by Kyle Brenneman's avatar Kyle Brenneman
Browse files

Merge branch 'fix-configure-tls' into 'master'

Fix some duplicate code in configure.ac

See merge request glvnd/libglvnd!232
parents cad3b523 8af272f7
......@@ -201,10 +201,6 @@ if test "x$enable_glx" = "xyes" ; then
PKG_CHECK_MODULES([GLPROTO], [glproto])
fi
AS_IF([test "x$gldispatch_use_tls" = "xyes"],
[AC_DEFINE([GLDISPATCH_USE_TLS], 1,
[Define to 1 if libGLdispatch should use a TLS variable for the dispatch table.])])
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_TYPEOF
......@@ -236,8 +232,8 @@ AC_MSG_RESULT($HAVE_INIT_TLS)
AC_MSG_CHECKING([for entrypoint stub type])
case "x$asm_arch" in
xx86 | xx86_64)
# For x86 and x86-64, both the TLS and TSD stubs work.
xx86 | xx86_64 | xppc64)
# For x86, x86-64, and ppc64, both the TLS and TSD stubs work.
if test "x$HAVE_INIT_TLS" = "xyes" ; then
gldispatch_entry_type=${asm_arch}_tls
gldispatch_use_tls=yes
......@@ -256,16 +252,6 @@ xaarch64)
gldispatch_entry_type=aarch64_tsd
gldispatch_use_tls=no
;;
xppc64)
# For ppc64, allow both the TLS and TSD stubs for now.
if test "x$HAVE_INIT_TLS" = "xyes" ; then
gldispatch_entry_type=ppc64_tls
gldispatch_use_tls=yes
else
gldispatch_entry_type=ppc64_tsd
gldispatch_use_tls=no
fi
;;
*)
# The C stubs will work with either TLS or TSD.
gldispatch_entry_type=pure_c
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment