lkml.org 
[lkml]   [2023]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 fix build id for arm64 3/6] powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT
    Date
    From: Michael Ellerman <mpe@ellerman.id.au>

    commit 4b9880dbf3bdba3a7c56445137c3d0e30aaa0a40 upstream.

    The powerpc linker script explicitly includes .exit.text, because
    otherwise the link fails due to references from __bug_table and
    __ex_table. The code is freed (discarded) at runtime along with
    .init.text and data.

    That has worked in the past despite powerpc not defining
    RUNTIME_DISCARD_EXIT because DISCARDS appears late in the powerpc linker
    script (line 410), and the explicit inclusion of .exit.text
    earlier (line 280) supersedes the discard.

    However commit 99cb0d917ffa ("arch: fix broken BuildID for arm64 and
    riscv") introduced an earlier use of DISCARD as part of the RO_DATA
    macro (line 136). With binutils < 2.36 that causes the DISCARD
    directives later in the script to be applied earlier [1], causing
    .exit.text to actually be discarded at link time, leading to build
    errors:

    '.exit.text' referenced in section '__bug_table' of crypto/algboss.o: defined in
    discarded section '.exit.text' of crypto/algboss.o
    '.exit.text' referenced in section '__ex_table' of drivers/nvdimm/core.o: defined in
    discarded section '.exit.text' of drivers/nvdimm/core.o

    Fix it by defining RUNTIME_DISCARD_EXIT, which causes the generic
    DISCARDS macro to not include .exit.text at all.

    1: https://lore.kernel.org/lkml/87fscp2v7k.fsf@igel.home/

    Fixes: 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv")
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/20230105132349.384666-1-mpe@ellerman.id.au
    Signed-off-by: Tom Saeger <tom.saeger@oracle.com>
    ---
    arch/powerpc/kernel/vmlinux.lds.S | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
    index 3ea360cad337..4d5e1662a0ba 100644
    --- a/arch/powerpc/kernel/vmlinux.lds.S
    +++ b/arch/powerpc/kernel/vmlinux.lds.S
    @@ -6,6 +6,7 @@
    #endif

    #define BSS_FIRST_SECTIONS *(.bss.prominit)
    +#define RUNTIME_DISCARD_EXIT

    #include <asm/page.h>
    #include <asm-generic/vmlinux.lds.h>
    --
    2.39.1
    \
     
     \ /
      Last update: 2023-03-26 23:54    [W:4.853 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site