2009-10-09 Basile Starynkevitch <basile@starynkevitch.net>

	MELT branch merged with trunk rev 152583 after the LTO merge
	inside trunk.

	[during merge with trunk 152583 the version information from GCC
	is used, not the checksum of the executable!]
	* gcc/melt-runtime.h (melt_gccversionstr): added extern declaration.
	* gcc/melt-runtime.c: Moved the #include before everything else.
	Updated comment NOTE about gengtype - which is now compatible
	with the trunk's.
	(melt_gccversionstr): added declaration.
	(load_checked_dynamic_module_index): use a gcc version string in
	modules, not a checksum of the executable.
	(melt_really_initialize): get a second argument for the gcc
	version string. Initialize melt_gccversionstr with it.
	(plugin_init): Build the gccversionstr out of gcc_version
	structure.
	(melt_initialize): calls melt_really_initialize with
	version_string.
	(melt_output_cfile_decl_impl): generates a genversionstr_melt
	instead of a genchecksum_melt.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@152591 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 9 insertions, 1 deletions

diff --git a/gcc/testsuite/lib/torture-options.exp b/gcc/testsuite/lib/torture-options.exp
index 7721f901bfe..f3b3e22948b 100644
--- a/gcc/testsuite/lib/torture-options.exp
+++ b/gcc/testsuite/lib/torture-options.exp
@@ -48,12 +48,14 @@ proc contains-loop-option-p { arg } {
 #
 # Argument 0 is the list to use as torture options
 # Argument 1 is the list to combine with the torture options.
+# Argument 2 is the list to be appended to the torture options after
+# combining argument 0 and 1.
 proc set-torture-options { args } {
     global torture_with_loops torture_without_loops
 
     set torture_list [lindex $args 0]
 
-    if { [llength $args] != 1 } {
+    if { [llength $args] > 1 } {
 	set other_list [lindex $args 1]
     } else {
 	set other_list [list {}]
@@ -71,6 +73,12 @@ proc set-torture-options { args } {
 	    lappend torture_with_loops "$torture_opts $other_opts"
 	}
     }
+
+    if { [llength $args] > 2 } {
+	set append_list [lindex $args 2]
+	append torture_with_loops " $append_list"
+	append torture_without_loops " $append_list"
+    }
 }
 
 # Finish up after using a set of torture options.