diff options
Diffstat (limited to 'gcc/testsuite/lib')
| -rw-r--r-- | gcc/testsuite/lib/gcc.exp | 4 | ||||
| -rw-r--r-- | gcc/testsuite/lib/objc.exp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/testsuite/lib/gcc.exp b/gcc/testsuite/lib/gcc.exp index bec0e2e4258..29c687be2c9 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 3ec19e336ff..9e7c445d3ce 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. |