arm64: vdso*: place got/plt sections in .rodata

The vDSO will not contain absolute relocations, so place these
sections in .rodata.

Signed-off-by: Joey Gouly <joey.gouly@arm.com>
Link: https://lore.kernel.org/linux-arm-kernel/00abb0c5-6360-0004-353f-e7a88b3bd22c@arm.com/
Cc: Will Deacon <will@kernel.org>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Link: https://lore.kernel.org/r/20220628151307.35561-3-joey.gouly@arm.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/arm64/kernel/vdso/vdso.lds.S b/arch/arm64/kernel/vdso/vdso.lds.S
index 1cd85258c079e0bb7a34dfa73e8d740f69b607e7..e69fb4aaaf3ece102ba619cd2c6c403dc6f1b3cb 100644 (file)
--- a/arch/arm64/kernel/vdso/vdso.lds.S
+++ b/arch/arm64/kernel/vdso/vdso.lds.S
@@ -52,17 +52,15 @@ SECTIONS
 
        .rela.dyn       : ALIGN(8) { *(.rela .rela*) }
 
-       .plt            : {
+       .rodata         : {
+               *(.rodata*)
+               *(.got)
+               *(.got.plt)
                *(.plt)
                *(.plt.*)
                *(.iplt)
                *(.igot .igot.plt)
-       }
-
-       .got            : { *(.got) }
-       .got.plt        : { *(.got.plt) }
-
-       .rodata         : { *(.rodata*) }               :text
+       }                                               :text
 
        _end = .;
        PROVIDE(end = .);

diff --git a/arch/arm64/kernel/vdso32/vdso.lds.S b/arch/arm64/kernel/vdso32/vdso.lds.S
index e2f8ced571d693ca032f1309c30103dc3a14e416..6e67a6524d58acea966ad669977f6a75bd617927 100644 (file)
--- a/arch/arm64/kernel/vdso32/vdso.lds.S
+++ b/arch/arm64/kernel/vdso32/vdso.lds.S
@@ -36,7 +36,15 @@ SECTIONS
 
        .dynamic        : { *(.dynamic) }               :text   :dynamic
 
-       .rodata         : { *(.rodata*) }               :text
+       .rodata         : {
+               *(.rodata*)
+               *(.got)
+               *(.got.plt)
+               *(.plt)
+               *(.rel.iplt)
+               *(.iplt)
+               *(.igot.plt)
+       }                                               :text
 
        .text           : {
                *(.text*)
@@ -46,18 +54,7 @@ SECTIONS
                *(.v4_bx)
        }                                               :text   =0xe7f001f2
 
-       .rel.dyn        : { *(.rel.text) }
-
-       .got            : { *(.got) }
-       .rel.got        : { *(.rel.got) }
-       .got.plt        : { *(.got.plt) }
-       .rel.plt        : { *(.rel.plt) }
-       .plt            : {
-               *(.plt)
-               *(.rel.iplt)
-               *(.iplt)
-               *(.igot.plt)
-       }
+       .rel.dyn        : { *(.rel*) }
 
        ELF_DETAILS
        .ARM.exidx : { *(.ARM.exidx*) }