From 118a91b1e059cd90ba5b07ac80173a0a021d3332 Mon Sep 17 00:00:00 2001
From: wilson <wilson@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 12 Jun 2003 05:54:23 +0000
Subject: [PATCH] Patch from Kelley Cook. * lib/gcc.exp (gcc_target_compile):
Put TOOL_OPTIONS at front of options instead of at the end. * lib/objc.exp
(objc_target_compile): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67822 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/testsuite/ChangeLog | 6 ++++++
gcc/testsuite/lib/gcc.exp | 4 +++-
gcc/testsuite/lib/objc.exp | 4 +++-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 52b54cb4857f..acd4e47aab1e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-11 Kelley Cook <kelleycook@wideopenwest.com>
+
+ * lib/gcc.exp (gcc_target_compile): Put TOOL_OPTIONS at front of
+ options instead of at the end.
+ * lib/objc.exp (objc_target_compile): Likewise.
+
2003-06-11 Mark Mitchell <mark@codesourcery.com>
PR c++/10432
diff --git a/gcc/testsuite/lib/gcc.exp b/gcc/testsuite/lib/gcc.exp
index bec0e2e42587..29c687be2c9b 100644
--- a/gcc/testsuite/lib/gcc.exp
+++ b/gcc/testsuite/lib/gcc.exp
@@ -146,8 +146,10 @@ proc gcc_target_compile { source dest type options } {
if [target_info exists gcc,no_label_values] {
lappend options "additional_flags=-DNO_LABEL_VALUES"
}
+ # TOOL_OPTIONS must come first, so that it doesn't override testcase
+ # specific options.
if [info exists TOOL_OPTIONS] {
- lappend options "additional_flags=$TOOL_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 3ec19e336ff8..9e7c445d3ced 100644
--- a/gcc/testsuite/lib/objc.exp
+++ b/gcc/testsuite/lib/objc.exp
@@ -162,8 +162,10 @@ proc objc_target_compile { source dest type options } {
if [target_info exists objc,no_label_values] {
lappend options "additional_flags=-DNO_LABEL_VALUES"
}
+ # TOOL_OPTIONS must come first, so that it doesn't override testcase
+ # specific options.
if [info exists TOOL_OPTIONS] {
- lappend options "additional_flags=$TOOL_OPTIONS"
+ set options [concat "additional_flags=$TOOL_OPTIONS" $options];
}
# Point to the ObjC headers in libobjc.
--
GitLab