diff options
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/binutils.exp | 19 |
2 files changed, 24 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 7af1ddc..ea648a9 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,6 +1,12 @@ 2017-07-18 Maciej W. Rozycki <macro@imgtec.com> * testsuite/ld-elf/binutils.exp (binutils_test): Make the + expectation for `.got' in GNU_RELRO segment target-specific. + Handle `.got.plt' separately. + +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> diff --git a/ld/testsuite/ld-elf/binutils.exp b/ld/testsuite/ld-elf/binutils.exp index 687749d..fcd0d96 100644 --- a/ld/testsuite/ld-elf/binutils.exp +++ b/ld/testsuite/ld-elf/binutils.exp @@ -86,13 +86,30 @@ proc binutils_test { prog_name ld_options test {test_name ""} {readelf_options " set relro_dynamic [expr !([istarget "hppa64*-*-*"] \ || ([istarget "mips*-*-*"] \ && ![istarget "*-*-vxworks*"]))] + # These targets have `.got' in regular data even though they do + # not have `.got' there. + set relro_gotplt [expr [istarget "mips*-*-*"]] + # These targets do not set NO_SMALL_DATA or DATA_GOT and therefore + # have `.got' in (read-write) small data rather than regular data. + set relro_got [expr !([istarget "alpha*-*-*"] \ + || [istarget "hppa*-*-linux-*"] \ + || [istarget "hppa*-*-netbsd*"] \ + || [istarget "hppa*-*-openbsd*"] \ + || [istarget "metag-*-*"] \ + || [istarget "mips*-*-*"] \ + || [istarget "nios2*-*-*"] \ + || [istarget "or1k-*-*"] \ + || [istarget "riscv*-*-*"] \ + || [istarget "sh*-*-*"] \ + || [istarget "x86_64-*-rdos*"])] # 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] || ($relro_dynamic && [string match "*.dynamic*" $got]) - || [string match "*.got*" $got] + || ($relro_gotplt && [string match "*.got.plt*" $got]) + || ($relro_got && [string match "*.got*" $got]) || [string match "*.eh_frame*" $got] || [string match "*.gcc_except_table*" $got] || [string match "*.exception_ranges*" $got] |