From e38f9c2136db6afd03183fef26e3085ea7d9e4ee Mon Sep 17 00:00:00 2001
From: Matthew Sachs <msachs@apple.com>
Date: Sat, 5 Mar 2005 00:27:04 +0000
Subject: [PATCH] gcc.exp (gcc_target_compile): Put braces around
additional_flags=$TOOL_OPTIONS...
* gcc.exp (gcc_target_compile): Put braces around
additional_flags=$TOOL_OPTIONS; allows for whitespace in $TOOL_OPTIONS.
* objc.exp (objc_target_compile): Likewise.
* treelang.exp (treelang_target_compile): Likewise.
From-SVN: r95912
---
gcc/testsuite/ChangeLog | 7 +++++++
gcc/testsuite/lib/gcc.exp | 2 +-
gcc/testsuite/lib/objc.exp | 2 +-
gcc/testsuite/lib/treelang.exp | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bf945a09a5a0..e1c73dfb3ea2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-04 Matthew Sachs <msachs@apple.com>
+
+ * gcc.exp (gcc_target_compile): Put braces around
+ additional_flags=$TOOL_OPTIONS; allows for whitespace in $TOOL_OPTIONS.
+ * objc.exp (objc_target_compile): Likewise.
+ * treelang.exp (treelang_target_compile): Likewise.
+
2005-03-04 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de>
PR fortran/19673
diff --git a/gcc/testsuite/lib/gcc.exp b/gcc/testsuite/lib/gcc.exp
index 2f5533876668..f0dc240851c9 100644
--- a/gcc/testsuite/lib/gcc.exp
+++ b/gcc/testsuite/lib/gcc.exp
@@ -139,7 +139,7 @@ proc gcc_target_compile { source dest type options } {
# TOOL_OPTIONS must come first, so that it doesn't override testcase
# specific options.
if [info exists TOOL_OPTIONS] {
- set options [concat "additional_flags=$TOOL_OPTIONS" $options];
+ set options [concat "{additional_flags=$TOOL_OPTIONS}" $options];
}
if [target_info exists gcc,timeout] {
lappend options "timeout=[target_info gcc,timeout]"
diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp
index c9e6161eb0bb..5041b705e315 100644
--- a/gcc/testsuite/lib/objc.exp
+++ b/gcc/testsuite/lib/objc.exp
@@ -162,7 +162,7 @@ proc objc_target_compile { source dest type options } {
# TOOL_OPTIONS must come first, so that it doesn't override testcase
# specific options.
if [info exists TOOL_OPTIONS] {
- set options [concat "additional_flags=$TOOL_OPTIONS" $options];
+ set options [concat "{additional_flags=$TOOL_OPTIONS}" $options];
}
# If we have built libobjc along with the compiler (which usually
diff --git a/gcc/testsuite/lib/treelang.exp b/gcc/testsuite/lib/treelang.exp
index 9b225344f874..dfce3d88d2f0 100644
--- a/gcc/testsuite/lib/treelang.exp
+++ b/gcc/testsuite/lib/treelang.exp
@@ -153,7 +153,7 @@ proc treelang_target_compile { source dest type options } {
# TOOL_OPTIONS must come first, so that it doesn't override testcase
# specific options.
if [info exists TOOL_OPTIONS] {
- set options [concat "additional_flags=$TOOL_OPTIONS" $options];
+ set options [concat "{additional_flags=$TOOL_OPTIONS}" $options];
}
# If we have built libtreelang along with the compiler (which usually