Skip to content

Commit 60210a3

Browse files
MaskRaypalmer-dabbelt
authored andcommitted
riscv module: remove (NOLOAD)
On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually inappropriate for .plt, .got, and .got.plt sections which are always SHT_PROGBITS. In GNU ld, if PLT entries are needed, .plt will be SHT_PROGBITS anyway and (NOLOAD) will be essentially ignored. In ld.lld, since https://reviews.llvm.org/D118840 ("[ELF] Support (TYPE=<value>) to customize the output section type"), ld.lld will report a `section type mismatch` error (later changed to a warning). Just remove (NOLOAD) to fix the warning. [1] https://lld.llvm.org/ELF/linker_script.html As of today, "The section should be marked as not loadable" on https://sourceware.org/binutils/docs/ld/Output-Section-Type.html is outdated for ELF. Link: ClangBuiltLinux#1597 Fixes: ab1ef68 ("RISC-V: Add sections of PLT and GOT for kernel module") Reported-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Fangrui Song <maskray@google.com> Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent aa5b537 commit 60210a3

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

arch/riscv/include/asm/module.lds.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
/* Copyright (C) 2017 Andes Technology Corporation */
33
#ifdef CONFIG_MODULE_SECTIONS
44
SECTIONS {
5-
.plt (NOLOAD) : { BYTE(0) }
6-
.got (NOLOAD) : { BYTE(0) }
7-
.got.plt (NOLOAD) : { BYTE(0) }
5+
.plt : { BYTE(0) }
6+
.got : { BYTE(0) }
7+
.got.plt : { BYTE(0) }
88
}
99
#endif

0 commit comments

Comments
 (0)