From 84107fa498b598c22b7d2cc5baa9276beb2628ee Mon Sep 17 00:00:00 2001 From: Felipe Huici Date: Mon, 11 Nov 2019 14:37:06 +0100 Subject: [PATCH] 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 Reviewed-by: Felipe Huici --- 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 2c5d1a5..52e9114 100644 --- 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 -- 2.39.5