From 8a627e40a8c2809d6e2a87e3b6cfabeb2f10c7a7 Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Date: Thu, 19 Feb 2015 08:25:30 +0000
Subject: [PATCH] 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
---
 gcc/testsuite/ChangeLog               | 5 +++++
 gcc/testsuite/lib/target-supports.exp | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1ca711d93b7..32544ea2953 100644
--- 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 93cb791c9a9..50a055d7328 100644
--- 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]
 }