Skip to content

Commit 71a4e86

Browse files
yf13xiaoxiang781216
authored andcommitted
risc-v/Toolchain.defs: guard -r in LDELFFLAGS
This guards use of `-r` in LDELFFLAGS in risc-v common/Toolchain.defs so that it is only used when BINFMT_ELF_RELOCATABLE is selected. Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
1 parent 63c8de5 commit 71a4e86

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

arch/risc-v/src/common/Toolchain.defs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,12 @@ LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
433433
CELFFLAGS = $(CFLAGS) -fvisibility=hidden
434434
CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
435435

436-
LDELFFLAGS = -r -e main
436+
LDELFFLAGS = -e main
437+
438+
ifeq ($(CONFIG_BINFMT_ELF_RELOCATABLE),y)
439+
LDELFFLAGS += -r
440+
endif
441+
437442
ifeq ($(CONFIG_ARCH_RV32),y)
438443
LDELFFLAGS += --oformat elf32-littleriscv
439444
else

0 commit comments

Comments
 (0)