sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch: Fix linking of multiple preprocessed linker script files

Browse Source 
Only the last item from the ARCHSCRIPT list was being suffixed with
".tmp".

Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
This commit is contained in:
Gustavo Henrique Nihei 2022-11-01 17:12:15 -03:00 committed by Xiang Xiao
parent fd8647d3dd
commit f5c77933cb
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/Makefile
View File

@ -110,7 +110,7 @@ endif
ARCHSCRIPT := $(call CONVERT_PATH,$(ARCHSCRIPT)) ARCHSCRIPT := $(call CONVERT_PATH,$(ARCHSCRIPT))
LDFLAGS += $(addprefix $(SCRIPT_OPT),$(ARCHSCRIPT).tmp) $(EXTRALINKCMDS) LDFLAGS += $(addprefix $(SCRIPT_OPT),$(addsuffix .tmp,$(ARCHSCRIPT))) $(EXTRALINKCMDS)
LIBPATHS += $(LIBPATH_OPT) $(call CONVERT_PATH,$(TOPDIR)$(DELIM)staging) LIBPATHS += $(LIBPATH_OPT) $(call CONVERT_PATH,$(TOPDIR)$(DELIM)staging)
BOARDMAKE = $(if $(wildcard board$(DELIM)Makefile),y,) BOARDMAKE = $(if $(wildcard board$(DELIM)Makefile),y,)

2
arch/risc-v/src/Makefile
View File

@ -80,7 +80,7 @@ KBIN = libkarch$(LIBEXT)
BIN = libarch$(LIBEXT) BIN = libarch$(LIBEXT)
ARCHSCRIPT := $(call CONVERT_PATH,$(ARCHSCRIPT)) ARCHSCRIPT := $(call CONVERT_PATH,$(ARCHSCRIPT))
LDFLAGS += $(addprefix -T,$(ARCHSCRIPT).tmp) $(EXTRALINKCMDS) LDFLAGS += $(addprefix -T,$(addsuffix .tmp,$(ARCHSCRIPT))) $(EXTRALINKCMDS)
ifeq ($(LD),$(CC)) ifeq ($(LD),$(CC))
LDSTARTGROUP ?= -Wl,--start-group LDSTARTGROUP ?= -Wl,--start-group

2
arch/xtensa/src/Makefile
View File

@ -81,7 +81,7 @@ BIN = libarch$(LIBEXT)
# Override in Make.defs if linker is not 'ld' # Override in Make.defs if linker is not 'ld'
ARCHSCRIPT := $(call CONVERT_PATH,$(ARCHSCRIPT)) ARCHSCRIPT := $(call CONVERT_PATH,$(ARCHSCRIPT))
LDFLAGS += $(addprefix -T,$(ARCHSCRIPT).tmp) $(EXTRALINKCMDS) LDFLAGS += $(addprefix -T,$(addsuffix .tmp,$(ARCHSCRIPT))) $(EXTRALINKCMDS)
ifeq ($(LD),$(CC)) ifeq ($(LD),$(CC))
LDSTARTGROUP ?= -Wl,--start-group LDSTARTGROUP ?= -Wl,--start-group