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 10f5ec0598d464e9e8ba75bc5f3111979fee8daa Author: Saravanan Sekar <[email protected]> AuthorDate: Thu Nov 5 15:47:21 2026 +0530 arch/tricore: Link head assembly sources directly. The arch Makefile links HEAD_CSRC objects directly into the image, but has no counterpart for assembly sources. Add HEAD_ASRC, so code that nothing references by symbol, like a trap vector table that the linker script places, is linked from its object instead of being dropped from the archive. [skip-cmake-parity] Signed-off-by: Saravanan Sekar <[email protected]> --- arch/tricore/src/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/tricore/src/Makefile b/arch/tricore/src/Makefile index ee360b45dcd..097e9677070 100644 --- a/arch/tricore/src/Makefile +++ b/arch/tricore/src/Makefile @@ -45,8 +45,10 @@ endif # The "head" object +HEAD_AOBJ = $(HEAD_ASRC:$(ASMEXT)=$(OBJEXT)) HEAD_COBJ = $(HEAD_CSRC:.c=$(OBJEXT)) -STARTUP_OBJS ?= $(HEAD_COBJ) +HEAD_OBJ = $(HEAD_AOBJ) $(HEAD_COBJ) +STARTUP_OBJS ?= $(HEAD_OBJ) # Flat build or kernel-mode objects @@ -125,11 +127,11 @@ endif VPATH += chip VPATH += common -all: $(HEAD_COBJ) $(BIN) +all: $(HEAD_OBJ) $(BIN) .PHONY: board$(DELIM)libboard$(LIBEXT) -$(AOBJS) $(UAOBJS): %$(OBJEXT): %$(ASMEXT) +$(AOBJS) $(UAOBJS) $(HEAD_AOBJ): %$(OBJEXT): %$(ASMEXT) $(call ASSEMBLE, $<, $@) $(COBJS) $(UCOBJS) $(HEAD_COBJ): %$(OBJEXT): %.c @@ -153,7 +155,7 @@ define LINK_ALLSYMS $(Q) $(TOPDIR)/tools/mkallsyms.py $(NUTTX) allsyms.tmp --orderbyname $(CONFIG_SYMTAB_ORDEREDBYNAME) $(Q) $(call COMPILE, allsyms.tmp, allsyms$(OBJEXT), -x c) $(Q) $(LD) $(LDFLAGS) $(LIBPATHS) $(EXTRA_LIBPATHS) \ - -o $(NUTTX) $(HEAD_COBJ) allsyms$(OBJEXT) $(EXTRA_OBJS) \ + -o $(NUTTX) $(HEAD_OBJ) allsyms$(OBJEXT) $(EXTRA_OBJS) \ $(LDSTARTGROUP) $(LDLIBS) $(EXTRA_LIBS) $(LDENDGROUP) $(Q) $(call DELFILE, allsyms.tmp allsyms$(OBJEXT)) endef @@ -161,12 +163,12 @@ endef $(addsuffix .tmp,$(ARCHSCRIPT)): $(ARCHSCRIPT) $(call PREPROCESS, $(patsubst %.tmp,%,$@), $@) -nuttx$(EXEEXT): $(HEAD_COBJ) board$(DELIM)libboard$(LIBEXT) $(EXTRA_LIBS) $(addsuffix .tmp,$(ARCHSCRIPT)) +nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT) $(EXTRA_LIBS) $(addsuffix .tmp,$(ARCHSCRIPT)) $(Q) echo "LD: nuttx" ifneq ($(CONFIG_ALLSYMS),y) $(Q) $(LD) $(LDFLAGS) $(LIBPATHS) $(EXTRA_LIBPATHS) \ - -o $(NUTTX) $(HEAD_COBJ) $(EXTRA_OBJS) \ + -o $(NUTTX) $(HEAD_OBJ) $(EXTRA_OBJS) \ $(LDSTARTGROUP) $(LDLIBS) $(EXTRA_LIBS) $(LDENDGROUP) else $(Q) # Link and generate default table
