risc-v: Move "LDFLAGS += -melf32lriscv" from Make.defs to Toolchain.defs

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

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)

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
-

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

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

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

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

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

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

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

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

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