lkml.org 
[lkml]   [2022]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 370/475] riscv module: remove (NOLOAD)
    Date
    From: Fangrui Song <maskray@google.com>

    [ Upstream commit 60210a3d86dc57ce4a76a366e7841dda746a33f7 ]

    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: https://github.com/ClangBuiltLinux/linux/issues/1597
    Fixes: ab1ef68e5401 ("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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/riscv/kernel/module.lds | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/riscv/kernel/module.lds b/arch/riscv/kernel/module.lds
    index 295ecfb341a2..18ec719899e2 100644
    --- a/arch/riscv/kernel/module.lds
    +++ b/arch/riscv/kernel/module.lds
    @@ -2,7 +2,7 @@
    /* Copyright (C) 2017 Andes Technology Corporation */

    SECTIONS {
    - .plt (NOLOAD) : { BYTE(0) }
    - .got (NOLOAD) : { BYTE(0) }
    - .got.plt (NOLOAD) : { BYTE(0) }
    + .plt : { BYTE(0) }
    + .got : { BYTE(0) }
    + .got.plt : { BYTE(0) }
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-04-14 17:33    [W:3.763 / U:0.796 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site