All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] kbuild: merge module sections under CONFIG_LD_DEAD_CODE_DATA_ELIMINATION too
@ 2021-04-02 12:40 Alexander Lobakin
  2021-04-02 15:09 ` Sami Tolvanen
  0 siblings, 1 reply; 4+ messages in thread
From: Alexander Lobakin @ 2021-04-02 12:40 UTC (permalink / raw)
  To: Kees Cook
  Cc: Jessica Yu, Miroslav Benes, Emil Velikov, Sami Tolvanen,
	Sean Christopherson, Masahiro Yamada, Alexander Lobakin,
	linux-hardening, linux-kbuild, linux-kernel

When building with CONFIG_LD_DEAD_CODE_DATA_ELIMINATION,
-fdata-sections and -ffunction-sections are being enabled by the
top-level Makefile, and module section merging is also needed.
Expand the ifdef (and the comment block) to cover that case too.

Fixes: 6a3193cdd5e5 ("kbuild: lto: Merge module sections if and only if CONFIG_LTO_CLANG is enabled")
Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
 scripts/module.lds.S | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/module.lds.S b/scripts/module.lds.S
index 2c52535f9b56..d6bbdfc55e08 100644
--- a/scripts/module.lds.S
+++ b/scripts/module.lds.S
@@ -20,11 +20,14 @@ SECTIONS {

 	__patchable_function_entries : { *(__patchable_function_entries) }

-#ifdef CONFIG_LTO_CLANG
+#if defined(CONFIG_LD_DEAD_CODE_DATA_ELIMINATION) || defined(CONFIG_LTO_CLANG)
 	/*
 	 * With CONFIG_LTO_CLANG, LLD always enables -fdata-sections and
-	 * -ffunction-sections, which increases the size of the final module.
-	 * Merge the split sections in the final binary.
+	 * -ffunction-sections. With CONFIG_LD_DEAD_CODE_DATA_ELIMINATION,
+	 * -fdata-sections and -ffunction-sections are being enabled by
+	 * the top-level Makefile.
+	 * This increases the size of the final module. Merge the split
+	 * sections in the final binary.
 	 */
 	.bss : {
 		*(.bss .bss.[0-9a-zA-Z_]*)
--
2.31.1



^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-04-07 14:25 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-02 12:40 [PATCH] kbuild: merge module sections under CONFIG_LD_DEAD_CODE_DATA_ELIMINATION too Alexander Lobakin
2021-04-02 15:09 ` Sami Tolvanen
2021-04-06 14:42   ` Alexander Lobakin
2021-04-07 14:24     ` Masahiro Yamada

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.