From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Date: Thu, 19 Feb 2015 19:57:30 +0000 (+0000)
Subject: re PR testsuite/65116 (ERROR: can't read additional_sources: no such variable)
X-Git-Tag: releases/gcc-5.1.0~872
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c10e0cecc0c99f9b729beea47bbfb563c5dd84e;p=thirdparty%2Fgcc.git

re PR testsuite/65116 (ERROR: can't read additional_sources: no such variable)

Fix PR testsuite/65116

	PR testsuite/65116
	* lib/target-supports.exp (check_compile): Check whether
	additional_sources is defined before using it.

From-SVN: r220822
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 65303b19ede7..7514a0ae0c40 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-19  Maxim Kuvyrkov  <maxim.kuvyrkov@linaro.org>
+
+	PR testsuite/65116
+	* lib/target-supports.exp (check_compile): Check whether
+	additional_sources is defined before using it.
+
 2015-02-19  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/65074
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 50a055d73289..6b957dea4d4d 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -44,8 +44,10 @@ proc check_compile {basename type contents args} {
     # 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 [info exists additional_sources] {
+	set tmp_additional_sources "$additional_sources"
+	set additional_sources ""
+    }
 
     if { [llength $args] > 0 } {
 	set options [list "additional_flags=[lindex $args 0]"]
@@ -93,7 +95,9 @@ proc check_compile {basename type contents args} {
     }
 
     # Restore additional_sources.
-    set additional_sources "$tmp_additional_sources"
+    if [info exists additional_sources] {
+	set additional_sources "$tmp_additional_sources"
+    }
 
     return [list $lines $scan_output]
 }