You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by je...@apache.org on 2020/01/29 08:26:11 UTC
[incubator-nuttx] 03/12: Revert "sim: Fix nuttx.rel for macOS"
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch revert-179-osx-sim
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 6d4eb93a5a184730bd6c4b2c82b87927f3fddd21
Author: Alin Jerpelea <al...@sony.com>
AuthorDate: Wed Jan 29 09:26:02 2020 +0100
Revert "sim: Fix nuttx.rel for macOS"
This reverts commit b5573c5b51b3bdf38b7cea318cae41bd141f46e3.
---
arch/sim/src/Makefile | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index 8bd1f72..b7f5196 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -195,15 +195,8 @@ endif
# Override in Make.defs if linker is not 'ld'
-ifeq ($(HOSTOS),Darwin)
- LDSTARTGROUP ?=
- LDENDGROUP ?=
- LDUNEXPORTSYMBOLS ?= -unexported_symbols_list $(HOSTOS)-names.dat
-else
- LDSTARTGROUP ?= --start-group
- LDENDGROUP ?= --end-group
- LDUNEXPORTSYMBOLS ?=
-endif
+LDSTARTGROUP ?= --start-group
+LDENDGROUP ?= --end-group
EXTRA_LIBS ?=
EXTRA_LIBPATHS ?=
@@ -299,15 +292,10 @@ else
$(Q) cp nuttx-names.dat $@
endif
-Darwin-names.dat: nuttx-names.dat
- $(Q) cat $^ | sed -e "s/^\([^[:space:]][^[:space:]]*\)[[:space:]].*/_\1/g" >$@
-
nuttx.rel : libarch$(LIBEXT) board/libboard$(LIBEXT) $(HOSTOS)-names.dat $(LINKOBJS)
$(Q) echo "LD: nuttx.rel"
- $(Q) $(LD) -r $(LDLINKFLAGS) $(RELPATHS) $(EXTRA_LIBPATHS) -o $@ $(REQUIREDOBJS) $(LDSTARTGROUP) $(RELLIBS) $(EXTRA_LIBS) $(LDENDGROUP) $(LDUNEXPORTSYMBOLS)
-ifneq ($(HOSTOS),Darwin)
+ $(Q) $(LD) -r $(LDLINKFLAGS) $(RELPATHS) $(EXTRA_LIBPATHS) -o $@ $(REQUIREDOBJS) $(LDSTARTGROUP) $(RELLIBS) $(EXTRA_LIBS) $(LDENDGROUP)
$(Q) $(OBJCOPY) --redefine-syms=$(HOSTOS)-names.dat $@
-endif
# Generate the final NuttX binary by linking the host-specific objects with the NuttX
# specific objects (with munged names)
@@ -339,7 +327,7 @@ export_startup: board/libboard$(LIBEXT) up_head.o $(HOSTOBJS)
depend: .depend
cleanrel:
- $(Q) rm -f nuttx.rel $(HOSTOS)-names.dat
+ $(Q) rm -f nuttx.rel GNU/Linux-names.dat Cygwin-names.dat
clean: cleanrel
$(Q) if [ -e board/Makefile ]; then \