* 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/trunk@122217 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index acf266d..282d205 100644 (file)
--- 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.
 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 (file)
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -221,7 +221,7 @@ proc g++_init { args } {
        unset gluefile
     }
 
        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 ""
 
     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 (file)
--- 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
     }
 
        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 ""
 
 
     set ALWAYS_OBJCXXFLAGS ""
 

diff --git a/gcc/testsuite/lib/wrapper.exp b/gcc/testsuite/lib/wrapper.exp
index 48c31e6..c61a21d 100644 (file)
--- 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.
 
 
 # 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]
     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.
        # 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 != "" } {
        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 ba0a40b..04ed3a8 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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)
 2007-02-20  Paolo Carlini  <pcarlini@suse.de>
 
        PR libstdc++/28080 (partial)

diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 9308fa5..3557d13 100644 (file)
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -225,7 +225,7 @@ proc libstdc++_init { testfile } {
        v3track PCH_CXXFLAGS 2
     }
 
        v3track PCH_CXXFLAGS 2
     }
 

-    libstdc++_maybe_build_wrapper "${objdir}/testglue.o"
+    libstdc++_maybe_build_wrapper "${objdir}/testglue.o" "-fexceptions"

 }
 
 # Callback for cleanup routines.
 }
 
 # Callback for cleanup routines.