From 8a92862e03a0187f4beb0416ad5b1466125c07db Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 7 May 2020 09:56:21 -0600
Subject: [PATCH] Remove CONFIG_TLS

A first step in implementing the user-space error is force TLS to be enabled at all times. It is no longer optional
---
 testing/ostest/Makefile      | 2 +-
 testing/ostest/ostest_main.c | 2 +-
 testing/ostest/tls.c         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/testing/ostest/Makefile b/testing/ostest/Makefile
index 33c06f462..cb8b49c15 100644
--- a/testing/ostest/Makefile
+++ b/testing/ostest/Makefile
@@ -63,7 +63,7 @@ ifneq ($(CONFIG_STDIO_DISABLE_BUFFERING),y)
 CSRCS += setvbuf.c
 endif
 
-ifeq ($(CONFIG_TLS),y)
+ifneq ($(CONFIG_TLS_NELEM),0)
 CSRCS += tls.c
 endif
 
diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c
index 57698d256..cca7900c9 100644
--- a/testing/ostest/ostest_main.c
+++ b/testing/ostest/ostest_main.c
@@ -284,7 +284,7 @@ static int user_main(int argc, char *argv[])
   check_test_memory_usage();
 #endif
 
-#ifdef CONFIG_TLS
+#if CONFIG_TLS_NELEM > 0
   /* Test TLS */
 
   tls_test();
diff --git a/testing/ostest/tls.c b/testing/ostest/tls.c
index 6146fcf7a..407eefa22 100644
--- a/testing/ostest/tls.c
+++ b/testing/ostest/tls.c
@@ -48,7 +48,7 @@
 
 #include "ostest.h"
 
-#ifdef CONFIG_TLS
+#if CONFIG_TLS_NELEM > 0
 
 #include <arch/tls.h>
 
@@ -126,4 +126,4 @@ void tls_test(void)
   put_tls_info(&g_save_info);
 }
 
-#endif /* CONFIG_TLS */
+#endif /* CONFIG_TLS_NELEM > 0 */