Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-23 14:58:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libxxabi: remove redefinition in cmake/make scripts for clang

Browse Source 
The clang unwind.h file already defines these macros:
_URC_FATAL_PHASE2_ERROR = _URC_FAILURE
_URC_FATAL_PHASE1_ERROR = _URC_FAILURE

Signed-off-by: wangmingrong1 <wangmingrong1@xiaomi.com>
This commit is contained in:
wangmingrong1
2025-08-07 15:51:04 +08:00
committed by Xiang Xiao
parent c3010eafab
commit f27f501365
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libxx/libcxxabi/CMakeLists.txt
+1 -1
View File
@@ -114,7 +114,7 @@ if(CONFIG_LIBCXXABI)
# Fix compilation error on ARM32:libcxxabi/src/cxa_personality.cpp:594:22:
# error: '_URC_FATAL_PHASE1_ERROR' was not declared in this scope 594 |
# results.reason = _URC_FATAL_PHASE1_ERROR;
if(CONFIG_ARCH_ARM)
if(CONFIG_ARCH_ARM AND NOT CONFIG_ARCH_TOOLCHAIN_CLANG)
target_compile_definitions(libcxxabi
PRIVATE _URC_FATAL_PHASE2_ERROR=_URC_FAILURE)
target_compile_definitions(libcxxabi
libs/libxx/libcxxabi/Make.defs
+3 -1
View File
@@ -76,7 +76,9 @@ endif
# libcxxabi/src/cxa_personality.cpp:594:22: error: '_URC_FATAL_PHASE1_ERROR' was not declared in this scope
# 594 | results.reason = _URC_FATAL_PHASE1_ERROR;
ifeq ($(CONFIG_ARCH_ARM),y)
CXXFLAGS += -D_URC_FATAL_PHASE2_ERROR=_URC_FAILURE -D_URC_FATAL_PHASE1_ERROR=_URC_FAILURE
ifeq ($(CONFIG_ARCH_TOOLCHAIN_CLANG),)
CXXFLAGS += -D_URC_FATAL_PHASE2_ERROR=_URC_FAILURE -D_URC_FATAL_PHASE1_ERROR=_URC_FAILURE
endif
endif
CXXFLAGS += -DLIBCXXABI_NON_DEMANGLING_TERMINATE