58 lines
2.2 KiB
Diff
58 lines
2.2 KiB
Diff
|
From 7345d05aafde53a48d5a587a6d9c1778db78e0f3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andreas Schwab <schwab@suse.de>
|
||
|
|
Date: Thu, 21 Sep 2023 16:49:41 +0200
|
||
|
|
Subject: [PATCH] RISC-V: Protect .got with relro
|
||
|
|
|
||
|
|
Move .got before .data so that it can be protected with -zrelro. Also
|
||
|
|
separate .got.plt from .got if -znow is not in effect; the first two words
|
||
|
|
of .got.plt are placed within the relro region.
|
||
|
|
|
||
|
|
ld:
|
||
|
|
PR ld/30877
|
||
|
|
* emulparams/elf32lriscv-defs.sh (DATA_GOT, SEPARATE_GOTPLT):
|
||
|
|
Define.
|
||
|
|
* emulparams/elf64lriscv-defs.sh (SEPARATE_GOTPLT): Define.
|
||
|
|
* testsuite/ld-elf/binutils.exp (binutils_test): Remove riscv*-*-*
|
||
|
|
from relro_got expression.
|
||
|
|
---
|
||
|
|
ld/emulparams/elf32lriscv-defs.sh | 4 ++++
|
||
|
|
ld/emulparams/elf64lriscv-defs.sh | 1 +
|
||
|
|
ld/testsuite/ld-elf/binutils.exp | 1 -
|
||
|
|
3 files changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/ld/emulparams/elf32lriscv-defs.sh b/ld/emulparams/elf32lriscv-defs.sh
|
||
|
|
index b823cedacab..016556168c3 100644
|
||
|
|
--- a/ld/emulparams/elf32lriscv-defs.sh
|
||
|
|
+++ b/ld/emulparams/elf32lriscv-defs.sh
|
||
|
|
@@ -47,3 +47,7 @@ INITIAL_READONLY_SECTIONS="${RELOCATING+${CREATE_SHLIB-${INITIAL_READONLY_SECTIO
|
||
|
|
OTHER_END_SYMBOLS="${CREATE_SHLIB-__BSS_END__ = .;
|
||
|
|
__global_pointer$ = MIN(__SDATA_BEGIN__ + 0x800,
|
||
|
|
MAX(__DATA_BEGIN__ + 0x800, __BSS_END__ - 0x800));}"
|
||
|
|
+
|
||
|
|
+# Put .got before .data
|
||
|
|
+DATA_GOT=" "
|
||
|
|
+SEPARATE_GOTPLT="SIZEOF (.got.plt) >= 8 ? 8 : 0"
|
||
|
|
diff --git a/ld/emulparams/elf64lriscv-defs.sh b/ld/emulparams/elf64lriscv-defs.sh
|
||
|
|
index 84a700a5f58..ca15338428f 100644
|
||
|
|
--- a/ld/emulparams/elf64lriscv-defs.sh
|
||
|
|
+++ b/ld/emulparams/elf64lriscv-defs.sh
|
||
|
|
@@ -1,2 +1,3 @@
|
||
|
|
source_sh ${srcdir}/emulparams/elf32lriscv-defs.sh
|
||
|
|
ELFSIZE=64
|
||
|
|
+SEPARATE_GOTPLT="SIZEOF (.got.plt) >= 16 ? 16 : 0"
|
||
|
|
diff --git a/ld/testsuite/ld-elf/binutils.exp b/ld/testsuite/ld-elf/binutils.exp
|
||
|
|
index 674e8e9a575..b38e29ed6fb 100644
|
||
|
|
--- a/ld/testsuite/ld-elf/binutils.exp
|
||
|
|
+++ b/ld/testsuite/ld-elf/binutils.exp
|
||
|
|
@@ -95,7 +95,6 @@ proc binutils_test { prog_name ld_options test {test_name ""} {readelf_options "
|
||
|
|
|| [istarget "mips*-*-*"] \
|
||
|
|
|| [istarget "nios2*-*-*"] \
|
||
|
|
|| [istarget "or1k-*-*"] \
|
||
|
|
- || [istarget "riscv*-*-*"] \
|
||
|
|
|| [istarget "sh*-*-*"] \
|
||
|
|
|| [istarget "x86_64-*-rdos*"])]
|
||
|
|
# Check if GNU_RELRO segment is generated.
|
||
|
|
--
|
||
|
|
2.42.0
|
||
|
|
|