aboutsummaryrefslogtreecommitdiff
path: root/ld/testsuite
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2011-07-14 14:51:09 +0000
committerH.J. Lu <hjl.tools@gmail.com>2011-07-14 14:51:09 +0000
commitf33cfcaa37f068c113af97e9029bf3cdd55f2d56 (patch)
tree6ae850b5e32e193df9dae04e9c4c2e85c5c4cb15 /ld/testsuite
parentd44976c9770359d74277c472f76d9fa019620c89 (diff)
downloadgdb-f33cfcaa37f068c113af97e9029bf3cdd55f2d56.zip
gdb-f33cfcaa37f068c113af97e9029bf3cdd55f2d56.tar.gz
gdb-f33cfcaa37f068c113af97e9029bf3cdd55f2d56.tar.bz2
Revert the last change.
Diffstat (limited to 'ld/testsuite')
-rw-r--r--ld/testsuite/ChangeLog4
-rw-r--r--ld/testsuite/ld-elf/binutils.exp22
2 files changed, 6 insertions, 20 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index b0015ab..ee6987fa 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 518a02d..380bd26 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
}
}