This is an automated email from the ASF dual-hosted git repository.
acassis 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 da365c1cb0 risc-v/canmv230: enable fully linked apps for kernel build
da365c1cb0 is described below
commit da365c1cb02f2b40e6ad87ea15e3ddf02aaac984
Author: Yanfeng Liu <yfliu2...@qq.com>
AuthorDate: Tue Jan 9 20:29:38 2024 +0800
risc-v/canmv230: enable fully linked apps for kernel build
Previously apps in kernel build are partially linked, thus are
big and inefficient. This enables full link for kernel mode apps
to reduce size and speed up loading.
Changes:
- arch/risc-v/Kconfig select HAVE_ELF_EXECUTABLE for K230
- boards/../scripts/Make.defs adjust LDELFLAGS
- boards/../knsh/defconfig enable BINFMT_ELF_EXECUTABLE
Additions:
- boards/../scripts/gnu-elf.ld apps linker script
Signed-off-by: Yanfeng Liu <yfliu2...@qq.com>
---
arch/risc-v/Kconfig | 1 +
boards/risc-v/k230/canmv230/configs/knsh/defconfig | 1 +
boards/risc-v/k230/canmv230/scripts/Make.defs | 5 +-
boards/risc-v/k230/canmv230/scripts/gnu-elf.ld | 132 +++++++++++++++++++++
4 files changed, 137 insertions(+), 2 deletions(-)
diff --git a/arch/risc-v/Kconfig b/arch/risc-v/Kconfig
index f521a14fb5..78e621c34f 100644
--- a/arch/risc-v/Kconfig
+++ b/arch/risc-v/Kconfig
@@ -245,6 +245,7 @@ config ARCH_CHIP_K230
select ARCH_HAVE_ADDRENV
select ARCH_NEED_ADDRENV_MAPPING
select ARCH_HAVE_S_MODE
+ select ARCH_HAVE_ELF_EXECUTABLE
select ONESHOT
select ALARM_ARCH
---help---
diff --git a/boards/risc-v/k230/canmv230/configs/knsh/defconfig
b/boards/risc-v/k230/canmv230/configs/knsh/defconfig
index 4679604e3a..bbefea09ae 100644
--- a/boards/risc-v/k230/canmv230/configs/knsh/defconfig
+++ b/boards/risc-v/k230/canmv230/configs/knsh/defconfig
@@ -41,6 +41,7 @@ CONFIG_ARCH_TEXT_VBASE=0xC0000000
CONFIG_ARCH_USE_MMU=y
CONFIG_ARCH_USE_MPU=y
CONFIG_ARCH_USE_S_MODE=y
+CONFIG_BINFMT_ELF_EXECUTABLE=y
CONFIG_BOARD_LATE_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=6366
CONFIG_BUILD_KERNEL=y
diff --git a/boards/risc-v/k230/canmv230/scripts/Make.defs
b/boards/risc-v/k230/canmv230/scripts/Make.defs
index 0f58bf4967..c5263ee8b8 100644
--- a/boards/risc-v/k230/canmv230/scripts/Make.defs
+++ b/boards/risc-v/k230/canmv230/scripts/Make.defs
@@ -48,8 +48,9 @@ CELFFLAGS = $(CFLAGS)
CXXELFFLAGS = $(CXXFLAGS)
LDELFFLAGS = --oformat elf64-littleriscv
-LDELFFLAGS += -r -e main
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
+ifeq ($(CONFIG_BINFMT_ELF_RELOCATABLE),y)
+LDELFFLAGS += -r
+endif
# POSTBUILD management
diff --git a/boards/risc-v/k230/canmv230/scripts/gnu-elf.ld
b/boards/risc-v/k230/canmv230/scripts/gnu-elf.ld
new file mode 100644
index 0000000000..c304a43982
--- /dev/null
+++ b/boards/risc-v/k230/canmv230/scripts/gnu-elf.ld
@@ -0,0 +1,132 @@
+/****************************************************************************
+ * boards/risc-v/k230/camnv230/scripts/gnu-elf.ld
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+SECTIONS
+{
+ . = 0xC0000000;
+ .text :
+ {
+ _stext = . ;
+ *(.text)
+ *(.text.*)
+ *(.gnu.warning)
+ *(.stub)
+ *(.glue_7)
+ *(.glue_7t)
+ *(.jcr)
+
+ /* C++ support: The .init and .fini sections contain specific logic
+ * to manage static constructors and destructors.
+ */
+
+ *(.gnu.linkonce.t.*)
+ *(.init) /* Old ABI */
+ *(.fini) /* Old ABI */
+ _etext = . ;
+ }
+
+ .rodata :
+ {
+ _srodata = . ;
+ *(.rodata)
+ *(.rodata1)
+ *(.rodata.*)
+ *(.gnu.linkonce.r*)
+ _erodata = . ;
+ }
+
+ . = 0xC0101000;
+ .data :
+ {
+ _sdata = . ;
+ *(.data)
+ *(.data1)
+ *(.data.*)
+ *(.gnu.linkonce.d*)
+ . = ALIGN(4);
+ _edata = . ;
+ }
+
+ /* C++ support. For each global and static local C++ object,
+ * GCC creates a small subroutine to construct the object. Pointers
+ * to these routines (not the routines themselves) are stored as
+ * simple, linear arrays in the .ctors section of the object file.
+ * Similarly, pointers to global/static destructor routines are
+ * stored in .dtors.
+ */
+
+ .ctors :
+ {
+ _sctors = . ;
+ KEEP (*(.ctors)) /* Old ABI: Unallocated */
+ KEEP (*(.init_array)) /* New ABI: Allocated */
+ KEEP (*(SORT(.init_array.*)))
+ _ectors = . ;
+ }
+
+ .dtors :
+ {
+ _sdtors = . ;
+ KEEP (*(.dtors)) /* Old ABI: Unallocated */
+ KEEP (*(.fini_array)) /* New ABI: Allocated */
+ KEEP (*(SORT(.fini_array.*)))
+ _edtors = . ;
+ }
+
+ .bss :
+ {
+ _sbss = . ;
+ *(.bss)
+ *(.bss.*)
+ *(.sbss)
+ *(.sbss.*)
+ *(.gnu.linkonce.b*)
+ *(COMMON)
+ _ebss = . ;
+ }
+
+ /* Thread local storage support */
+ .tdata : {
+ _stdata = ABSOLUTE(.);
+ KEEP (*(.tdata .tdata.* .gnu.linkonce.td.*));
+ _etdata = ABSOLUTE(.);
+ }
+
+ .tbss : {
+ _stbss = ABSOLUTE(.);
+ KEEP (*(.tbss .tbss.* .gnu.linkonce.tb.* .tcommon));
+ _etbss = ABSOLUTE(.);
+ }
+
+ /* Stabs debugging sections. */
+
+ .stab 0 : { *(.stab) }
+ .stabstr 0 : { *(.stabstr) }
+ .stab.excl 0 : { *(.stab.excl) }
+ .stab.exclstr 0 : { *(.stab.exclstr) }
+ .stab.index 0 : { *(.stab.index) }
+ .stab.indexstr 0 : { *(.stab.indexstr) }
+ .comment 0 : { *(.comment) }
+ .debug_abbrev 0 : { *(.debug_abbrev) }
+ .debug_info 0 : { *(.debug_info) }
+ .debug_line 0 : { *(.debug_line) }
+ .debug_pubnames 0 : { *(.debug_pubnames) }
+ .debug_aranges 0 : { *(.debug_aranges) }
+}
