From: Nicholas Piggin <npiggin@gmail.com>
Date: Fri, 16 Sep 2022 04:07:54 +0000 (+1000)
Subject: powerpc/64/build: merge .got and .toc input sections
X-Git-Tag: block-6.1-2022-13-10~6^2~123
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1e9eca485a840985a663080eb049c420272d4bdd;p=linux-block.git

powerpc/64/build: merge .got and .toc input sections

Follow the binutils ld internal linker script and merge .got and .toc
input sections in the .got output section.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220916040755.2398112-7-npiggin@gmail.com
---

diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 4c38406384a9..e68eb9381066 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -173,8 +173,7 @@ SECTIONS
 	}
 
 	.got : AT(ADDR(.got) - LOAD_OFFSET) ALIGN(256) {
-		*(.got)
-		*(.toc)
+		*(.got .toc)
 	}
 
 	SOFT_MASK_TABLE(8)