diff options
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/binutils.exp | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 23babe3..7af1ddc 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2017-07-18 Maciej W. Rozycki <macro@imgtec.com> + + * testsuite/ld-elf/binutils.exp (binutils_test): Make the + expectation for `.dynamic' in GNU_RELRO segment target-specific. + 2017-07-18 Nick Clifton <nickc@redhat.com> PR 21775 diff --git a/ld/testsuite/ld-elf/binutils.exp b/ld/testsuite/ld-elf/binutils.exp index 61e6031..687749d 100644 --- a/ld/testsuite/ld-elf/binutils.exp +++ b/ld/testsuite/ld-elf/binutils.exp @@ -81,12 +81,17 @@ proc binutils_test { prog_name ld_options test {test_name ""} {readelf_options " } 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] |