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 9bc2b4c board/sim: Remove CCLINKFLAGS, use CFLAGS/CXXFLAGS instead
9bc2b4c is described below
commit 9bc2b4c31b4e19ba0a6ccb63e78661adaef6d5e1
Author: Xiang Xiao <[email protected]>
AuthorDate: Mon Feb 28 18:31:17 2022 +0800
board/sim: Remove CCLINKFLAGS, use CFLAGS/CXXFLAGS instead
Signed-off-by: Xiang Xiao <[email protected]>
---
arch/sim/src/Makefile | 6 +++---
boards/sim/sim/sim/scripts/Make.defs | 21 ---------------------
2 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index 8703c86..e8ac6b2 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -294,14 +294,14 @@ nuttx$(EXEEXT): libarch$(LIBEXT) board/libboard$(LIBEXT)
$(HEADOBJ) $(LINKOBJS)
$(Q) $(LD) -r $(LDLINKFLAGS) $(RELPATHS) $(EXTRA_LIBPATHS) -o nuttx.rel
$(REQUIREDOBJS) $(LDSTARTGROUP) $(RELLIBS) $(EXTRA_LIBS) $(LDENDGROUP)
ifneq ($(CONFIG_HOST_MACOS),y)
$(Q) $(OBJCOPY) --redefine-syms=nuttx-names.dat nuttx.rel
- $(Q) $(CC) $(CCLINKFLAGS) -Wl,-verbose 2>&1 | \
+ $(Q) $(CC) $(CFLAGS) -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) $(LDFLAGS) -o $(TOPDIR)/$@
$(HEADOBJ) nuttx.rel $(HOSTOBJS) $(STDLIBS),\
- $(Q) "$(CC)" $(CCLINKFLAGS) $(LIBPATHS) $(LDFLAGS) -o $(TOPDIR)/$@
$(HEADOBJ) nuttx.rel $(HOSTOBJS) $(STDLIBS))
+ $(Q) "$(CXX)" $(CFLAGS) $(LIBPATHS) $(LDFLAGS) -o $(TOPDIR)/$@
$(HEADOBJ) nuttx.rel $(HOSTOBJS) $(STDLIBS),\
+ $(Q) "$(CC)" $(CFLAGS) $(LIBPATHS) $(LDFLAGS) -o $(TOPDIR)/$@
$(HEADOBJ) nuttx.rel $(HOSTOBJS) $(STDLIBS))
$(Q) $(NM) $(TOPDIR)/$@ | \
grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw]
\)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
sort > $(TOPDIR)/System.map
diff --git a/boards/sim/sim/sim/scripts/Make.defs
b/boards/sim/sim/sim/scripts/Make.defs
index af1b2f1..0091988 100644
--- a/boards/sim/sim/sim/scripts/Make.defs
+++ b/boards/sim/sim/sim/scripts/Make.defs
@@ -204,34 +204,13 @@ endif
LDELFFLAGS = -r -e main
LDELFFLAGS += -T $(call
CONVERT_PATH,$(BOARD_DIR)$(DELIM)scripts$(DELIM)gnu-elf.ld)
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
- CCLINKFLAGS += -g
-endif
-
ifeq ($(CONFIG_SIM_M32),y)
LDLINKFLAGS += -melf_i386
- CCLINKFLAGS += -m32
LDFLAGS += -m32
LDMODULEFLAGS += -melf_i386
LDELFFLAGS += -melf_i386
HOSTLDFLAGS += -m32
endif
-ifeq ($(CONFIG_SIM_ASAN),y)
- CCLINKFLAGS += -fsanitize=address
-else ifeq ($(CONFIG_MM_KASAN),y)
- CCLINKFLAGS += -fsanitize=kernel-address
-endif
-
-ifeq ($(CONFIG_SIM_UBSAN),y)
- CCLINKFLAGS += -fsanitize=undefined
-endif
-
-ifeq ($(CONFIG_FRAME_POINTER),y)
- CCLINKFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
-else
- CCLINKFLAGS += -fomit-frame-pointer
-endif
-
HOSTCFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
$(ARCHCFLAGS) $(HOSTINCLUDES) $(EXTRAFLAGS) -D__SIM__ -pipe
