Revert the last change.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index b0015abc2acbaa8715447755979b6153e92e63ca..ee6987fa270530a64eaab3e565e2bded72209cad 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,7 +1,3 @@
-2011-07-14  H.J. Lu  <hongjiu.lu@intel.com>
-
-       * ld-elf/binutils.exp: Skip relro tests on ia64.
-
 2011-07-14  Alan Modra  <amodra@gmail.com>
 
        * ld-scripts/section-flags.exp: Pass --local-store 0:0 for

diff --git a/ld/testsuite/ld-elf/binutils.exp b/ld/testsuite/ld-elf/binutils.exp
index 518a02d84b8e9990b6b71f48527fde398d0c43ba..380bd266b736b99a70756b474938bbf15d2476e9 100644 (file)
--- a/ld/testsuite/ld-elf/binutils.exp
+++ b/ld/testsuite/ld-elf/binutils.exp
@@ -104,19 +104,11 @@ binutils_test strip "-shared" maxpage1
 binutils_test objcopy "" maxpage1
 binutils_test objcopy "-shared" maxpage1
 
-if { [istarget "ia64-*-*"] } {
-  set relotest no
-} else {
-  set relotest yes
-}
-
-if { $relotest == "yes" } {
-    binutils_test strip "-z relro" relro1
-    binutils_test strip "-z relro -shared" relro1
-    binutils_test objcopy "-z relro" relro1
-    binutils_test objcopy "-z relro -shared" relro1
-}
-if { ([istarget "i?86-*-elf*"]
+binutils_test strip "-z relro" relro1
+binutils_test strip "-z relro -shared" relro1
+binutils_test objcopy "-z relro" relro1
+binutils_test objcopy "-z relro -shared" relro1
+if { ([istarget "i?86-*-elf*"]         
       || (([istarget "i?86-*-linux*"]
           || [istarget "i?86-*-gnu*"])
          && ![istarget "*-*-*aout*"]
@@ -145,8 +137,6 @@ set tls_opts {
 
 foreach testitem $tls_tests {
     foreach testopt $tls_opts {
-       if { ($relotest == "yes" || ![regexp "\-z relro" "$testopt"]) } {
-           binutils_test objcopy $testopt $testitem
-       }
+       binutils_test objcopy $testopt $testitem
     }
 }