diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-22 04:43:45 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-22 04:43:45 +0000 |
| commit | 70fb4851851aebc7e6bf58afb56ab1a72f1dfec3 (patch) | |
| tree | 61774756a7a1bbe09962079e74c4c853376d9d5d | |
| parent | d46234bb34d93b89d5195ad3ff7f011985c268b8 (diff) | |
| download | gcc-70fb4851851aebc7e6bf58afb56ab1a72f1dfec3.tar.gz | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_1-branch@122219 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 | 6 | ||||
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/lib/libstdc++.exp | 2 |
6 files changed, 19 insertions, 5 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 50403ff0362..304a9ae8c60 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-20 Ira Rosen <irar@il.ibm.com> * gfortran.dg/vect/vect-2.f90: Xfail to vectorize one of the loops diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index 69635fb5541..6d60878c14e 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 d5ddda7c076..96bd60ad401 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 48c31e68ebe..b50c447c01e 100644 --- a/gcc/testsuite/lib/wrapper.exp +++ b/gcc/testsuite/lib/wrapper.exp @@ -18,18 +18,20 @@ # ${tool}_maybe_build_wrapper -- Build wrapper object if the target needs it. -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 != "" } { diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fcaeadc6179..26b10d446d7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2007-02-21 Mark Mitchell <mark@codesourcery.com> + + * testsuite/lib/libstdc++.exp (libstdc++_init): Compile testglue + with -fexceptions. + 2007-02-13 Release Manager * GCC 4.1.2 released. diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 3368c242070..bba33ded55d 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -223,7 +223,7 @@ proc libstdc++_init { testfile } { v3track PCH_CXXFLAGS 2 } - libstdc++_maybe_build_wrapper "${objdir}/testglue.o" + libstdc++_maybe_build_wrapper "${objdir}/testglue.o" "-fexceptions" } # Callback for cleanup routines. |