[incubator-nuttx] branch master updated: Fix `CONFIG_ALLSYMS` for arm, risc-v and xtensa after #5496

[xiaoxiang]

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/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new e6376c72d7 Fix `CONFIG_ALLSYMS` for arm, risc-v and xtensa after #5496
e6376c72d7 is described below

commit e6376c72d728c905a51ed3c629e3e1e0c48f95a2
Author: Norman Rasmussen <nor...@rasmussen.co.za>
AuthorDate: Sun Jun 12 18:50:19 2022 -0700

    Fix `CONFIG_ALLSYMS` for arm, risc-v and xtensa after #5496
---
 arch/arm/src/Makefile    | 2 +-
 arch/risc-v/src/Makefile | 2 +-
 arch/xtensa/src/Makefile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile
index 3f4d238033..b84db3f744 100644
--- a/arch/arm/src/Makefile
+++ b/arch/arm/src/Makefile
@@ -149,7 +149,7 @@ define LINK_ALLSYMS
        $(Q) $(TOPDIR)/tools/mkallsyms.sh $(NUTTX) $(CROSSDEV) > allsyms.tmp
        $(Q) $(call COMPILE, -x c allsyms.tmp, allsyms$(OBJEXT))
        $(Q) $(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) $(EXTRA_LIBPATHS) \
-               -o $(NUTTX) $(filter-out board/libboard$(LIBEXT), $1) 
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
diff --git a/arch/risc-v/src/Makefile b/arch/risc-v/src/Makefile
index 0d1047bc59..711255104b 100644
--- a/arch/risc-v/src/Makefile
+++ b/arch/risc-v/src/Makefile
@@ -140,7 +140,7 @@ define LINK_ALLSYMS
        $(Q) $(TOPDIR)/tools/mkallsyms.sh $(NUTTX) $(CROSSDEV) > allsyms.tmp
        $(Q) $(call COMPILE, -x c allsyms.tmp, allsyms$(OBJEXT))
        $(Q) $(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) $(EXTRA_LIBPATHS) \
-               -o $(NUTTX) $(filter-out board/libboard$(LIBEXT), $1) 
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
diff --git a/arch/xtensa/src/Makefile b/arch/xtensa/src/Makefile
index b228c59eaf..fdaf628b46 100644
--- a/arch/xtensa/src/Makefile
+++ b/arch/xtensa/src/Makefile
@@ -137,7 +137,7 @@ define LINK_ALLSYMS
        $(Q) $(TOPDIR)/tools/mkallsyms.sh $(NUTTX) $(CROSSDEV) > allsyms.tmp
        $(Q) $(call COMPILE, -x c allsyms.tmp, allsyms$(OBJEXT))
        $(Q) $(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) $(EXTRA_LIBPATHS) \
-               -o $(NUTTX) $(filter-out board/libboard$(LIBEXT), $1) 
allsyms$(OBJEXT) $(EXTRA_OBJS) \
+               -o $(NUTTX) $(STARTUP_OBJS) allsyms$(OBJEXT) $(EXTRA_OBJS) \
                $(LDSTARTGROUP) $(LDLIBS) $(EXTRA_LIBS) $(LDENDGROUP)
        $(Q) $(call DELFILE, allsyms.tmp allsyms$(OBJEXT))
 endef