From 466a53e020dbe24d4b1f1600002c2bfc46360f3d Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 8 Jul 2009 03:09:13 +0000 Subject: [PATCH] * ld-selective/selective.exp: Remove check that $CC contains the string "gcc". Do -dumpversion for $CXX. --- ld/testsuite/ChangeLog | 5 +++++ ld/testsuite/ld-selective/selective.exp | 16 +++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 33337974fbd..5e4b7107f6f 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-07-08 Alan Modra + + * ld-selective/selective.exp: Remove check that $CC contains the + string "gcc". Do -dumpversion for $CXX. + 2009-06-30 Nick Clifton PR 10288 diff --git a/ld/testsuite/ld-selective/selective.exp b/ld/testsuite/ld-selective/selective.exp index b6981543747..f4711ff5907 100644 --- a/ld/testsuite/ld-selective/selective.exp +++ b/ld/testsuite/ld-selective/selective.exp @@ -108,16 +108,14 @@ foreach testitem $seltests { if { $testtype == "C++" } { set testflags "$cflags $cxxflags" set compiler "$CXX" - if [string match "*gcc*" [lindex $CC 0]] { - # Starting with 3.4.0, -fvtable-gc is no longer supported and thus - # the functionality we try to test for cannot be expected to work. - set version [remote_exec host "$CC -dumpversion"] - set version [lindex $version 1] - if [regexp "^(\[1-9\]\[0-9\]+|\[4-9\]|3.(\[1-9\]\[0-9\]+|\[4-9\]))\\." $version] { - setup_xfail {*-*-*} - } + # Starting with 3.4.0, -fvtable-gc is no longer supported and thus + # the functionality we try to test for cannot be expected to work. + set version [remote_exec host "$CXX -dumpversion"] + set version [lindex $version 1] + if [regexp "^(\[1-9\]\[0-9\]+|\[4-9\]|3.(\[1-9\]\[0-9\]+|\[4-9\]))\\." $version] { + setup_xfail {*-*-*} } - } { + } else { set testflags "$cflags" set compiler "$CC" } -- 2.30.2