From ebb99cdfc30c57fe9a8fd30c43d3f5db6766274d Mon Sep 17 00:00:00 2001 From: Huang Qi Date: Wed, 20 Sep 2023 09:38:12 +0800 Subject: [PATCH] boards/riscv: Fix module linker target Fix: ``` riscv-none-elf-ld: sotest.o: ABI is incompatible with that of the selected emulation: target emulation `elf64-littleriscv' does not match `elf32-littleriscv' riscv-none-elf-ld: failed to merge target specific data of file sotest.o ``` Signed-off-by: Huang Qi --- boards/risc-v/c906/smartl-c906/scripts/Make.defs | 2 +- boards/risc-v/k210/maix-bit/scripts/Make.defs | 2 +- boards/risc-v/mpfs/icicle/scripts/Make.defs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boards/risc-v/c906/smartl-c906/scripts/Make.defs b/boards/risc-v/c906/smartl-c906/scripts/Make.defs index 13aa6816c17d4..a7b5ee48e8f83 100644 --- a/boards/risc-v/c906/smartl-c906/scripts/Make.defs +++ b/boards/risc-v/c906/smartl-c906/scripts/Make.defs @@ -49,7 +49,7 @@ AFLAGS += $(CFLAGS) -D__ASSEMBLY__ CMODULEFLAGS = $(CFLAGS) -LDMODULEFLAGS = -r -e module_initialize +LDMODULEFLAGS = -melf64lriscv -r -e module_initialize LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld) # ELF module definitions diff --git a/boards/risc-v/k210/maix-bit/scripts/Make.defs b/boards/risc-v/k210/maix-bit/scripts/Make.defs index 10c24c8273208..d43da4aeeafa4 100644 --- a/boards/risc-v/k210/maix-bit/scripts/Make.defs +++ b/boards/risc-v/k210/maix-bit/scripts/Make.defs @@ -38,7 +38,7 @@ AFLAGS += $(CFLAGS) -D__ASSEMBLY__ CMODULEFLAGS = $(CFLAGS) -LDMODULEFLAGS = -r -e module_initialize +LDMODULEFLAGS = -melf64lriscv -r -e module_initialize LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld) # ELF module definitions diff --git a/boards/risc-v/mpfs/icicle/scripts/Make.defs b/boards/risc-v/mpfs/icicle/scripts/Make.defs index c81ebf1a96b80..cc72427b79224 100644 --- a/boards/risc-v/mpfs/icicle/scripts/Make.defs +++ b/boards/risc-v/mpfs/icicle/scripts/Make.defs @@ -72,7 +72,7 @@ AFLAGS += $(CFLAGS) -D__ASSEMBLY__ CMODULEFLAGS = $(CFLAGS) -LDMODULEFLAGS = -r -e module_initialize +LDMODULEFLAGS = -melf64lriscv -r -e module_initialize LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld) # ELF module definitions @@ -80,5 +80,5 @@ LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld) CELFFLAGS = $(CFLAGS) CXXELFFLAGS = $(CXXFLAGS) -LDELFFLAGS = -r -e main +LDELFFLAGS = -melf64lriscv -r -e main LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)