This is an automated email from the ASF dual-hosted git repository.

xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit f40ae06848a7ff137c8a6c4282443a5947585b52
Author: Marco Casaroli <[email protected]>
AuthorDate: Tue Oct 20 23:33:23 2026 +0200

    boards: Remove the ELF and module flags that replace the arch values.
    
    The arch Toolchain.defs sets CELFFLAGS, CXXELFFLAGS, LDELFFLAGS,
    CMODULEFLAGS and LDMODULEFLAGS.  22 boards set them again with "="
    after they include it, with old values:
    
    - 14 boards link an ELF program with a linker script that does not
      exist (binfmt/elf/gnu-elf.ld or binfmt/libelf/gnu-elf.ld).
    - The ELF programs link without crt0.o, with the entry point main and
      without -fvisibility=hidden, and they do not get the options that
      the arch adds for CONFIG_PIC, CONFIG_FDPIC and
      CONFIG_BINFMT_ELF_EXECUTABLE.
    - The module lines repeat the arch values without -fvisibility=hidden
      and with "-e module_initialize".  The entry point has no effect: the
      loader calls a module through its init_array.
    
    Remove these lines, so that the boards use the arch values.
    esp32c6-devkitc and esp32c6-xiao keep -melf32lriscv with "+=", as
    esp32c6-devkitm does.  esp32c3-legacy-devkit-rust-1 set LDMODULEFLAGS
    to -melf32lriscv with "=", which removed -r and the linker script; it
    now adds the option with "+=".
    
    Assisted-by: Claude Code:claude-opus-5-5
    Signed-off-by: Marco Casaroli <[email protected]>
---
 boards/arm/imx9/imx93-qsb/scripts/Make.defs           |  7 -------
 boards/arm/imx9/imx95-evk/scripts/Make.defs           |  7 -------
 boards/arm/imx9/mr-navq95b/scripts/Make.defs          |  7 -------
 boards/arm/imxrt/fmu-v6xrt/scripts/Make.defs          |  7 -------
 boards/arm/imxrt/imxrt1170-evk/scripts/Make.defs      |  7 -------
 boards/arm/sama5/sama5d3-xplained/scripts/Make.defs   | 12 ------------
 boards/arm/samv7/samv71-xult/configs/knsh/Make.defs   |  7 -------
 .../arm/stm32h7/devebox-stm32h743/scripts/Make.defs   | 12 ------------
 .../arm/stm32h7/linum-stm32h753bi/scripts/Make.defs   | 12 ------------
 boards/arm/stm32h7/openh743i/scripts/Make.defs        | 12 ------------
 boards/arm/stm32h7/weact-stm32h743/scripts/Make.defs  | 12 ------------
 boards/arm/stm32h7/weact-stm32h750/scripts/Make.defs  | 12 ------------
 boards/arm/xmc4/xmc4800-relax/scripts/Make.defs       |  7 -------
 boards/arm64/imx9/imx95-a55-evk/scripts/Make.defs     |  3 ---
 boards/risc-v/erbium/minion/scripts/Make.defs         |  5 -----
 .../esp32c3-legacy-devkit-rust-1/scripts/Make.defs    |  2 +-
 .../risc-v/esp32c6/esp32c6-devkitc/scripts/Make.defs  | 15 ++-------------
 boards/risc-v/esp32c6/esp32c6-xiao/scripts/Make.defs  | 15 ++-------------
 boards/xtensa/esp32/esp32-2432S028/scripts/Make.defs  | 19 -------------------
 .../xtensa/esp32s3/esp32s3-korvo-2/scripts/Make.defs  | 19 -------------------
 .../xtensa/esp32s3/esp32s3-lhcbit/scripts/Make.defs   | 19 -------------------
 .../esp32s3/esp32s3-touch-lcd7/scripts/Make.defs      | 19 -------------------
 boards/xtensa/esp32s3/esp32s3-xiao/scripts/Make.defs  | 19 -------------------
 23 files changed, 5 insertions(+), 251 deletions(-)

diff --git a/boards/arm/imx9/imx93-qsb/scripts/Make.defs 
b/boards/arm/imx9/imx93-qsb/scripts/Make.defs
index 12b5a9d2178..27395a1b27e 100644
--- a/boards/arm/imx9/imx93-qsb/scripts/Make.defs
+++ b/boards/arm/imx9/imx93-qsb/scripts/Make.defs
@@ -41,10 +41,3 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 NXFLATLDFLAGS1 = -r -d -warn-common
 NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) 
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
-
-# Loadable module definitions
-
-CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
-
-LDMODULEFLAGS = -r -e module_initialize
-LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
diff --git a/boards/arm/imx9/imx95-evk/scripts/Make.defs 
b/boards/arm/imx9/imx95-evk/scripts/Make.defs
index f08d3938f08..aca5ca121fa 100644
--- a/boards/arm/imx9/imx95-evk/scripts/Make.defs
+++ b/boards/arm/imx9/imx95-evk/scripts/Make.defs
@@ -43,10 +43,3 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 NXFLATLDFLAGS1 = -r -d -warn-common
 NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) 
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
-
-# Loadable module definitions
-
-CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
-
-LDMODULEFLAGS = -r -e module_initialize
-LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
diff --git a/boards/arm/imx9/mr-navq95b/scripts/Make.defs 
b/boards/arm/imx9/mr-navq95b/scripts/Make.defs
index 0de65590264..7b4c835a6b6 100644
--- a/boards/arm/imx9/mr-navq95b/scripts/Make.defs
+++ b/boards/arm/imx9/mr-navq95b/scripts/Make.defs
@@ -43,10 +43,3 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 NXFLATLDFLAGS1 = -r -d -warn-common
 NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) 
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
-
-# Loadable module definitions
-
-CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
-
-LDMODULEFLAGS = -r -e module_initialize
-LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
diff --git a/boards/arm/imxrt/fmu-v6xrt/scripts/Make.defs 
b/boards/arm/imxrt/fmu-v6xrt/scripts/Make.defs
index fa147466fff..ee917330bbf 100644
--- a/boards/arm/imxrt/fmu-v6xrt/scripts/Make.defs
+++ b/boards/arm/imxrt/fmu-v6xrt/scripts/Make.defs
@@ -40,10 +40,3 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 NXFLATLDFLAGS1 = -r -d -warn-common
 NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) 
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
-
-# Loadable module definitions
-
-CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
-
-LDMODULEFLAGS = -r -e module_initialize
-LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
diff --git a/boards/arm/imxrt/imxrt1170-evk/scripts/Make.defs 
b/boards/arm/imxrt/imxrt1170-evk/scripts/Make.defs
index c81bb4a7c36..46dec2a9b44 100644
--- a/boards/arm/imxrt/imxrt1170-evk/scripts/Make.defs
+++ b/boards/arm/imxrt/imxrt1170-evk/scripts/Make.defs
@@ -40,10 +40,3 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 NXFLATLDFLAGS1 = -r -d -warn-common
 NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) 
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
-
-# Loadable module definitions
-
-CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
-
-LDMODULEFLAGS = -r -e module_initialize
-LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
diff --git a/boards/arm/sama5/sama5d3-xplained/scripts/Make.defs 
b/boards/arm/sama5/sama5d3-xplained/scripts/Make.defs
index fa6c2c2ca83..3a79025deac 100644
--- a/boards/arm/sama5/sama5d3-xplained/scripts/Make.defs
+++ b/boards/arm/sama5/sama5d3-xplained/scripts/Make.defs
@@ -44,15 +44,3 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 NXFLATLDFLAGS1 = -r -d -warn-common
 NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) 
-T$(TOPDIR)$(DELIM)binfmt$(DELIM)libnxflat$(DELIM)gnu-nxflat-pcrel.ld 
-no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
-
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
-CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
-
-# __dso_handle comes from crtbegin, which a module does not link
-
-CXXELFFLAGS += -fno-use-cxa-atexit
-
-LDELFFLAGS = -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
diff --git a/boards/arm/samv7/samv71-xult/configs/knsh/Make.defs 
b/boards/arm/samv7/samv71-xult/configs/knsh/Make.defs
index bb85c2ca96a..15b0231c91c 100644
--- a/boards/arm/samv7/samv71-xult/configs/knsh/Make.defs
+++ b/boards/arm/samv7/samv71-xult/configs/knsh/Make.defs
@@ -51,10 +51,3 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 NXFLATLDFLAGS1 = -r -d -warn-common
 NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) 
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
-
-# Loadable module definitions
-
-CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
-
-LDMODULEFLAGS = -r -e module_initialize
-LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
diff --git a/boards/arm/stm32h7/devebox-stm32h743/scripts/Make.defs 
b/boards/arm/stm32h7/devebox-stm32h743/scripts/Make.defs
index 3bce721393a..747d1bfd3d9 100644
--- a/boards/arm/stm32h7/devebox-stm32h743/scripts/Make.defs
+++ b/boards/arm/stm32h7/devebox-stm32h743/scripts/Make.defs
@@ -38,15 +38,3 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 NXFLATLDFLAGS1 = -r -d -warn-common
 NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) 
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
-
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
-CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
-
-# __dso_handle comes from crtbegin, which a module does not link
-
-CXXELFFLAGS += -fno-use-cxa-atexit
-
-LDELFFLAGS = -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/elf/gnu-elf.ld)
diff --git a/boards/arm/stm32h7/linum-stm32h753bi/scripts/Make.defs 
b/boards/arm/stm32h7/linum-stm32h753bi/scripts/Make.defs
index af4c5bd255d..d0744e29a22 100644
--- a/boards/arm/stm32h7/linum-stm32h753bi/scripts/Make.defs
+++ b/boards/arm/stm32h7/linum-stm32h753bi/scripts/Make.defs
@@ -36,15 +36,3 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 NXFLATLDFLAGS1 = -r -d -warn-common
 NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) 
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
-
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
-CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
-
-# __dso_handle comes from crtbegin, which a module does not link
-
-CXXELFFLAGS += -fno-use-cxa-atexit
-
-LDELFFLAGS = -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/elf/gnu-elf.ld)
diff --git a/boards/arm/stm32h7/openh743i/scripts/Make.defs 
b/boards/arm/stm32h7/openh743i/scripts/Make.defs
index 3d99a02ddc8..0da01b3a850 100644
--- a/boards/arm/stm32h7/openh743i/scripts/Make.defs
+++ b/boards/arm/stm32h7/openh743i/scripts/Make.defs
@@ -36,15 +36,3 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 NXFLATLDFLAGS1 = -r -d -warn-common
 NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) 
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
-
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
-CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
-
-# __dso_handle comes from crtbegin, which a module does not link
-
-CXXELFFLAGS += -fno-use-cxa-atexit
-
-LDELFFLAGS = -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/elf/gnu-elf.ld)
diff --git a/boards/arm/stm32h7/weact-stm32h743/scripts/Make.defs 
b/boards/arm/stm32h7/weact-stm32h743/scripts/Make.defs
index 26eb471ffb4..d94ac13a8b4 100644
--- a/boards/arm/stm32h7/weact-stm32h743/scripts/Make.defs
+++ b/boards/arm/stm32h7/weact-stm32h743/scripts/Make.defs
@@ -36,15 +36,3 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 NXFLATLDFLAGS1 = -r -d -warn-common
 NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) 
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
-
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
-CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
-
-# __dso_handle comes from crtbegin, which a module does not link
-
-CXXELFFLAGS += -fno-use-cxa-atexit
-
-LDELFFLAGS = -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/elf/gnu-elf.ld)
diff --git a/boards/arm/stm32h7/weact-stm32h750/scripts/Make.defs 
b/boards/arm/stm32h7/weact-stm32h750/scripts/Make.defs
index 2e7f4db1770..2196d23e470 100644
--- a/boards/arm/stm32h7/weact-stm32h750/scripts/Make.defs
+++ b/boards/arm/stm32h7/weact-stm32h750/scripts/Make.defs
@@ -36,15 +36,3 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 NXFLATLDFLAGS1 = -r -d -warn-common
 NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) 
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
-
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
-CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
-
-# __dso_handle comes from crtbegin, which a module does not link
-
-CXXELFFLAGS += -fno-use-cxa-atexit
-
-LDELFFLAGS = -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/elf/gnu-elf.ld)
diff --git a/boards/arm/xmc4/xmc4800-relax/scripts/Make.defs 
b/boards/arm/xmc4/xmc4800-relax/scripts/Make.defs
index b9be6699c66..83277f07cdd 100644
--- a/boards/arm/xmc4/xmc4800-relax/scripts/Make.defs
+++ b/boards/arm/xmc4/xmc4800-relax/scripts/Make.defs
@@ -35,10 +35,3 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 NXFLATLDFLAGS1 = -r -d -warn-common
 NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) 
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
-
-# Loadable module definitions
-
-CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
-
-LDMODULEFLAGS = -r -e module_initialize
-LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
diff --git a/boards/arm64/imx9/imx95-a55-evk/scripts/Make.defs 
b/boards/arm64/imx9/imx95-a55-evk/scripts/Make.defs
index 87bb0f995dc..8f39ad463d6 100644
--- a/boards/arm64/imx9/imx95-a55-evk/scripts/Make.defs
+++ b/boards/arm64/imx9/imx95-a55-evk/scripts/Make.defs
@@ -41,6 +41,3 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 NXFLATLDFLAGS1 = -r -d -warn-common
 NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) 
-T$(TOPDIR)$(DELIM)binfmt$(DELIM)libnxflat$(DELIM)gnu-nxflat-pcrel.ld 
-no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
-
-LDELFFLAGS = -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
diff --git a/boards/risc-v/erbium/minion/scripts/Make.defs 
b/boards/risc-v/erbium/minion/scripts/Make.defs
index 766eb9f6ccb..52596e7e678 100644
--- a/boards/risc-v/erbium/minion/scripts/Make.defs
+++ b/boards/risc-v/erbium/minion/scripts/Make.defs
@@ -40,8 +40,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) 
$(ARCHCPUFLAGS) $(ARCHXXINCLUDES
 CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
 CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
 AFLAGS += $(CFLAGS) -D__ASSEMBLY__
-
-CELFFLAGS = $(CFLAGS)
-CXXELFFLAGS = $(CXXFLAGS)
-LDELFFLAGS = --oformat elf64-littleriscv -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
diff --git 
a/boards/risc-v/esp32c3-legacy/esp32c3-legacy-devkit-rust-1/scripts/Make.defs 
b/boards/risc-v/esp32c3-legacy/esp32c3-legacy-devkit-rust-1/scripts/Make.defs
index a11dc5d7c4a..453eeaa7264 100644
--- 
a/boards/risc-v/esp32c3-legacy/esp32c3-legacy-devkit-rust-1/scripts/Make.defs
+++ 
b/boards/risc-v/esp32c3-legacy/esp32c3-legacy-devkit-rust-1/scripts/Make.defs
@@ -53,7 +53,7 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 
 # Loadable module definitions
 
-LDMODULEFLAGS = -melf32lriscv
+LDMODULEFLAGS += -melf32lriscv
 
 # ELF module definitions
 
diff --git a/boards/risc-v/esp32c6/esp32c6-devkitc/scripts/Make.defs 
b/boards/risc-v/esp32c6/esp32c6-devkitc/scripts/Make.defs
index d910987ee16..d7e48b8f7ac 100644
--- a/boards/risc-v/esp32c6/esp32c6-devkitc/scripts/Make.defs
+++ b/boards/risc-v/esp32c6/esp32c6-devkitc/scripts/Make.defs
@@ -53,19 +53,8 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 
 # Loadable module definitions
 
-CMODULEFLAGS = $(CFLAGS)
-
-LDMODULEFLAGS = -melf32lriscv -r -e module_initialize
-LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
+LDMODULEFLAGS += -melf32lriscv
 
 # ELF module definitions
 
-CELFFLAGS = $(CFLAGS)
-CXXELFFLAGS = $(CXXFLAGS)
-
-# __dso_handle comes from crtbegin, which a module does not link
-
-CXXELFFLAGS += -fno-use-cxa-atexit
-
-LDELFFLAGS = -melf32lriscv -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/elf/gnu-elf.ld)
+LDELFFLAGS += -melf32lriscv
diff --git a/boards/risc-v/esp32c6/esp32c6-xiao/scripts/Make.defs 
b/boards/risc-v/esp32c6/esp32c6-xiao/scripts/Make.defs
index 10324fc4ca1..3c298502dba 100644
--- a/boards/risc-v/esp32c6/esp32c6-xiao/scripts/Make.defs
+++ b/boards/risc-v/esp32c6/esp32c6-xiao/scripts/Make.defs
@@ -53,19 +53,8 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 
 # Loadable module definitions
 
-CMODULEFLAGS = $(CFLAGS)
-
-LDMODULEFLAGS = -melf32lriscv -r -e module_initialize
-LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
+LDMODULEFLAGS += -melf32lriscv
 
 # ELF module definitions
 
-CELFFLAGS = $(CFLAGS)
-CXXELFFLAGS = $(CXXFLAGS)
-
-# __dso_handle comes from crtbegin, which a module does not link
-
-CXXELFFLAGS += -fno-use-cxa-atexit
-
-LDELFFLAGS = -melf32lriscv -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/elf/gnu-elf.ld)
+LDELFFLAGS += -melf32lriscv
diff --git a/boards/xtensa/esp32/esp32-2432S028/scripts/Make.defs 
b/boards/xtensa/esp32/esp32-2432S028/scripts/Make.defs
index dc5f12d4cdf..5998c411707 100644
--- a/boards/xtensa/esp32/esp32-2432S028/scripts/Make.defs
+++ b/boards/xtensa/esp32/esp32-2432S028/scripts/Make.defs
@@ -54,22 +54,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) 
$(ARCHCPUFLAGS) $(ARCHXXINCLUDES
 CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
 CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
 AFLAGS := $(CFLAGS) -D__ASSEMBLY__
-
-# Loadable module definitions
-
-CMODULEFLAGS = $(CFLAGS) -mtext-section-literals
-
-LDMODULEFLAGS = -r -e module_initialize
-LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
-
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS) -mtext-section-literals
-CXXELFFLAGS = $(CXXFLAGS) -mtext-section-literals
-
-# __dso_handle comes from crtbegin, which a module does not link
-
-CXXELFFLAGS += -fno-use-cxa-atexit
-
-LDELFFLAGS = -r -e main
-LDELFFLAGS += -T $(call 
CONVERT_PATH,$(TOPDIR)$(DELIM)binfmt$(DELIM)elf$(DELIM)gnu-elf.ld)
diff --git a/boards/xtensa/esp32s3/esp32s3-korvo-2/scripts/Make.defs 
b/boards/xtensa/esp32s3/esp32s3-korvo-2/scripts/Make.defs
index b815da4c623..ac0d6f1f8e4 100644
--- a/boards/xtensa/esp32s3/esp32s3-korvo-2/scripts/Make.defs
+++ b/boards/xtensa/esp32s3/esp32s3-korvo-2/scripts/Make.defs
@@ -54,22 +54,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) 
$(ARCHCPUFLAGS) $(ARCHXXINCLUDES
 CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
 CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
 AFLAGS := $(CFLAGS) -D__ASSEMBLY__
-
-# Loadable module definitions
-
-CMODULEFLAGS = $(CFLAGS) -mtext-section-literals
-
-LDMODULEFLAGS = -r -e module_initialize
-LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
-
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS) -mtext-section-literals
-CXXELFFLAGS = $(CXXFLAGS) -mtext-section-literals
-
-# __dso_handle comes from crtbegin, which a module does not link
-
-CXXELFFLAGS += -fno-use-cxa-atexit
-
-LDELFFLAGS = -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/elf/gnu-elf.ld)
diff --git a/boards/xtensa/esp32s3/esp32s3-lhcbit/scripts/Make.defs 
b/boards/xtensa/esp32s3/esp32s3-lhcbit/scripts/Make.defs
index c0ec5bb42d3..de0da46cd86 100644
--- a/boards/xtensa/esp32s3/esp32s3-lhcbit/scripts/Make.defs
+++ b/boards/xtensa/esp32s3/esp32s3-lhcbit/scripts/Make.defs
@@ -54,22 +54,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) 
$(ARCHCPUFLAGS) $(ARCHXXINCLUDES
 CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
 CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
 AFLAGS := $(CFLAGS) -D__ASSEMBLY__
-
-# Loadable module definitions
-
-CMODULEFLAGS = $(CFLAGS) -mtext-section-literals
-
-LDMODULEFLAGS = -r -e module_initialize
-LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
-
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS) -mtext-section-literals
-CXXELFFLAGS = $(CXXFLAGS) -mtext-section-literals
-
-# __dso_handle comes from crtbegin, which a module does not link
-
-CXXELFFLAGS += -fno-use-cxa-atexit
-
-LDELFFLAGS = -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/elf/gnu-elf.ld)
diff --git a/boards/xtensa/esp32s3/esp32s3-touch-lcd7/scripts/Make.defs 
b/boards/xtensa/esp32s3/esp32s3-touch-lcd7/scripts/Make.defs
index 05e764cd55d..efdfaec4ff8 100644
--- a/boards/xtensa/esp32s3/esp32s3-touch-lcd7/scripts/Make.defs
+++ b/boards/xtensa/esp32s3/esp32s3-touch-lcd7/scripts/Make.defs
@@ -54,22 +54,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) 
$(ARCHCPUFLAGS) $(ARCHXXINCLUDES
 CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
 CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
 AFLAGS := $(CFLAGS) -D__ASSEMBLY__
-
-# Loadable module definitions
-
-CMODULEFLAGS = $(CFLAGS) -mtext-section-literals
-
-LDMODULEFLAGS = -r -e module_initialize
-LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
-
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS) -mtext-section-literals
-CXXELFFLAGS = $(CXXFLAGS) -mtext-section-literals
-
-# __dso_handle comes from crtbegin, which a module does not link
-
-CXXELFFLAGS += -fno-use-cxa-atexit
-
-LDELFFLAGS = -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/elf/gnu-elf.ld)
diff --git a/boards/xtensa/esp32s3/esp32s3-xiao/scripts/Make.defs 
b/boards/xtensa/esp32s3/esp32s3-xiao/scripts/Make.defs
index c7b0e5c5289..1732376e24e 100644
--- a/boards/xtensa/esp32s3/esp32s3-xiao/scripts/Make.defs
+++ b/boards/xtensa/esp32s3/esp32s3-xiao/scripts/Make.defs
@@ -54,22 +54,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) 
$(ARCHCPUFLAGS) $(ARCHXXINCLUDES
 CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
 CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
 AFLAGS := $(CFLAGS) -D__ASSEMBLY__
-
-# Loadable module definitions
-
-CMODULEFLAGS = $(CFLAGS) -mtext-section-literals
-
-LDMODULEFLAGS = -r -e module_initialize
-LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
-
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS) -mtext-section-literals
-CXXELFFLAGS = $(CXXFLAGS) -mtext-section-literals
-
-# __dso_handle comes from crtbegin, which a module does not link
-
-CXXELFFLAGS += -fno-use-cxa-atexit
-
-LDELFFLAGS = -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)

Reply via email to