From d44976c9770359d74277c472f76d9fa019620c89 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 14 Jul 2011 14:49:37 +0000 Subject: [PATCH] Skip relro tests on ia64. 2011-07-14 H.J. Lu * ld-elf/binutils.exp: Skip relro tests on ia64. --- ld/testsuite/ChangeLog | 4 ++++ ld/testsuite/ld-elf/binutils.exp | 22 ++++++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index ee6987fa270..b0015abc2ac 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-07-14 H.J. Lu + + * ld-elf/binutils.exp: Skip relro tests on ia64. + 2011-07-14 Alan Modra * 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 380bd266b73..518a02d84b8 100644 --- a/ld/testsuite/ld-elf/binutils.exp +++ b/ld/testsuite/ld-elf/binutils.exp @@ -104,11 +104,19 @@ binutils_test strip "-shared" maxpage1 binutils_test objcopy "" maxpage1 binutils_test objcopy "-shared" maxpage1 -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*"] +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*"] || (([istarget "i?86-*-linux*"] || [istarget "i?86-*-gnu*"]) && ![istarget "*-*-*aout*"] @@ -137,6 +145,8 @@ set tls_opts { foreach testitem $tls_tests { foreach testopt $tls_opts { - binutils_test objcopy $testopt $testitem + if { ($relotest == "yes" || ![regexp "\-z relro" "$testopt"]) } { + binutils_test objcopy $testopt $testitem + } } } -- 2.30.2