nuttx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aguettou...@apache.org
Subject [incubator-nuttx-apps] branch errno updated: Remove CONFIG_TLS
Date Thu, 07 May 2020 16:29:21 GMT
This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a commit to branch errno
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git


The following commit(s) were added to refs/heads/errno by this push:
     new 8a92862  Remove CONFIG_TLS
8a92862 is described below

commit 8a92862e03a0187f4beb0416ad5b1466125c07db
Author: Gregory Nutt <gnutt@nuttx.org>
AuthorDate: Thu May 7 09:56:21 2020 -0600

    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 33c06f4..cb8b49c 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 57698d2..cca7900 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 6146fcf..407eefa 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 */


Mime
View raw message