This commit was manufactured by cvs2svn to create branch 'binutils-

[external/binutils.git] / ld / testsuite / ld-elf / binutils.exp

diff --git a/ld/testsuite/ld-elf/binutils.exp b/ld/testsuite/ld-elf/binutils.exp
index 47636d2..382d50f 100644 (file)
--- a/ld/testsuite/ld-elf/binutils.exp
+++ b/ld/testsuite/ld-elf/binutils.exp
@@ -53,7 +53,8 @@ proc binutils_test { prog_name ld_options test } {
 
     if { ![ld_simple_link $ld tmpdir/$test "$ld_options tmpdir/$test.o"] } {
        if { [string match "*not supported*" $link_output]
-            || [string match "*unrecognized option*" $link_output] } {
+            || [string match "*unrecognized option*" $link_output]
+            || [string match "*-z relro ignored*" $link_output] } {
            unsupported "$ld_options is not supported by this target"
        } else {
            unresolved "$test_name"
@@ -121,10 +122,10 @@ if { ([istarget "i?86-*-elf*"]
 
 binutils_test strip "-T ${srcdir}/${subdir}/lma.lnk" lma
 
-set tls_tests { "tdata1" "tdata2" "tdata3" }
+set tls_tests { "tdata1" "tdata2" }
 # hppa64 has its own .tbss section, with different flags.
 if { ![istarget "hppa64-*-*"] } {
-    lappend tls_tests "tbss1" "tbss2" "tbss3"
+    lappend tls_tests "tdata3" "tbss1" "tbss2" "tbss3"
 }
 set tls_opts {
     ""