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
This commit is contained in:
Mark Mitchell 2007-02-22 04:39:35 +00:00 committed by Mark Mitchell
parent bc52707a5e
commit d1fb5e1c0b
6 changed files with 23 additions and 6 deletions

View File

@ -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.

View File

@ -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 ""

View File

@ -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 ""

View File

@ -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 != "" } {

View File

@ -1,3 +1,8 @@
2007-02-20 Mark Mitchell <mark@codesourcery.com>
* testsuite/lib/libstdc++.exp (libstdc++_init): Compile testglue
with -fexceptions.
2007-02-20 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/28080 (partial)

View File

@ -225,7 +225,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.