From bfa21a28ea5b3a5f6f524eaf95d67d0104ca6438 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Thu, 5 Feb 2004 05:09:38 +0000 Subject: [PATCH] file-format.exp (gcc_target_object_format): Use ${tool}_target_compile, not gcc_target_compile. * lib/file-format.exp (gcc_target_object_format): Use ${tool}_target_compile, not gcc_target_compile. * lib/target-supports.exp (check_alias_available): Likewise. (check_gc_sections_available): Likewise. * g++.dg/ext/attrib10.C: Use dg-require-alias. * g++.old-deja/g++.ext/attrib5.C: Use dg-require-weak and dg-require-alias. From-SVN: r77295 --- gcc/testsuite/ChangeLog | 10 ++++++++++ gcc/testsuite/g++.dg/ext/attrib10.C | 1 + gcc/testsuite/g++.old-deja/g++.ext/attrib5.C | 4 +++- gcc/testsuite/lib/file-format.exp | 3 ++- gcc/testsuite/lib/target-supports.exp | 8 +++++--- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 59badea..6c3db3e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -5,6 +5,16 @@ 2004-02-04 Mark Mitchell + * lib/file-format.exp (gcc_target_object_format): Use + ${tool}_target_compile, not gcc_target_compile. + * lib/target-supports.exp (check_alias_available): Likewise. + (check_gc_sections_available): Likewise. + * g++.dg/ext/attrib10.C: Use dg-require-alias. + * g++.old-deja/g++.ext/attrib5.C: Use dg-require-weak and + dg-require-alias. + +2004-02-04 Mark Mitchell + PR c++/13969 * g++.dg/template/static6.C: New test. diff --git a/gcc/testsuite/g++.dg/ext/attrib10.C b/gcc/testsuite/g++.dg/ext/attrib10.C index 6d04cb8..99459c7 100644 --- a/gcc/testsuite/g++.dg/ext/attrib10.C +++ b/gcc/testsuite/g++.dg/ext/attrib10.C @@ -1,4 +1,5 @@ // PR c++/12795 +// { dg-require-alias "" } void foo() { diff --git a/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C b/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C index 7a77d61..545f128 100644 --- a/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C +++ b/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C @@ -1,5 +1,7 @@ -// { dg-do run { xfail alpha*-dec-osf* *-*-hms i?86-pc-cygwin *-*-coff hppa2*-hp-hpux11* } } +// { dg-do run { xfail alpha*-dec-osf* *-*-hms i?86-pc-cygwin *-*-coff } } // Test that attributes weak and alias coexist. +// { dg-require-weak "" } +// { dg-require-alias "" } extern "C" { void f () __attribute__((weak, alias ("_f"))); diff --git a/gcc/testsuite/lib/file-format.exp b/gcc/testsuite/lib/file-format.exp index a4168b6..ab69f93 100644 --- a/gcc/testsuite/lib/file-format.exp +++ b/gcc/testsuite/lib/file-format.exp @@ -24,6 +24,7 @@ proc gcc_target_object_format { } { global gcc_target_object_format_saved + global tool if [info exists gcc_target_object_format_saved] { verbose "gcc_target_object_format returning saved $gcc_target_object_format_saved" 2 @@ -33,7 +34,7 @@ proc gcc_target_object_format { } { puts $open_file "void foo(void) { }" close $open_file - gcc_target_compile objfmtst.c objfmtst.o object "" + ${tool}_target_compile objfmtst.c objfmtst.o object "" catch { set output [exec $objdump_name --file-headers objfmtst.o ] diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index bff0a4f..33d72fd 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -99,7 +99,8 @@ proc check_visibility_available { } { proc check_alias_available { } { global alias_available_saved - + global tool + if [info exists alias_available_saved] { verbose "check_alias_available returning saved $alias_available_saved" 2 } else { @@ -110,7 +111,7 @@ proc check_alias_available { } { # about the program. puts $f "void g() {} void f() __attribute__((alias(\"g\")));" close $f - set lines [gcc_target_compile "tmp.c" "tmp.o" object ""] + set lines [${tool}_target_compile "tmp.c" "tmp.o" object ""] file delete "tmp.c" if [string match "" $lines] then { @@ -148,10 +149,11 @@ proc check_alias_available { } { proc check_gc_sections_available { } { global gc_sections_available_saved + global tool if {![info exists gc_sections_available_saved]} { # Check if the ld used by gcc supports --gc-sections. - set gcc_ld [lindex [gcc_target_compile "-print-prog-name=ld" "" "none" ""] 0] + set gcc_ld [lindex [${tool}_target_compile "-print-prog-name=ld" "" "none" ""] 0] set ld_output [remote_exec host "$gcc_ld" "--help"] if { [ string first "--gc-sections" $ld_output ] >= 0 } { set gc_sections_available_saved 1 -- 2.7.4