This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 5076b0c74c risc-v:Unify module compilation options
5076b0c74c is described below
commit 5076b0c74ccc280e4af6042219f6a5d07e78b7ac
Author: anjiahao <[email protected]>
AuthorDate: Thu Oct 10 21:56:23 2024 +0800
risc-v:Unify module compilation options
Signed-off-by: anjiahao <[email protected]>
---
arch/risc-v/src/common/Toolchain.defs | 6 ++++++
boards/risc-v/bl808/ox64/scripts/Make.defs | 9 ---------
boards/risc-v/jh7110/star64/scripts/Make.defs | 4 ----
boards/risc-v/k230/canmv230/scripts/Make.defs | 10 ----------
boards/risc-v/litex/arty_a7/scripts/Make.defs | 6 ------
boards/risc-v/qemu-rv/rv-virt/scripts/Make.defs | 15 ---------------
boards/risc-v/sg2000/milkv_duos/scripts/Make.defs | 9 ---------
7 files changed, 6 insertions(+), 53 deletions(-)
diff --git a/arch/risc-v/src/common/Toolchain.defs
b/arch/risc-v/src/common/Toolchain.defs
index 5a67042a56..a6fddffd8e 100644
--- a/arch/risc-v/src/common/Toolchain.defs
+++ b/arch/risc-v/src/common/Toolchain.defs
@@ -411,6 +411,12 @@ CELFFLAGS = $(CFLAGS) -fvisibility=hidden
CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
LDELFFLAGS = -r -e main
+ifeq ($(CONFIG_ARCH_RV32),y)
+ LDELFFLAGS += --oformat elf32-littleriscv
+else
+ LDELFFLAGS += --oformat elf64-littleriscv
+endif
+
LDELFFLAGS += -T $(call
CONVERT_PATH,$(TOPDIR)$(DELIM)binfmt$(DELIM)libelf$(DELIM)gnu-elf.ld)
# Zig toolchain
diff --git a/boards/risc-v/bl808/ox64/scripts/Make.defs
b/boards/risc-v/bl808/ox64/scripts/Make.defs
index a276f07106..35d0b89981 100644
--- a/boards/risc-v/bl808/ox64/scripts/Make.defs
+++ b/boards/risc-v/bl808/ox64/scripts/Make.defs
@@ -33,12 +33,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION)
$(ARCHCPUFLAGS) $(ARCHXXINCLUDES
CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
AFLAGS += $(CFLAGS) -D__ASSEMBLY__
-
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS)
-CXXELFFLAGS = $(CXXFLAGS)
-
-LDELFFLAGS = --oformat elf64-littleriscv
-LDELFFLAGS += -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
diff --git a/boards/risc-v/jh7110/star64/scripts/Make.defs
b/boards/risc-v/jh7110/star64/scripts/Make.defs
index 349dc9c066..b23431bc26 100644
--- a/boards/risc-v/jh7110/star64/scripts/Make.defs
+++ b/boards/risc-v/jh7110/star64/scripts/Make.defs
@@ -32,7 +32,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION)
$(ARCHCPUFLAGS) $(ARCHXXINCLUDES
CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
AFLAGS += $(CFLAGS) -D__ASSEMBLY__
-
-# ELF module definitions
-
-LDELFFLAGS += --oformat elf64-littleriscv
diff --git a/boards/risc-v/k230/canmv230/scripts/Make.defs
b/boards/risc-v/k230/canmv230/scripts/Make.defs
index 4c3dfdf274..da54ecd24c 100644
--- a/boards/risc-v/k230/canmv230/scripts/Make.defs
+++ b/boards/risc-v/k230/canmv230/scripts/Make.defs
@@ -44,16 +44,6 @@ CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
AFLAGS += $(CFLAGS) -D__ASSEMBLY__
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS)
-CXXELFFLAGS = $(CXXFLAGS)
-
-LDELFFLAGS = --oformat elf64-littleriscv
-ifeq ($(CONFIG_BINFMT_ELF_RELOCATABLE),y)
-LDELFFLAGS += -r
-endif
-
# POSTBUILD management
# KERNEL builds need real ROMFS and even OpenSBI wrapping
diff --git a/boards/risc-v/litex/arty_a7/scripts/Make.defs
b/boards/risc-v/litex/arty_a7/scripts/Make.defs
index 851fc8440d..b66dae9d2c 100644
--- a/boards/risc-v/litex/arty_a7/scripts/Make.defs
+++ b/boards/risc-v/litex/arty_a7/scripts/Make.defs
@@ -38,9 +38,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION)
$(ARCHCPUFLAGS) $(ARCHXXINCLUDES
CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
AFLAGS += $(CFLAGS) -D__ASSEMBLY__
-
-LDELFFLAGS += --oformat elf32-littleriscv
-
-ifeq ($(CONFIG_BINFMT_ELF_RELOCATABLE),y)
-LDELFFLAGS += -r
-endif
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 135e1c45ef..bd2be83a50 100644
--- a/boards/risc-v/qemu-rv/rv-virt/scripts/Make.defs
+++ b/boards/risc-v/qemu-rv/rv-virt/scripts/Make.defs
@@ -44,21 +44,6 @@ CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
AFLAGS += $(CFLAGS) -D__ASSEMBLY__
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS)
-CXXELFFLAGS = $(CXXFLAGS)
-
-ifeq ($(CONFIG_ARCH_RV32),y)
- LDELFFLAGS = --oformat elf32-littleriscv
-else
- LDELFFLAGS = --oformat elf64-littleriscv
-endif
-
-ifeq ($(CONFIG_BINFMT_ELF_RELOCATABLE),y)
-LDELFFLAGS += -r
-endif
-
# POSTBUILD management
# KERNEL builds need real ROMFS
diff --git a/boards/risc-v/sg2000/milkv_duos/scripts/Make.defs
b/boards/risc-v/sg2000/milkv_duos/scripts/Make.defs
index 7379481a36..eb46ea76e0 100644
--- a/boards/risc-v/sg2000/milkv_duos/scripts/Make.defs
+++ b/boards/risc-v/sg2000/milkv_duos/scripts/Make.defs
@@ -32,12 +32,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION)
$(ARCHCPUFLAGS) $(ARCHXXINCLUDES
CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
AFLAGS += $(CFLAGS) -D__ASSEMBLY__
-
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS)
-CXXELFFLAGS = $(CXXFLAGS)
-
-LDELFFLAGS = --oformat elf64-littleriscv
-LDELFFLAGS += -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
