Fix testsuite race on additional_sources

	* testsuite/lib/target-supports.exp (check_compile): Save/restore
	additional_sources that may belong to an actual test.

From-SVN: r220807

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1ca711d93b71662f9e54f0cea1b4ce09aa7fc960..32544ea2953515d2040d6a280a8a8c00e28468a3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-19  Maxim Kuvyrkov  <maxim.kuvyrkov@linaro.org>
+
+       * testsuite/lib/target-supports.exp (check_compile): Save/restore
+       additional_sources that may belong to an actual test.
+
 2015-02-18  Jakub Jelinek  <jakub@redhat.com>
 
        PR gcov-profile/64634

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 93cb791c9a9e027b8380cf4cdd2585806a4d2a75..50a055d73289cb45dcaa4dd6f52ebb185148e89c 100644 (file)
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -41,6 +41,12 @@ proc check_compile {basename type contents args} {
     global tool
     verbose "check_compile tool: $tool for $basename" 
 
+    # Save additional_sources to avoid compiling testsuite's sources
+    # against check_compile's source.
+    global additional_sources
+    set tmp_additional_sources "$additional_sources"
+    set additional_sources ""
+
     if { [llength $args] > 0 } {
        set options [list "additional_flags=[lindex $args 0]"]
     } else {
@@ -86,6 +92,9 @@ proc check_compile {basename type contents args} {
        file delete $output
     }
 
+    # Restore additional_sources.
+    set additional_sources "$tmp_additional_sources"
+
     return [list $lines $scan_output]
 }