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 5e87633ccada2af00bb6d2474912ce60b20ed46b Author: Saravanan Sekar <[email protected]> AuthorDate: Thu Oct 29 18:51:44 2026 +0530 arch/tricore: Keep the dot in the assembly file extension. tools/Config.mk defines ASMEXT with the dot (.S) and the generic make rules use it that way, boards/Board.mk turns $(ASRCS:$(ASMEXT)=$(OBJEXT)) into the object names for instance. The TriCore toolchain files set it to S and asm, which would make that rule produce file..o. Use .S and .asm, and drop the dot that libc/machine/tricore added in front of it. The CMake build keeps its own ASMEXT without the dot, it needs no change. [skip-cmake-parity] Signed-off-by: Saravanan Sekar <[email protected]> --- arch/tricore/src/common/ToolchainGnuc.defs | 2 +- arch/tricore/src/common/ToolchainTasking.defs | 2 +- libs/libc/machine/tricore/Make.defs | 32 +++++++++++++-------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/tricore/src/common/ToolchainGnuc.defs b/arch/tricore/src/common/ToolchainGnuc.defs index e8dcd481dcd..984581b24a7 100644 --- a/arch/tricore/src/common/ToolchainGnuc.defs +++ b/arch/tricore/src/common/ToolchainGnuc.defs @@ -117,7 +117,7 @@ UNAR = $(CROSSDEV)tricore-elf-gcc-ar x NM = $(CROSSDEV)tricore-elf-gcc-nm OBJCOPY = $(CROSSDEV)tricore-elf-objcopy OBJDUMP = $(CROSSDEV)tricore-elf-objdump -ASMEXT = S +ASMEXT = .S ARCHOPTIMIZATION += -fno-builtin diff --git a/arch/tricore/src/common/ToolchainTasking.defs b/arch/tricore/src/common/ToolchainTasking.defs index 65fbb9173a1..0fbbd85a115 100644 --- a/arch/tricore/src/common/ToolchainTasking.defs +++ b/arch/tricore/src/common/ToolchainTasking.defs @@ -62,7 +62,7 @@ UNAR = artc -x NM = nm OBJCOPY = echo OBJDUMP = elfdump -ASMEXT = asm +ASMEXT = .asm ARCHOPTIMIZATION += --lsl-core=vtc LDFLAGS += --lsl-core=vtc diff --git a/libs/libc/machine/tricore/Make.defs b/libs/libc/machine/tricore/Make.defs index a1f8a7eba0d..55e92cfe4aa 100644 --- a/libs/libc/machine/tricore/Make.defs +++ b/libs/libc/machine/tricore/Make.defs @@ -33,67 +33,67 @@ endif AFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)machine$(DELIM)tricore ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ASRCS += arch_setjmp.$(ASMEXT) +ASRCS += arch_setjmp$(ASMEXT) endif ifeq ($(CONFIG_LIBC_ARCH_MEMCPY),y) -ASRCS += arch_memcpy.$(ASMEXT) +ASRCS += arch_memcpy$(ASMEXT) endif ifeq ($(CONFIG_LIBC_ARCH_MEMSET),y) -ASRCS += arch_memset.$(ASMEXT) +ASRCS += arch_memset$(ASMEXT) endif ifeq ($(CONFIG_LIBC_ARCH_MEMMOVE),y) -ASRCS += arch_memmove.$(ASMEXT) +ASRCS += arch_memmove$(ASMEXT) endif ifeq ($(CONFIG_LIBC_ARCH_MEMCMP),y) -ASRCS += arch_memcmp.$(ASMEXT) +ASRCS += arch_memcmp$(ASMEXT) endif ifeq ($(CONFIG_LIBC_ARCH_MEMCHR),y) -ASRCS += arch_memchr.$(ASMEXT) +ASRCS += arch_memchr$(ASMEXT) endif ifeq ($(CONFIG_LIBC_ARCH_STRCPY),y) -ASRCS += arch_strcpy.$(ASMEXT) +ASRCS += arch_strcpy$(ASMEXT) endif ifeq ($(CONFIG_LIBC_ARCH_STRCMP),y) -ASRCS += arch_strcmp.$(ASMEXT) +ASRCS += arch_strcmp$(ASMEXT) endif ifeq ($(CONFIG_LIBC_ARCH_STRLEN),y) -ASRCS += arch_strlen.$(ASMEXT) +ASRCS += arch_strlen$(ASMEXT) endif ifeq ($(CONFIG_LIBC_ARCH_STRCHR),y) -ASRCS += arch_strchr.$(ASMEXT) +ASRCS += arch_strchr$(ASMEXT) endif ifeq ($(CONFIG_LIBC_ARCH_STRCHRNUL),y) -ASRCS += arch_strchrnul.$(ASMEXT) +ASRCS += arch_strchrnul$(ASMEXT) endif ifeq ($(CONFIG_LIBC_ARCH_STRNCMP),y) -ASRCS += arch_strncmp.$(ASMEXT) +ASRCS += arch_strncmp$(ASMEXT) endif ifeq ($(CONFIG_LIBC_ARCH_STRNLEN),y) -ASRCS += arch_strnlen.$(ASMEXT) +ASRCS += arch_strnlen$(ASMEXT) endif ifeq ($(CONFIG_LIBC_ARCH_STRRCHR),y) -ASRCS += arch_strrchr.$(ASMEXT) +ASRCS += arch_strrchr$(ASMEXT) endif ifeq ($(CONFIG_LIBC_ARCH_STRNCPY),y) -ASRCS += arch_strncpy.$(ASMEXT) +ASRCS += arch_strncpy$(ASMEXT) endif ifeq ($(CONFIG_LIBC_ARCH_STPCPY),y) -ASRCS += arch_stpcpy.$(ASMEXT) +ASRCS += arch_stpcpy$(ASMEXT) endif DEPPATH += --dep-path machine/tricore/$(TRICORE_SUBDIR)
