This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH 1/2] LD/testsuite: Conditionalize the placement of `.dynamic' in GNU_RELRO
- From: "Maciej W. Rozycki" <macro at imgtec dot com>
- To: <binutils at sourceware dot org>
- Cc: Alan Modra <amodra at gmail dot com>, Tristan Gingold <gingold at adacore dot com>, "H.J. Lu" <hjl dot tools at gmail dot com>
- Date: Fri, 14 Jul 2017 02:38:47 +0100
- Subject: [PATCH 1/2] LD/testsuite: Conditionalize the placement of `.dynamic' in GNU_RELRO
- Authentication-results: sourceware.org; auth=none
- References: <alpine.DEB.2.00.1707132158340.29665@tp.orcam.me.uk>
Complement commit d345186d0535 ("Check if GNU_RELRO segment is is
generated") and exclude the presence of a `.dynamic' section from
implying the creation of a GNU_RELRO segment for targets which place the
section in the (read-only) text segment, and therefore cannot have the
section assigned to GNU_RELRO and neither it would make sense.
Currently the list of such targets consists of 64-bit HPPA and
non-VxWorks MIPS targets, as determined by looking for TEXT_DYNAMIC
being set across ld/emulparams/* and then verified by examining default
linker scripts produced in a `--enable-targets=all' build.
ld/
* testsuite/ld-elf/binutils.exp (binutils_test): Make the
expectation for `.dynamic' in GNU_RELRO segment target-specific.
---
ld/testsuite/ld-elf/binutils.exp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
binutils-ld-test-binutils-text-dynamic.diff
Index: binutils/ld/testsuite/ld-elf/binutils.exp
===================================================================
--- binutils.orig/ld/testsuite/ld-elf/binutils.exp 2017-07-11 22:39:54.813664337 +0100
+++ binutils/ld/testsuite/ld-elf/binutils.exp 2017-07-12 02:01:17.569818191 +0100
@@ -81,12 +81,17 @@ proc binutils_test { prog_name ld_option
}
if [string match "*-z relro*" $ld_options] {
+ # These targets set TEXT_DYNAMIC and therefore have `.dynamic'
+ # in the (read-only) text segment rather than data segment.
+ set relro_dynamic [expr !([istarget "hppa64*-*-*"] \
+ || ([istarget "mips*-*-*"] \
+ && ![istarget "*-*-vxworks*"]))]
# Check if GNU_RELRO segment is generated.
set got [remote_exec host "grep GNU_RELRO tmpdir/$test.exp"]
if { ![string match "*GNU_RELRO*" $got] } then {
set got [remote_exec host "cat tmpdir/$test.exp"]
if { [string match "*.data.rel.ro*" $got]
- || [string match "*.dynamic*" $got]
+ || ($relro_dynamic && [string match "*.dynamic*" $got])
|| [string match "*.got*" $got]
|| [string match "*.eh_frame*" $got]
|| [string match "*.gcc_except_table*" $got]