This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c1082f04d3edec2968dcaab16bf2b670e37b5bb8
Author: Xiang Xiao <xiaoxi...@xiaomi.com>
AuthorDate: Tue May 3 15:45:40 2022 +0800
libxx: Make HAVE_CXXINITIALIZE workable even HAVE_CXX isn't enabled
since this infrastructure is also used in no c++ case(e.g. gcov)
Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com>
---
arch/Kconfig | 1 -
libs/libxx/Kconfig | 18 ++++++++++--------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index 49b9332611..079776bd28 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -283,7 +283,6 @@ config ARCH_SIZET_LONG
config ARCH_COVERAGE
bool "Enable code coverage analysis"
- select HAVE_CXX
select HAVE_CXXINITIALIZE
default n
---help---
diff --git a/libs/libxx/Kconfig b/libs/libxx/Kconfig
index 29a33626ed..600ceb0ce7 100644
--- a/libs/libxx/Kconfig
+++ b/libs/libxx/Kconfig
@@ -20,6 +20,14 @@ config HAVE_CXX
Toolchain supports C++ and CXX, CXXFLAGS, and COMPILEXX have
been
defined in the configurations Make.defs file.
+config HAVE_CXXINITIALIZE
+ bool "Have C++ initialization"
+ default n
+ ---help---
+ The platform-specific logic includes support for initialization
+ of static C++ instances for this architecture and for the
selected
+ toolchain.
+
if HAVE_CXX
choice
@@ -35,6 +43,7 @@ config LIBCXXMINI
config LIBCXX
bool "LLVM libc++ C++ Standard Library"
+ select HAVE_CXXINITIALIZE
select LIBC_WCHAR
select LIBC_LOCALE
---help---
@@ -43,6 +52,7 @@ config LIBCXX
config UCLIBCXX
bool "uClibc++ Standard C++ Library"
+ select HAVE_CXXINITIALIZE
---help---
uClibc++ C++ library
https://cxx.uclibc.org/
@@ -72,14 +82,6 @@ endchoice
endif
-config HAVE_CXXINITIALIZE
- bool "Have C++ initialization"
- default LIBCXX || UCLIBCXX
- ---help---
- The platform-specific logic includes support for initialization
- of static C++ instances for this architecture and for the
selected
- toolchain (via up_cxxinitialize()).
-
config CXX_EXCEPTION
bool "Enable Exception Support"
