You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/12/29 05:47:15 UTC

[incubator-nuttx] branch master updated: make/allsyms: skip the unnecessary link operation

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 7ed0b97  make/allsyms: skip the unnecessary link operation
7ed0b97 is described below

commit 7ed0b9741448bfc7d5a5bea26c5cf8e1e9893733
Author: chao.an <an...@xiaomi.com>
AuthorDate: Tue Dec 28 11:32:19 2021 +0800

    make/allsyms: skip the unnecessary link operation
    
    For incremental compilation, skip the stage 1 dummy link
    operation if nuttx elf has been generated
    
    Signed-off-by: chao.an <an...@xiaomi.com>
---
 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 61846b2..f265b8e 100644
--- a/arch/arm/src/Makefile
+++ b/arch/arm/src/Makefile
@@ -168,7 +168,7 @@ ifneq ($(CONFIG_ALLSYMS),y)
 		$(LDSTARTGROUP) $(LDLIBS) $(EXTRA_LIBS) $(LDENDGROUP)
 else
 	$(Q) # Link and generate default table
-	$(Q) $(call LINK_ALLSYMS, $^)
+	$(Q) $(if $(wildcard $(shell echo $(NUTTX))),,$(call LINK_ALLSYMS,$^))
 	$(Q) # Extract all symbols
 	$(Q) $(call LINK_ALLSYMS, $^)
 	$(Q) # Extract again since the table offset may changed
diff --git a/arch/risc-v/src/Makefile b/arch/risc-v/src/Makefile
index 46e4fce..a6add5f 100644
--- a/arch/risc-v/src/Makefile
+++ b/arch/risc-v/src/Makefile
@@ -170,7 +170,7 @@ ifneq ($(CONFIG_ALLSYMS),y)
 		$(LDSTARTGROUP) $(LDLIBS) $(EXTRA_LIBS) $(LDENDGROUP)
 else
 	$(Q) # Link and generate default table
-	$(Q) $(call LINK_ALLSYMS, $^)
+	$(Q) $(if $(wildcard $(shell echo $(NUTTX))),,$(call LINK_ALLSYMS,$^))
 	$(Q) # Extract all symbols
 	$(Q) $(call LINK_ALLSYMS, $^)
 	$(Q) # Extract again since the table offset may changed
diff --git a/arch/xtensa/src/Makefile b/arch/xtensa/src/Makefile
index bb673eb..71e5607 100644
--- a/arch/xtensa/src/Makefile
+++ b/arch/xtensa/src/Makefile
@@ -122,7 +122,7 @@ ifneq ($(CONFIG_ALLSYMS),y)
 		$(LDSTARTGROUP) $(LDLIBS) $(EXTRA_LIBS) $(LDENDGROUP)
 else
 	$(Q) # Link and generate default table
-	$(Q) $(call LINK_ALLSYMS, $^)
+	$(Q) $(if $(wildcard $(shell echo $(NUTTX))),,$(call LINK_ALLSYMS,$^))
 	$(Q) # Extract all symbols
 	$(Q) $(call LINK_ALLSYMS, $^)
 	$(Q) # Extract again since the table offset may changed