This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 5f7d4ddcad429995659c5b07c592ea6c5329a9d0 Author: wangmingrong1 <[email protected]> AuthorDate: Tue Jul 1 11:21:40 2025 +0800 compiler-rt: Upgrade to version 18.1.3 Some files need to be included in a specific arch Signed-off-by: wangmingrong1 <[email protected]> --- libs/libbuiltin/compiler-rt/CMakeLists.txt | 20 ++++++++++++++++++++ libs/libbuiltin/compiler-rt/Make.defs | 8 ++++++++ 2 files changed, 28 insertions(+) diff --git a/libs/libbuiltin/compiler-rt/CMakeLists.txt b/libs/libbuiltin/compiler-rt/CMakeLists.txt index 9d9fcb0ee94..3a2e8f8a0ab 100644 --- a/libs/libbuiltin/compiler-rt/CMakeLists.txt +++ b/libs/libbuiltin/compiler-rt/CMakeLists.txt @@ -96,6 +96,26 @@ if(CONFIG_BUILTIN_COMPILER_RT) list(REMOVE_ITEM RT_BUILTINS_SRCS ${RT_BUILTINS_BFLOAT16_SRCS}) endif() + set(x86_80_BIT_SOURCES + divxc3.c + extendxftf2.c + fixxfdi.c + fixxfti.c + fixunsxfdi.c + fixunsxfsi.c + fixunsxfti.c + floatdixf.c + floattixf.c + floatundixf.c + floatuntixf.c + mulxc3.c + powixf2.c + trunctfxf2.c) + + if(NOT CONFIG_ARCH_X86_64) + list(REMOVE_ITEM RT_BUILTINS_SRCS ${x86_80_BIT_SOURCES}) + endif() + if(NOT CONFIG_COVERAGE_NONE) target_compile_options(rt.builtins PRIVATE -fno-profile-instr-generate -fno-coverage-mapping) diff --git a/libs/libbuiltin/compiler-rt/Make.defs b/libs/libbuiltin/compiler-rt/Make.defs index b1047975ff2..9576ea536b6 100644 --- a/libs/libbuiltin/compiler-rt/Make.defs +++ b/libs/libbuiltin/compiler-rt/Make.defs @@ -94,6 +94,14 @@ ifeq ($(CONFIG_LIB_COMPILER_RT_HAS_BFLOAT16),) CSRCS := $(filter-out $(BFLOAT16_SRCS), $(CSRCS)) endif +ifeq ($(CONFIG_ARCH_X86_64),) + x86_80_BIT_SOURCES := divxc3.c extendxftf2.c fixxfdi.c fixxfti.c fixunsxfdi.c + x86_80_BIT_SOURCES += fixunsxfsi.c fixunsxfti.c floatdixf.c floattixf.c floatundixf.c + x86_80_BIT_SOURCES += floatuntixf.c mulxc3.c powixf2.c trunctfxf2.c + x86_80_BIT_SOURCES := $(addprefix compiler-rt/compiler-rt/lib/builtins/, $(x86_80_BIT_SOURCES)) + CSRCS := $(filter-out $(x86_80_BIT_SOURCES), $(CSRCS)) +endif + endif ################# Profile Library #################
