diff options
Diffstat (limited to 'ld')
-rw-r--r-- | ld/ChangeLog | 5 | ||||
-rw-r--r-- | ld/testsuite/ld-unique/unique.exp | 21 |
2 files changed, 12 insertions, 14 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 3f933e4..783355c 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2016-05-17 Maciej W. Rozycki <macro@imgtec.com> + + * testsuite/ld-unique/unique.exp: Use `is_elf_format' and + `supports_gnu_unique' to qualify testing. + 2016-05-16 Maciej W. Rozycki <macro@imgtec.com> * testsuite/ld-elf/flags1.d: Update the xfail list. diff --git a/ld/testsuite/ld-unique/unique.exp b/ld/testsuite/ld-unique/unique.exp index a34bc4c..ccddad6 100644 --- a/ld/testsuite/ld-unique/unique.exp +++ b/ld/testsuite/ld-unique/unique.exp @@ -24,20 +24,13 @@ # Adapted for unique checking by Mark J. Wielaard <mjw@redhat.com> -# STB_GNU_UNIQUE support has only been implemented for the ix86, x86_64, -# arm, mips, powerpc, and sparc so far. -if {!(([istarget "i?86-*-*"] - || [istarget "x86_64-*-*"] - || [istarget "arm*-*-*"] - || [istarget "mips*-*-*"] - || [istarget "powerpc*-*-*"] - || [istarget "sparc*-*-*"]) - && ([istarget "*-*-elf*"] - || [istarget "*-*-nacl*"] - || (([istarget "*-*-linux*"] - || [istarget "*-*-gnu*"]) - && ![istarget "*-*-*aout*"] - && ![istarget "*-*-*oldld*"]))) } { +# Exclude non-ELF targets. +if { ![is_elf_format] } { + return +} + +# Require STB_GNU_UNIQUE support with OSABI set to GNU. +if { ![supports_gnu_unique] } { verbose "UNIQUE tests not run - target does not support UNIQUE" return } |