diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2007-02-22 04:39:35 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2007-02-22 04:39:35 +0000 |
| commit | d1fb5e1c0b2c50fce4934f3b604ea263c08ac8a8 (patch) | |
| tree | dea1b0017af1072f775d7d00642e3ee3f5591be1 /gcc | |
| parent | bc52707a5e70fd384c2afc884b90b074ceda49c1 (diff) | |
| download | gcc-d1fb5e1c0b2c50fce4934f3b604ea263c08ac8a8.zip gcc-d1fb5e1c0b2c50fce4934f3b604ea263c08ac8a8.tar.gz gcc-d1fb5e1c0b2c50fce4934f3b604ea263c08ac8a8.tar.bz2 | |
wrapper.exp (${tool}_maybe_build_wrapper): Allow the caller to set options for compiling testglue.
* lib/wrapper.exp (${tool}_maybe_build_wrapper): Allow the caller
to set options for compiling testglue.
* lib/g++.exp (g++_init): Compile testglue with -fexceptions.
* lib/obj-c++.exp (obj-c++_init): Likewise.
* testsuite/lib/libstdc++.exp (libstdc++_init): Compile testglue
with -fexceptions.
From-SVN: r122217
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/lib/g++.exp | 2 | ||||
| -rw-r--r-- | gcc/testsuite/lib/obj-c++.exp | 2 | ||||
| -rw-r--r-- | gcc/testsuite/lib/wrapper.exp | 11 |
4 files changed, 17 insertions, 5 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index acf266d..282d205 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2007-02-21 Mark Mitchell <mark@codesourcery.com> + + * lib/wrapper.exp (${tool}_maybe_build_wrapper): Allow the caller + to set options for compiling testglue. + * lib/g++.exp (g++_init): Compile testglue with -fexceptions. + * lib/obj-c++.exp (obj-c++_init): Likewise. + 2007-02-21 Eric Botcazou <ebotcazou@adacore.com> * gnat.dg/derived_aggregate.adb: New test. diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index 700cc58..5e3a098 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -221,7 +221,7 @@ proc g++_init { args } { unset gluefile } - g++_maybe_build_wrapper "${tmpdir}/g++-testglue.o" + g++_maybe_build_wrapper "${tmpdir}/g++-testglue.o" "-fexceptions" if {![info exists CXXFLAGS]} { set CXXFLAGS "" diff --git a/gcc/testsuite/lib/obj-c++.exp b/gcc/testsuite/lib/obj-c++.exp index 8913b31..3927e76 100644 --- a/gcc/testsuite/lib/obj-c++.exp +++ b/gcc/testsuite/lib/obj-c++.exp @@ -239,7 +239,7 @@ proc obj-c++_init { args } { unset gluefile } - obj-c++_maybe_build_wrapper "${tmpdir}/obj-c++-testglue.o" + obj-c++_maybe_build_wrapper "${tmpdir}/obj-c++-testglue.o" "-fexceptions" set ALWAYS_OBJCXXFLAGS "" diff --git a/gcc/testsuite/lib/wrapper.exp b/gcc/testsuite/lib/wrapper.exp index 48c31e6..c61a21d 100644 --- a/gcc/testsuite/lib/wrapper.exp +++ b/gcc/testsuite/lib/wrapper.exp @@ -16,20 +16,25 @@ # This file contains GCC-specifics for status wrappers for test programs. -# ${tool}_maybe_build_wrapper -- Build wrapper object if the target needs it. +# ${tool}_maybe_build_wrapper -- Build wrapper object if the target +# needs it. FILENAME is the path to the wrapper file. If there are +# additional arguments, they are command-line options to provide to +# the compiler when compiling FILENAME. -proc ${tool}_maybe_build_wrapper { filename } { +proc ${tool}_maybe_build_wrapper { filename args } { global gluefile wrap_flags if { [target_info needs_status_wrapper] != "" \ && [target_info needs_status_wrapper] != "0" \ && ![info exists gluefile] } { set saved_wrap_compile_flags [target_info wrap_compile_flags] + set flags [join $args " "] # The wrapper code may contain code that gcc objects on. This # became true for dejagnu-1.4.4. The set of warnings and code # that gcc objects on may change, so just make sure -w is always # passed to turn off all warnings. - set_currtarget_info wrap_compile_flags "$saved_wrap_compile_flags -w" + set_currtarget_info wrap_compile_flags \ + "$saved_wrap_compile_flags -w $flags" set result [build_wrapper $filename] set_currtarget_info wrap_compile_flags "$saved_wrap_compile_flags" if { $result != "" } { |