[incubator-nuttx] branch master updated: SIM in MacOS: make MacOS link process same with Linux

[ya...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yamamoto 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 a983025  SIM in MacOS: make MacOS link process same with Linux
a983025 is described below

commit a9830254cfc0f30554ebd9477a08c0be83686ead
Author: ligd <li...@xiaomi.com>
AuthorDate: Thu Sep 17 15:31:54 2020 +0800

    SIM in MacOS: make MacOS link process same with Linux
    
    1. There is difference about symbol replace on nuttx-names.in
       between MacOS & Linux
    2. For MacOS, if open '-fvisibility=hidden' and adjust nuttx-names.in,
       it will meet symbol link-back-to-nuttx error.
    3. Make the MacOS replace behaviour, same with Linux
    
    Note:
    MacOS should install objcopy with command:
    $ brew install binutils
    $ export PATH=$PATH:/usr/local/opt/binutils/bin
    
    already check in to cibuild.sh
    
    Change-Id: If78b784cc0ecb98cdbf7091de38acef00a8a02f3
    Signed-off-by: ligd <li...@xiaomi.com>
---
 arch/sim/src/Makefile                | 8 ++------
 arch/sim/src/nuttx-names.in          | 5 ++---
 boards/sim/sim/sim/scripts/Make.defs | 4 ----
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index 63031cc..96736d4 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -225,9 +225,7 @@ OBJS = $(AOBJS) $(COBJS) $(HOSTOBJS)
 
 # Override in Make.defs if linker is not 'ld'
 
-ifeq ($(HOSTOS),Darwin)
-  LDUNEXPORTSYMBOLS ?= -unexported_symbols_list nuttx-names.dat
-else
+ifneq ($(HOSTOS),Darwin)
   ARCHSCRIPT += -T nuttx.ld
   LDSTARTGROUP ?= --start-group
   LDENDGROUP ?= --end-group
@@ -292,14 +290,12 @@ board/libboard$(LIBEXT):
 nuttx$(EXEEXT): libarch$(LIBEXT) board/libboard$(LIBEXT) $(LINKOBJS) $(HOSTOBJS)
 	$(Q) echo "LD:  nuttx$(EXEEXT)"
 	$(call PREPROCESS, nuttx-names.in, nuttx-names.dat)
-	$(Q) $(LD) -r $(LDLINKFLAGS) $(RELPATHS) $(EXTRA_LIBPATHS) -o nuttx.rel $(REQUIREDOBJS) $(LDSTARTGROUP) $(RELLIBS) $(EXTRA_LIBS) $(LDENDGROUP) $(LDUNEXPORTSYMBOLS)
-ifneq ($(HOSTOS),Darwin)
+	$(Q) $(LD) -r $(LDLINKFLAGS) $(RELPATHS) $(EXTRA_LIBPATHS) -o nuttx.rel $(REQUIREDOBJS) $(LDSTARTGROUP) $(RELLIBS) $(EXTRA_LIBS) $(LDENDGROUP)
 	$(Q) $(OBJCOPY) --redefine-syms=nuttx-names.dat nuttx.rel
 	$(Q) $(CC) $(CCLINKFLAGS) -Wl,-verbose 2>&1 | \
 	     sed -e '/====/,/====/!d;//d' -e 's/__executable_start/_stext/g' -e 's/__init_array_start/_sinit/g' \
 	         -e 's/__init_array_end/_einit/g' -e 's/__fini_array_start/_sfini/g' -e 's/__fini_array_end/_efini/g' >nuttx.ld
 	$(Q) echo "__init_array_start = .; __init_array_end = .; __fini_array_start = .; __fini_array_end = .;" >>nuttx.ld
-endif
 	$(if $(CONFIG_HAVE_CXX),\
 	$(Q) "$(CXX)" $(CCLINKFLAGS) $(LIBPATHS) $(ARCHSCRIPT) -o $(TOPDIR)/$@ nuttx.rel $(HOSTOBJS) $(DRVLIB) $(STDLIBS),\
 	$(Q) "$(CC)" $(CCLINKFLAGS) $(LIBPATHS) $(ARCHSCRIPT) -o $(TOPDIR)/$@ nuttx.rel $(HOSTOBJS) $(DRVLIB) $(STDLIBS))
diff --git a/arch/sim/src/nuttx-names.in b/arch/sim/src/nuttx-names.in
index 7c4c270..2c2d559 100644
--- a/arch/sim/src/nuttx-names.in
+++ b/arch/sim/src/nuttx-names.in
@@ -23,9 +23,8 @@
 #define CONCAT_(x, y) x##y
 #define CONCAT(x, y)  CONCAT_(x, y)
 
-#if defined(CONFIG_HOST_MACOS)
-  #define NXSYMBOLS(s) _##s
-#elif defined(CONFIG_HOST_WINDOWS) && defined(CONFIG_SIM_CYGWIN_DECORATED)
+#if defined(CONFIG_HOST_MACOS) || \
+    (defined(CONFIG_HOST_WINDOWS) && defined(CONFIG_SIM_CYGWIN_DECORATED))
   #define NXSYMBOLS(s) _##s NX##s
 #else
   #define NXSYMBOLS(s) s NX##s
diff --git a/boards/sim/sim/sim/scripts/Make.defs b/boards/sim/sim/sim/scripts/Make.defs
index d374c90..380987b 100644
--- a/boards/sim/sim/sim/scripts/Make.defs
+++ b/boards/sim/sim/sim/scripts/Make.defs
@@ -47,10 +47,6 @@ ARCHWARNINGSXX = -Wall -Wshadow -Wundef
 ARCHCPUFLAGS += -fvisibility=hidden
 ARCHCPUFLAGSXX += -fvisibility=hidden
 
-ifeq ($(CONFIG_HOST_MACOS),y)
-  LDLINKFLAGS += -keep_private_externs
-endif
-
 # Add -fno-common because macOS "ld -r" doesn't seem to pick objects
 # for common symbols.
 ARCHCPUFLAGS += -fno-common