[Minios-devel] [UNIKRAFT/LIBCXXABI PATCH 1/1] Add config option for thread support

[Vlad-Andrei BĂDOIU (78692) <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>]

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@xxxxxxxxxxxxxxx>
---
 Config.uk   | 8 +++++++-
 Makefile.uk | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Config.uk b/Config.uk
index 9e96041..d6e1f00 100644
--- 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 1e658e8..138af91 100644
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -68,7 +68,10 @@ 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,4 +100,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
-- 
2.20.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel