This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit de71f0d2d8215dc5b3785535c00b29b650d6504d Author: Saravanan Sekar <[email protected]> AuthorDate: Tue Nov 17 10:42:17 2026 +0530 arch/tricore: Leave the TASKING C init to the startup. The TASKING build still compiles the iLLD CompilerTasking.c, whose Ifx_C_Init calls _c_init, the copy table init of the locator, and takes cinit.o out of the toolchain C library for it. Only the iLLD startup called Ifx_C_Init, and tricore_head now copies .data and clears .bss itself. Drop CompilerTasking.c and cinit.o, build the replacement libc_fpu.a from tricore_libc.c alone, and link with --user-provided-initialization-code, so that the locator emits no copy table. Signed-off-by: Saravanan Sekar <[email protected]> --- arch/tricore/src/cmake/chip.cmake | 2 ++ arch/tricore/src/common/CMakeLists.txt | 17 +---------------- arch/tricore/src/common/Make.defs | 16 +--------------- arch/tricore/src/common/tricore_libc.c | 15 --------------- arch/tricore/src/tc3xx/CMakeLists.txt | 3 +-- arch/tricore/src/tc3xx/Make.defs | 1 - arch/tricore/src/tc3xx/Toolchain.defs | 1 + arch/tricore/src/tc4xx/CMakeLists.txt | 3 +-- arch/tricore/src/tc4xx/Make.defs | 1 - arch/tricore/src/tc4xx/Toolchain.defs | 1 + 10 files changed, 8 insertions(+), 52 deletions(-) diff --git a/arch/tricore/src/cmake/chip.cmake b/arch/tricore/src/cmake/chip.cmake index 0cfd2e13f19..c509b8f9f52 100644 --- a/arch/tricore/src/cmake/chip.cmake +++ b/arch/tricore/src/cmake/chip.cmake @@ -27,6 +27,7 @@ if(CONFIG_ARCH_CHIP_TC3XX) add_compile_options(--default-near-size=0) add_compile_options(--cpu=tc39xb) add_link_options(-Ctc39xb) + add_link_options(--user-provided-initialization-code) else() list(APPEND PLATFORM_FLAGS -mcpu=tc39xx -mtc162) endif() @@ -35,6 +36,7 @@ elseif(CONFIG_ARCH_CHIP_TC4XX) add_compile_options(--misrac-version=2004 --user-mode=hypervisor) add_compile_options(--default-near-size=0) add_link_options(-Ctc4dx) + add_link_options(--user-provided-initialization-code) else() list(APPEND PLATFORM_FLAGS -mcpu=tc4DAx -mtc18) endif() diff --git a/arch/tricore/src/common/CMakeLists.txt b/arch/tricore/src/common/CMakeLists.txt index 8df66946505..a74ef48dde6 100644 --- a/arch/tricore/src/common/CMakeLists.txt +++ b/arch/tricore/src/common/CMakeLists.txt @@ -100,23 +100,8 @@ target_include_directories( # tricore_libc.c for details). if(CONFIG_TRICORE_TOOLCHAIN_TASKING) - # iLLD calls _c_init, the TASKING copy table init, so take cinit.o from the - # toolchain C library. The rest of that library clashes with NuttX. - - if(CONFIG_ARCH_TC1V8) - set(TASKING_LIBDIR tc18/dpfpu) - else() - set(TASKING_LIBDIR tc162) - endif() - - get_filename_component(TASKING_BIN_DIR ${CMAKE_C_COMPILER} DIRECTORY) - execute_process( - COMMAND ${TASKING_BIN_DIR}/artc -x - ${TASKING_BIN_DIR}/../lib/${TASKING_LIBDIR}/libc_fpu.a cinit.o - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) nuttx_add_kernel_library(c_fpu) - target_sources(c_fpu PRIVATE tricore_libc.c - ${CMAKE_CURRENT_BINARY_DIR}/cinit.o) + target_sources(c_fpu PRIVATE tricore_libc.c) target_link_options(nuttx PRIVATE --library-directory=${CMAKE_CURRENT_BINARY_DIR}) diff --git a/arch/tricore/src/common/Make.defs b/arch/tricore/src/common/Make.defs index fc822436890..bd4644ac958 100644 --- a/arch/tricore/src/common/Make.defs +++ b/arch/tricore/src/common/Make.defs @@ -99,21 +99,7 @@ ifeq ($(CONFIG_TRICORE_TOOLCHAIN_TASKING),y) tricore_libc$(OBJEXT): tricore_libc.c $(call COMPILE, $<, $@) -# iLLD calls _c_init, the TASKING copy table init, so take cinit.o from -# the toolchain C library. The rest of that library clashes with NuttX. - -ifeq ($(CONFIG_ARCH_TC1V8),y) -TASKING_LIBDIR = tc18$(DELIM)dpfpu -else -TASKING_LIBDIR = tc162 -endif - -TASKING_LIBC = $(C_COMPILER_DIR)..$(DELIM)lib$(DELIM)$(TASKING_LIBDIR)$(DELIM)libc_fpu$(LIBEXT) - -cinit$(OBJEXT): $(TASKING_LIBC) - $(Q) artc -x $< cinit$(OBJEXT) - -libc_fpu$(LIBEXT): tricore_libc$(OBJEXT) cinit$(OBJEXT) +libc_fpu$(LIBEXT): tricore_libc$(OBJEXT) $(call ARCHIVE, $@, $^) EXTRA_LIBS += libc_fpu$(LIBEXT) diff --git a/arch/tricore/src/common/tricore_libc.c b/arch/tricore/src/common/tricore_libc.c index 5944b15167f..75b16002af3 100644 --- a/arch/tricore/src/common/tricore_libc.c +++ b/arch/tricore/src/common/tricore_libc.c @@ -31,21 +31,6 @@ * Public Functions ****************************************************************************/ -/* TODO: - * The data copy from flash to ram reuses the implementation in tricore sdk. - * The next update will reimplement _c_init() to abandon the copy code. - * - * Usage: ltc [options] files - * -i --user-provided-initialization-code - * - * the user provides his own initialization - * routine, do not emit the copytable - * - * void _c_init(void) - * { - * } - */ - /* The implementation of libc is introduced by default in the Tricore * toolchain, in nuttx we made a fake libc_fpu.a library to bypass * this issue, but the linker will still generate markup code, diff --git a/arch/tricore/src/tc3xx/CMakeLists.txt b/arch/tricore/src/tc3xx/CMakeLists.txt index 005172151dc..98131b56dc6 100644 --- a/arch/tricore/src/tc3xx/CMakeLists.txt +++ b/arch/tricore/src/tc3xx/CMakeLists.txt @@ -129,8 +129,7 @@ set(SDK_CSRCS "${ILLD_DIR}/Libraries/iLLD/TC3xx/Tricore/Scu/Std/IfxScuEru.c" "${ILLD_DIR}/Libraries/iLLD/TC3xx/Tricore/Scu/Std/IfxScuLbist.c" "${ILLD_DIR}/Libraries/iLLD/TC3xx/Tricore/Scu/Std/IfxScuRcu.c" - "${ILLD_DIR}/Libraries/iLLD/TC3xx/Tricore/Scu/Std/IfxScuWdt.c" - "${ILLD_DIR}/Libraries/Infra/Platform/Tricore/Compilers/CompilerTasking.c") + "${ILLD_DIR}/Libraries/iLLD/TC3xx/Tricore/Scu/Std/IfxScuWdt.c") target_sources(nuttx PRIVATE ${SDK_CSRCS}) diff --git a/arch/tricore/src/tc3xx/Make.defs b/arch/tricore/src/tc3xx/Make.defs index 91325a634dc..5f5a759a1af 100644 --- a/arch/tricore/src/tc3xx/Make.defs +++ b/arch/tricore/src/tc3xx/Make.defs @@ -113,7 +113,6 @@ SDK_CSRCS += $(ILLD_DIR)/Libraries/iLLD/TC3xx/Tricore/Scu/Std/IfxScuEru.c SDK_CSRCS += $(ILLD_DIR)/Libraries/iLLD/TC3xx/Tricore/Scu/Std/IfxScuLbist.c SDK_CSRCS += $(ILLD_DIR)/Libraries/iLLD/TC3xx/Tricore/Scu/Std/IfxScuRcu.c SDK_CSRCS += $(ILLD_DIR)/Libraries/iLLD/TC3xx/Tricore/Scu/Std/IfxScuWdt.c -SDK_CSRCS += $(ILLD_DIR)/Libraries/Infra/Platform/Tricore/Compilers/CompilerTasking.c CFLAGS += $(addprefix ${INCDIR_PREFIX},$(SDK_INCDIR)) diff --git a/arch/tricore/src/tc3xx/Toolchain.defs b/arch/tricore/src/tc3xx/Toolchain.defs index 7e9bee7a345..e2b145b2026 100644 --- a/arch/tricore/src/tc3xx/Toolchain.defs +++ b/arch/tricore/src/tc3xx/Toolchain.defs @@ -25,6 +25,7 @@ ifeq ($(CONFIG_ARCH_CHIP_TC39X),y) ARCHCPUFLAGS += --cpu=tc39xb ARCHCPUFLAGS += --default-near-size=0 LDFLAGS += -Ctc39xb + LDFLAGS += -Wl--user-provided-initialization-code else ARCHCPUFLAGS += -mcpu=tc39xx ARCHCPUFLAGS += -mtc162 diff --git a/arch/tricore/src/tc4xx/CMakeLists.txt b/arch/tricore/src/tc4xx/CMakeLists.txt index cb692ddbff0..922cd2a6cc2 100644 --- a/arch/tricore/src/tc4xx/CMakeLists.txt +++ b/arch/tricore/src/tc4xx/CMakeLists.txt @@ -161,8 +161,7 @@ set(SDK_CSRCS "${ILLD_DIR}/Libraries/iLLD/TC4xx/Tricore/Smm/Std/IfxSmmRst.c" "${ILLD_DIR}/Libraries/iLLD/TC4xx/Tricore/Smu/Std/IfxSmu.c" "${ILLD_DIR}/Libraries/iLLD/TC4xx/Tricore/Vmt/Std/IfxVmt.c" - "${ILLD_DIR}/Libraries/iLLD/TC4xx/Tricore/Wtu/Std/IfxWtu.c" - "${ILLD_DIR}/Libraries/Infra/Platform/Compilers/CompilerTasking.c") + "${ILLD_DIR}/Libraries/iLLD/TC4xx/Tricore/Wtu/Std/IfxWtu.c") target_sources(nuttx PRIVATE ${SDK_CSRCS}) diff --git a/arch/tricore/src/tc4xx/Make.defs b/arch/tricore/src/tc4xx/Make.defs index dffbd33dab7..3bc5a996d1d 100644 --- a/arch/tricore/src/tc4xx/Make.defs +++ b/arch/tricore/src/tc4xx/Make.defs @@ -146,7 +146,6 @@ SDK_CSRCS += $(ILLD_DIR)/Libraries/iLLD/TC4xx/Tricore/Smm/Std/IfxSmmRst.c SDK_CSRCS += $(ILLD_DIR)/Libraries/iLLD/TC4xx/Tricore/Smu/Std/IfxSmu.c SDK_CSRCS += $(ILLD_DIR)/Libraries/iLLD/TC4xx/Tricore/Vmt/Std/IfxVmt.c SDK_CSRCS += $(ILLD_DIR)/Libraries/iLLD/TC4xx/Tricore/Wtu/Std/IfxWtu.c -SDK_CSRCS += $(ILLD_DIR)/Libraries/Infra/Platform/Compilers/CompilerTasking.c CFLAGS += $(addprefix ${INCDIR_PREFIX},$(SDK_INCDIR)) diff --git a/arch/tricore/src/tc4xx/Toolchain.defs b/arch/tricore/src/tc4xx/Toolchain.defs index 44b3c1a7302..8d13f250ad2 100644 --- a/arch/tricore/src/tc4xx/Toolchain.defs +++ b/arch/tricore/src/tc4xx/Toolchain.defs @@ -25,6 +25,7 @@ ifeq ($(CONFIG_ARCH_CHIP_TC4XX),y) ARCHCPUFLAGS += --misrac-version=2004 --user-mode=hypervisor ARCHCPUFLAGS += --default-near-size=0 LDFLAGS += -Ctc4dx + LDFLAGS += -Wl--user-provided-initialization-code else ARCHCPUFLAGS += -mcpu=tc4DAx ARCHCPUFLAGS += -mtc18
