[PATCH v2 2/7] powerpc/32/build: move got1/got2 sections out of text

[Nicholas Piggin]

Following the example from the binutils default linker script, move
.got1 and .got2 out of .text, to just after RO_DATA.

Signed-off-by: Nicholas Piggin <npig...@gmail.com>
---
 arch/powerpc/kernel/vmlinux.lds.S | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/arch/powerpc/kernel/vmlinux.lds.S 
b/arch/powerpc/kernel/vmlinux.lds.S
index d81e4392da26..607b17b1e785 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -122,14 +122,6 @@ SECTIONS
                *(.sfpr);
                MEM_KEEP(init.text)
                MEM_KEEP(exit.text)
-
-#ifdef CONFIG_PPC32
-               *(.got1)
-               __got2_start = .;
-               *(.got2)
-               __got2_end = .;
-#endif /* CONFIG_PPC32 */
-
        } :text
 
        . = ALIGN(PAGE_SIZE);
@@ -139,7 +131,16 @@ SECTIONS
        /* Read-only data */
        RO_DATA(PAGE_SIZE)
 
-#ifdef CONFIG_PPC64
+#ifdef CONFIG_PPC32
+       .got1 : AT(ADDR(.got1) - LOAD_OFFSET) {
+               *(.got1)
+       }
+       .got2 : AT(ADDR(.got2) - LOAD_OFFSET) {
+               __got2_start = .;
+               *(.got2)
+               __got2_end = .;
+       }
+#else /* CONFIG_PPC32 */
        SOFT_MASK_TABLE(8)
        RESTART_TABLE(8)
 
@@ -190,7 +191,7 @@ SECTIONS
                *(__rfi_flush_fixup)
                __stop___rfi_flush_fixup = .;
        }
-#endif /* CONFIG_PPC64 */
+#endif /* CONFIG_PPC32 */
 
 #ifdef CONFIG_PPC_BARRIER_NOSPEC
        . = ALIGN(8);
-- 
2.37.2