diff options
| author | Andreas Schwab <schwab@suse.de> | 2023-09-21 16:49:41 +0200 |
|---|---|---|
| committer | Dongkyun Son <dongkyun.s@samsung.com> | 2024-01-31 21:16:06 +0900 |
| commit | c335012c52cc038e0348150e462d5204f295d6d4 (patch) | |
| tree | 657d483608287f53f164457175a27a51f4c0622c | |
| parent | 482b3b438b7841899301b4ce649dfbd1c0ba4063 (diff) | |
| download | binutils-sandbox/dkson95/relro.tar.gz binutils-sandbox/dkson95/relro.tar.bz2 binutils-sandbox/dkson95/relro.zip | |
RISC-V: Protect .got with relroaccepted/tizen/base/toolchain/20240202.060637sandbox/dkson95/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.
(cherry picked from commit 7345d05aafde53a48d5a587a6d9c1778db78e0f3)
Change-Id: I6c6c9e54752d1c6076d5f1d32a9d25b8cf85dc09
| -rw-r--r-- | ld/emulparams/elf32lriscv-defs.sh | 4 | ||||
| -rw-r--r-- | ld/emulparams/elf64lriscv-defs.sh | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/binutils.exp | 1 |
3 files changed, 5 insertions, 1 deletions
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. |