From 5958d3ac6259d2065b6f130684ec47856f2aab63 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 15 May 2022 12:45:14 +0800 Subject: [PATCH] risc-v: Move "LDFLAGS += -melf32lriscv" from Make.defs to Toolchain.defs Signed-off-by: Xiang Xiao --- arch/risc-v/src/common/Toolchain.defs | 6 ++++++ boards/risc-v/bl602/bl602evb/scripts/Make.defs | 3 --- boards/risc-v/c906/smartl-c906/scripts/Make.defs | 4 ---- boards/risc-v/esp32c3/esp32c3-devkit/scripts/Make.defs | 2 -- boards/risc-v/fe310/hifive1-revb/scripts/Make.defs | 2 -- boards/risc-v/k210/maix-bit/scripts/Make.defs | 4 ---- boards/risc-v/litex/arty_a7/scripts/Make.defs | 2 -- boards/risc-v/mpfs/icicle/scripts/Make.defs | 4 ---- boards/risc-v/mpfs/m100pfsevp/scripts/Make.defs | 4 ---- boards/risc-v/qemu-rv/rv-virt/scripts/Make.defs | 8 -------- boards/risc-v/rv32m1/rv32m1-vega/scripts/Make.defs | 2 -- 11 files changed, 6 insertions(+), 35 deletions(-) diff --git a/arch/risc-v/src/common/Toolchain.defs b/arch/risc-v/src/common/Toolchain.defs index f0b18eb4472..e7d7be91440 100644 --- a/arch/risc-v/src/common/Toolchain.defs +++ b/arch/risc-v/src/common/Toolchain.defs @@ -81,6 +81,12 @@ ifneq ($(CONFIG_CXX_RTTI),y) ARCHCXXFLAGS += -fno-rtti endif +ifeq ($(CONFIG_ARCH_RV32),y) +LDFLAGS += -melf32lriscv +else +LDFLAGS += -melf64lriscv +endif + # Optimization of unused sections ifeq ($(CONFIG_DEBUG_OPT_UNUSED_SECTIONS),y) diff --git a/boards/risc-v/bl602/bl602evb/scripts/Make.defs b/boards/risc-v/bl602/bl602evb/scripts/Make.defs index a52b68958fb..f4c62718726 100644 --- a/boards/risc-v/bl602/bl602evb/scripts/Make.defs +++ b/boards/risc-v/bl602/bl602evb/scripts/Make.defs @@ -52,6 +52,3 @@ CXXELFFLAGS = $(CXXFLAGS) LDELFFLAGS = -melf32lriscv -r -e main LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld) - -LDFLAGS += -melf32lriscv - diff --git a/boards/risc-v/c906/smartl-c906/scripts/Make.defs b/boards/risc-v/c906/smartl-c906/scripts/Make.defs index 53bbd6f0f1a..d1cba31900c 100644 --- a/boards/risc-v/c906/smartl-c906/scripts/Make.defs +++ b/boards/risc-v/c906/smartl-c906/scripts/Make.defs @@ -59,7 +59,3 @@ CXXELFFLAGS = $(CXXFLAGS) LDELFFLAGS = -r -e main LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld) - -# File extensions - -LDFLAGS += -melf64lriscv diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/scripts/Make.defs b/boards/risc-v/esp32c3/esp32c3-devkit/scripts/Make.defs index 9a3d06da0c5..393bda1470e 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/scripts/Make.defs +++ b/boards/risc-v/esp32c3/esp32c3-devkit/scripts/Make.defs @@ -58,5 +58,3 @@ CXXELFFLAGS = $(CXXFLAGS) LDELFFLAGS = -melf32lriscv -r -e main LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)binfmt$(DELIM)libelf$(DELIM)gnu-elf.ld) - -LDFLAGS += -melf32lriscv diff --git a/boards/risc-v/fe310/hifive1-revb/scripts/Make.defs b/boards/risc-v/fe310/hifive1-revb/scripts/Make.defs index eb98d0ecffb..37ca632cee2 100644 --- a/boards/risc-v/fe310/hifive1-revb/scripts/Make.defs +++ b/boards/risc-v/fe310/hifive1-revb/scripts/Make.defs @@ -38,5 +38,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS) CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) AFLAGS += $(CFLAGS) -D__ASSEMBLY__ - -LDFLAGS += -melf32lriscv diff --git a/boards/risc-v/k210/maix-bit/scripts/Make.defs b/boards/risc-v/k210/maix-bit/scripts/Make.defs index ddcc05ac455..10c24c82732 100644 --- a/boards/risc-v/k210/maix-bit/scripts/Make.defs +++ b/boards/risc-v/k210/maix-bit/scripts/Make.defs @@ -48,7 +48,3 @@ CXXELFFLAGS = $(CXXFLAGS) LDELFFLAGS = -r -e main LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld) - -# File extensions - -LDFLAGS += -melf64lriscv diff --git a/boards/risc-v/litex/arty_a7/scripts/Make.defs b/boards/risc-v/litex/arty_a7/scripts/Make.defs index 54d8241adee..a1e83f5acd3 100644 --- a/boards/risc-v/litex/arty_a7/scripts/Make.defs +++ b/boards/risc-v/litex/arty_a7/scripts/Make.defs @@ -33,5 +33,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS) CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) AFLAGS += $(CFLAGS) -D__ASSEMBLY__ - -LDFLAGS += -melf32lriscv diff --git a/boards/risc-v/mpfs/icicle/scripts/Make.defs b/boards/risc-v/mpfs/icicle/scripts/Make.defs index 74175c585b5..22b4cc5a117 100755 --- a/boards/risc-v/mpfs/icicle/scripts/Make.defs +++ b/boards/risc-v/mpfs/icicle/scripts/Make.defs @@ -78,7 +78,3 @@ CXXELFFLAGS = $(CXXFLAGS) LDELFFLAGS = -r -e main LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld) - -# File extensions - -LDFLAGS += -melf64lriscv diff --git a/boards/risc-v/mpfs/m100pfsevp/scripts/Make.defs b/boards/risc-v/mpfs/m100pfsevp/scripts/Make.defs index 8a4ba6cce90..d54f3ae6be5 100755 --- a/boards/risc-v/mpfs/m100pfsevp/scripts/Make.defs +++ b/boards/risc-v/mpfs/m100pfsevp/scripts/Make.defs @@ -59,7 +59,3 @@ CXXELFFLAGS = $(CXXFLAGS) LDELFFLAGS = -r -e main LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld) - -# File extensions - -LDFLAGS += -melf64lriscv diff --git a/boards/risc-v/qemu-rv/rv-virt/scripts/Make.defs b/boards/risc-v/qemu-rv/rv-virt/scripts/Make.defs index e5e2c2940a9..2de012f2773 100644 --- a/boards/risc-v/qemu-rv/rv-virt/scripts/Make.defs +++ b/boards/risc-v/qemu-rv/rv-virt/scripts/Make.defs @@ -55,11 +55,3 @@ endif LDELFFLAGS += -r -e main LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld) - -# File extensions - -ifeq ($(CONFIG_ARCH_RV32),y) -LDFLAGS += -melf32lriscv -else -LDFLAGS += -melf64lriscv -endif diff --git a/boards/risc-v/rv32m1/rv32m1-vega/scripts/Make.defs b/boards/risc-v/rv32m1/rv32m1-vega/scripts/Make.defs index 857feefa8bd..7973b5dbd17 100644 --- a/boards/risc-v/rv32m1/rv32m1-vega/scripts/Make.defs +++ b/boards/risc-v/rv32m1/rv32m1-vega/scripts/Make.defs @@ -48,5 +48,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS) CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) AFLAGS += $(CFLAGS) -D__ASSEMBLY__ - -LDFLAGS += -melf32lriscv