]> Git Repo - linux.git/commitdiff
powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT
authorMichael Ellerman <[email protected]>
Thu, 5 Jan 2023 11:05:04 +0000 (22:05 +1100)
committerMichael Ellerman <[email protected]>
Thu, 5 Jan 2023 13:24:50 +0000 (00:24 +1100)
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/[email protected]/

Fixes: 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv")
Signed-off-by: Michael Ellerman <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
arch/powerpc/kernel/vmlinux.lds.S

index 8c3862b4c259d6a2b89d40cfd712ce4d2f974179..c5ea7d03d5390c8ffed2c7982270acbd02e174bf 100644 (file)
@@ -8,6 +8,7 @@
 #define BSS_FIRST_SECTIONS *(.bss.prominit)
 #define EMITS_PT_NOTE
 #define RO_EXCEPTION_TABLE_ALIGN       0
+#define RUNTIME_DISCARD_EXIT
 
 #define SOFT_MASK_TABLE(align)                                         \
        . = ALIGN(align);                                               \
This page took 0.051832 seconds and 4 git commands to generate.