From ceb8bd4bceb1f1fdfdebb230221a4394cfdfc90f Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sat, 28 Aug 2021 09:48:37 +0800 Subject: [PATCH] libxx: Disable CXX_EXCEPTION by default to save the code space Signed-off-by: Xiang Xiao Change-Id: I1b1fafa95f0e385a615dba78f43858b797c5ce69 --- boards/sim/sim/sim/configs/cxxtest/defconfig | 1 - boards/sim/sim/sim/configs/libcxxtest/defconfig | 2 +- libs/libxx/Kconfig | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/boards/sim/sim/sim/configs/cxxtest/defconfig b/boards/sim/sim/sim/configs/cxxtest/defconfig index ea3d8ef40d..ed7c698012 100644 --- a/boards/sim/sim/sim/configs/cxxtest/defconfig +++ b/boards/sim/sim/sim/configs/cxxtest/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_CXX_EXCEPTION is not set CONFIG_ARCH="sim" CONFIG_ARCH_BOARD="sim" CONFIG_ARCH_BOARD_SIM=y diff --git a/boards/sim/sim/sim/configs/libcxxtest/defconfig b/boards/sim/sim/sim/configs/libcxxtest/defconfig index dd5bbc84de..48138a0426 100644 --- a/boards/sim/sim/sim/configs/libcxxtest/defconfig +++ b/boards/sim/sim/sim/configs/libcxxtest/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_CXX_EXCEPTION is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set CONFIG_ARCH="sim" CONFIG_ARCH_BOARD="sim" @@ -17,6 +16,7 @@ CONFIG_BOARDCTL_POWEROFF=y CONFIG_BOARD_LOOPSPERMSEC=0 CONFIG_BOOT_RUNFROMEXTSRAM=y CONFIG_BUILTIN=y +CONFIG_CXX_EXCEPTION=y CONFIG_DEBUG_ASSERTIONS=y CONFIG_DEBUG_BINFMT=y CONFIG_DEBUG_BINFMT_ERROR=y diff --git a/libs/libxx/Kconfig b/libs/libxx/Kconfig index bdf3b9b56a..a20d1ee1eb 100644 --- a/libs/libxx/Kconfig +++ b/libs/libxx/Kconfig @@ -83,7 +83,6 @@ config HAVE_CXXINITIALIZE config CXX_EXCEPTION bool "Enable Exception Support" - default LIBCXX || UCLIBCXX if UCLIBCXX