We add a config option to toggle the thread support. This means adding the

source cxa_thread_atexit.cpp and not defining _LIBCXXABI_HAS_NO_THREADS.

Signed-off-by: Vlad-Andrei Badoiu <vlad_andrei.badoiu@stud.acs.upb.ro>
Reviewed-by: Felipe Huici <felipe.huici@neclab.eu>

diff --git a/Config.uk b/Config.uk
index 9e960419f462424156bc9c81014467cf42f7876b..d6e1f0068ead122f5d573008f1b910b27bd2da05 100644 (file)
--- a/Config.uk
+++ b/Config.uk
@@ -1,4 +1,10 @@
 menuconfig LIBCXXABI
     bool "libcxxabi - c++ abi"
-       select LIBUNWIND
+    select LIBUNWIND
     default n
+
+if LIBCXXABI
+    config LIBCXXABI_THREADS
+    bool "Enable threads support"
+    select CXX_THREADS
+endif

diff --git a/Makefile.uk b/Makefile.uk
index 2c5d1a577adb2a08571184b5cd1d8360c03a1b21..52e911491d4d7304adc060074d833333f68433d2 100644 (file)
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -68,7 +68,9 @@ CXXINCLUDES-$(CONFIG_LIBCXXABI) += -I$(LIBCXXABI_SRC)/include
 ################################################################################
 # Global flags
 ################################################################################
+#ifndef CONFIG_LIBCXXABI_THREADS
 CONFIG_FLAGS   +=      -D _LIBCXXABI_HAS_NO_THREADS
+#endif
 LIBCXXABI_CFLAGS-y    +=  $(CONFIG_FLAGS)
 LIBCXXABI_CXXFLAGS-y    +=  $(CONFIG_FLAGS)
 
@@ -97,3 +99,6 @@ LIBCXXABI_SRCS-y += $(LIBCXXABI_SRC)/src/private_typeinfo.cpp
 LIBCXXABI_SRCS-y += $(LIBCXXABI_SRC)/src/cxa_handlers.cpp
 LIBCXXABI_SRCS-y += $(LIBCXXABI_SRC)/src/cxa_default_handlers.cpp
 LIBCXXABI_SRCS-y += $(LIBCXXABI_SRC)/src/cxa_guard.cpp
+#ifdef CONFIG_LIBCXXABI_THREADS
+LIBCXXABI_SRCS-y += $(LIBCXXABI_SRC)/src/cxa_thread_atexit.cpp
+#endif