X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=73ab19fbfdd2678fe12d2a3ff5aea20d13f463b6;hb=a9a42447bac2ed5c61fac810e293d58a5246bf6f;hp=c80b918356a4372db8d4951e2a81de9a4f991182;hpb=f26da412e5277f3eb75a578a7d26b38becf87573;p=userspace-rcu.git

diff --git a/configure.ac b/configure.ac
index c80b918..73ab19f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AH_TEMPLATE([CONFIG_RCU_ARM_HAVE_DMB], [Use the dmb instruction if available for
 AH_TEMPLATE([CONFIG_RCU_TLS], [TLS provided by the compiler.])
 AH_TEMPLATE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [clock_gettime() is detected.])
 AH_TEMPLATE([CONFIG_RCU_FORCE_SYS_MEMBARRIER], [Require the operating system to support the membarrier system call for default and bulletproof flavors.])
-AH_TEMPLATE([CONFIG_RCU_DEBUG], [Enable internal debugging self-checks. Introduce performance penalty.])
+AH_TEMPLATE([CONFIG_RCU_DEBUG], [Enable internal debugging self-checks. Introduces a performance penalty.])
 AH_TEMPLATE([CONFIG_CDS_LFHT_ITER_DEBUG], [Enable extra debugging checks for lock-free hash table iterator traversal. Alters the rculfhash ABI. Make sure to compile both library and application with matching configuration.])
 
 # Allow requiring the operating system to support the membarrier system
@@ -50,14 +50,7 @@ AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
 AC_PROG_CC_STDC
 
-# If not overridden, use ax_tls.m4 to check if TLS is available.
-AS_IF([test "x$def_compiler_tls" = "xyes"],
-	[AX_TLS([def_tls_detect=$ac_cv_tls], [:])],
-	[:])
-
-AS_IF([test "x$def_tls_detect" = "x"],
-	[:],
-	[AC_DEFINE_UNQUOTED([CONFIG_RCU_TLS], $def_tls_detect)])
+AS_IF([test "x$def_compiler_tls" = "xyes"], AC_DEFINE([CONFIG_RCU_TLS], [1]), [:])
 
 # Checks for programs.
 AC_PROG_AWK
@@ -264,7 +257,7 @@ AS_IF([test "x$def_smp_support" = "xyes"], [AC_DEFINE([CONFIG_RCU_SMP], [1])])
 # RCU debugging option
 AC_ARG_ENABLE([rcu-debug],
       AS_HELP_STRING([--enable-rcu-debug], [Enable internal debugging
-		      self-checks. Introduce performance penalty.]))
+		      self-checks. Introduces a performance penalty.]))
 AS_IF([test "x$enable_rcu_debug" = "xyes"], [
        AC_DEFINE([CONFIG_RCU_DEBUG], [1])
 ])
@@ -501,7 +494,7 @@ test "x$compat_futex_test" = "x0" && value=1 || value=0
 PPRINT_PROP_BOOL([Futex support], $value)
 
 # TLS
-test "x$def_tls_detect" = "x" && value="pthread_getspecific()" || value="$def_tls_detect"
+test "x$def_compiler_tls" = "xyes" && value="compiler TLS" || value="pthread_getspecific()"
 PPRINT_PROP_STRING([Thread Local Storage (TLS)], [$value])
 
 # clock_gettime() available