You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/06/29 23:52:19 UTC
[incubator-nuttx-apps] branch master updated (3a92024 -> 7650a3c)
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from 3a92024 cxxtest: Should check CONFIG_CXX_EXCEPTION instead of CONFIG_UCLIBCXX_EXCEPTION
new 13df7ac make/import: support depend context on import build
new 10d596c make/import: remove LDLIBS declare
new c81a1f9 make/import: support install nuttx binary in flat build
new 7650a3c make/import: override the ld group if undeclared
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile | 10 ++++++++--
import/Make.defs | 14 ++++++++++----
import/Makefile | 12 +++++++++++-
3 files changed, 29 insertions(+), 7 deletions(-)
[incubator-nuttx-apps] 02/04: make/import: remove LDLIBS declare
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 10d596cb8e37d3a6133e2bedbf8a6785f27e66f4
Author: chao.an <an...@xiaomi.com>
AuthorDate: Wed Jun 24 10:57:05 2020 +0800
make/import: remove LDLIBS declare
which already exported in scripts/Make.defs
Change-Id: I74858632f779fc2a409c9f4afb114db14003686d
Signed-off-by: chao.an <an...@xiaomi.com>
---
import/Make.defs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/import/Make.defs b/import/Make.defs
index 4a87383..3f99b32 100644
--- a/import/Make.defs
+++ b/import/Make.defs
@@ -80,12 +80,10 @@ else
LDLIBPATH = -L $(APPDIR) -L $(TOPDIR)$(DELIM)libs
endif
-LDLIBS = -lapps -lnuttx
-
# Try to get the path to libgcc.a. Of course, this only works for GCC
# toolchains.
-LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name 2>/dev/null}"
+LIBGCC = ${shell "$(CC)" $(ARCHCPUFLAGS) -print-file-name=libgcc.a}
ifneq ($(LIBGCC),)
LDLIBPATH += -L "${shell dirname $(LIBGCC)}"
LDLIBS += -lgcc
[incubator-nuttx-apps] 01/04: make/import: support depend context
on import build
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 13df7aca4189e98ddf5c6d93edd083b0f9acfa3c
Author: chao.an <an...@xiaomi.com>
AuthorDate: Wed Jun 24 10:36:33 2020 +0800
make/import: support depend context on import build
Change-Id: Ia390a2defdb6a71a60a5f3c261b806d13810626e
Signed-off-by: chao.an <an...@xiaomi.com>
---
Makefile | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index fdca285..7d97135 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,9 @@ $(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),depend))
$(foreach SDIR, $(CLEANDIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
$(foreach SDIR, $(CLEANDIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
+$(MKDEP): $(TOPDIR)/tools/mkdeps.c
+ $(HOSTCC) $(HOSTINCLUDES) $(HOSTCFLAGS) $< -o $@
+
# In the KERNEL build, we must build and install all of the modules. No
# symbol table is needed
@@ -78,7 +81,8 @@ install: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_install)
.import: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
$(Q) $(MAKE) install TOPDIR="$(TOPDIR)"
-import:
+import: $(MKDEP) context
+ $(Q) $(MAKE) depend TOPDIR="$(APPDIR)$(DELIM)import"
$(Q) $(MAKE) .import TOPDIR="$(APPDIR)$(DELIM)import"
else
@@ -113,7 +117,8 @@ install: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_install)
.import: $(BIN) install
-import:
+import: $(MKDEP) context
+ $(Q) $(MAKE) depend TOPDIR="$(APPDIR)$(DELIM)import"
$(Q) $(MAKE) .import TOPDIR="$(APPDIR)$(DELIM)import"
endif # CONFIG_BUILD_KERNEL
[incubator-nuttx-apps] 03/04: make/import: support install nuttx
binary in flat build
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit c81a1f9711faf7fe2667a14daba74b0b6ec173f7
Author: chao.an <an...@xiaomi.com>
AuthorDate: Wed Jun 24 11:14:02 2020 +0800
make/import: support install nuttx binary in flat build
Change-Id: Iaffa86ee9ebd77380424e6d4a0777262685c989f
Signed-off-by: chao.an <an...@xiaomi.com>
---
Makefile | 1 +
import/Make.defs | 2 +-
import/Makefile | 12 +++++++++++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 7d97135..29d5e09 100644
--- a/Makefile
+++ b/Makefile
@@ -120,6 +120,7 @@ install: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_install)
import: $(MKDEP) context
$(Q) $(MAKE) depend TOPDIR="$(APPDIR)$(DELIM)import"
$(Q) $(MAKE) .import TOPDIR="$(APPDIR)$(DELIM)import"
+ $(Q) $(MAKE) -C import install TOPDIR="$(APPDIR)$(DELIM)import"
endif # CONFIG_BUILD_KERNEL
diff --git a/import/Make.defs b/import/Make.defs
index 3f99b32..41833fa 100644
--- a/import/Make.defs
+++ b/import/Make.defs
@@ -77,7 +77,7 @@ ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDLIBPATH = -L "${shell cygpath -w $(APPDIR)}" -L "${shell cygpath -w $(TOPDIR)$(DELIM)libs}"
else
# Linux/Cygwin-native toolchain
- LDLIBPATH = -L $(APPDIR) -L $(TOPDIR)$(DELIM)libs
+ LDLIBPATH = -L $(TOPDIR)$(DELIM)libs
endif
# Try to get the path to libgcc.a. Of course, this only works for GCC
diff --git a/import/Makefile b/import/Makefile
index 63eb4be..d2b18ac 100644
--- a/import/Makefile
+++ b/import/Makefile
@@ -43,7 +43,17 @@ FILES = .config System.map User.map
all:
.PHONY: context depend clean distclean
-install:
+APPDIR = $(realpath $(CURDIR)$(DELIM)..)
+HEAD_OBJ += $(wildcard $(TOPDIR)$(DELIM)startup$(DELIM)*$(OBJEXT))
+HEAD_OBJ += $(wildcard $(APPDIR)$(DELIM)builtin$(DELIM)*$(OBJEXT))
+
+$(APPDIR)$(DELIM)nuttx$(EXEEXT): $(wildcard $(APPDIR)$(DELIM)*$(LIBEXT))
+ $(Q) echo "LD: nuttx"
+ $(Q) $(LD) --entry=__start $(LDFLAGS) -T$(LDSCRIPT) $(LIBPATHS) \
+ $(LDLIBPATH) -L$(CURDIR)$(DELIM)scripts -o $@ $(HEAD_OBJ) \
+ $(EXTRA_OBJS) $(LDSTARTGROUP) $^ $(LDLIBS) $(EXTRA_LIBS) $(LDENDGROUP)
+
+install: $(APPDIR)$(DELIM)nuttx$(EXEEXT)
context:
[incubator-nuttx-apps] 04/04: make/import: override the ld group if
undeclared
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 7650a3c71cb7f0f9dfc9ad2a0e5ea06aaed7c551
Author: chao.an <an...@xiaomi.com>
AuthorDate: Wed Jun 24 20:53:39 2020 +0800
make/import: override the ld group if undeclared
Change-Id: I8f2fde21dcaac7c9a88915d585fda0ab30ce1d56
Signed-off-by: chao.an <an...@xiaomi.com>
---
import/Make.defs | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/import/Make.defs b/import/Make.defs
index 41833fa..5c2c132 100644
--- a/import/Make.defs
+++ b/import/Make.defs
@@ -60,6 +60,14 @@ CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
+ifeq ($(LDSTARTGROUP),)
+LDSTARTGROUP = --start-group
+endif
+
+ifeq ($(LDENDGROUP),)
+LDENDGROUP = --end-group
+endif
+
# ELF module definitions
CELFFLAGS = $(CFLAGS)