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.

From-SVN: r67822

gcc/testsuite/ChangeLog

+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

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]"

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.