From: H.J. Lu <hjl.tools@gmail.com>
Date: Thu, 14 Jul 2011 14:51:09 +0000 (+0000)
Subject: Revert the last change.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f33cfcaa37f068c113af97e9029bf3cdd55f2d56;p=binutils-gdb.git

Revert the last change.
---

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index b0015abc2ac..ee6987fa270 100644
--- 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 518a02d84b8..380bd266b73 100644
--- 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
     }
 }