elfloader/linker: Unify linker.lds in one file

This allows to use the same file for both Arm and RISC-V. Furthermore, this new file is more portable and works with both LLVM/lld and GNU's ld, unlike the removed Arm's one which contains directives and sections that lld does not handle (e.g., .interp, INSERT BEFORE .hash). Signed-off-by: Hesham Almatary <[email protected]>
seL4 · Jan 15, 2024 · 843b0c9 · 843b0c9
1 parent db8d245
commit 843b0c9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 53 deletions.
diff --git a/elfloader-tool/CMakeLists.txt b/elfloader-tool/CMakeLists.txt
@@ -106,7 +106,7 @@ config_option(
 add_config_library(elfloader "${configure_string}")
 
 add_compile_options(-D_XOPEN_SOURCE=700 -ffreestanding -Wall -Werror -W -Wextra)
-set(linkerScript "${CMAKE_CURRENT_LIST_DIR}/src/arch-${KernelArch}/linker.lds")
+set(linkerScript "${CMAKE_CURRENT_LIST_DIR}/src/linker.lds")
 if(KernelArchRiscV)
     add_compile_options(-mcmodel=medany)
 endif()

diff --git a/elfloader-tool/src/arch-arm/linker.lds b/elfloader-tool/src/arch-arm/linker.lds
diff --git a/elfloader-tool/src/arch-riscv/linker.lds → elfloader-tool/src/linker.lds b/elfloader-tool/src/arch-riscv/linker.lds → elfloader-tool/src/linker.lds
@@ -55,8 +55,14 @@ SECTIONS
         *(.data.*)
     }
     . = ALIGN(16);
-    .bss :
+    .bss (NOLOAD) :
     {
+#ifdef CONFIG_ARCH_ARM
+        . = ALIGN(0x1000);
+        core_stack_alloc = .;
+        . += CONFIG_MAX_NUM_NODES * (1 << 12);
+        core_stack_alloc_end = .;
+#endif
         _bss = .;
         *(.sbss*)
         *(.bss)