* lib/target-supports.exp (check_effective_target_mpc_pow): Fix

[pf3gnuchains/gcc-fork.git] / gcc / testsuite / lib / fortran-torture.exp

diff --git a/gcc/testsuite/lib/fortran-torture.exp b/gcc/testsuite/lib/fortran-torture.exp
index 0f68da0..811b4cf 100644 (file)
--- a/gcc/testsuite/lib/fortran-torture.exp
+++ b/gcc/testsuite/lib/fortran-torture.exp
@@ -1,8 +1,8 @@
-# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
@@ -11,8 +11,8 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
 
 # Please email any bugs, comments, and/or additions to this file to
 # the author.
@@ -22,10 +22,16 @@
 
 load_lib target-supports.exp
 
+# Return the list of options to use for fortran torture tests.
 # The default option list can be overridden by
 # TORTURE_OPTIONS="{ { list1 } ... { listN } }"
+proc get-fortran-torture-options { } {
+    global TORTURE_OPTIONS
+
+    if [info exists TORTURE_OPTIONS] {
+       return $TORTURE_OPTIONS
+    }
 
-if ![info exists TORTURE_OPTIONS] {
     # determine if host supports vectorization, and the necessary set
     # of options, based on code from testsuite/vect/vect.exp
 
@@ -38,14 +44,17 @@ if ![info exists TORTURE_OPTIONS] {
        set test_tree_vectorize 1
     } elseif { [istarget  "spu-*-*"] } {
        set test_tree_vectorize 1
-    } elseif { [istarget "i?86-*-*"] || [istarget "x86_64-*-*"] } {
+    } elseif { ( [istarget "i?86-*-*"] || [istarget "x86_64-*-*"] )
+              && [check_sse2_hw_available] } {
        lappend vectorizer_options "-msse2"
        set test_tree_vectorize 1
-    } elseif { [istarget "mipsisa64*-*-*"]
-              && [check_effective_target_mpaired_single] } {
+    } elseif { [istarget "mips*-*-*"]
+              && [check_effective_target_mpaired_single]
+              && [check_effective_target_nomips16] } {
        lappend vectorizer_options "-mpaired-single"
        set test_tree_vectorize 1
-    } elseif [istarget "sparc*-*-*"] {
+    } elseif { [istarget "sparc*-*-*"]
+              && [check_effective_target_ultrasparc_hw] } {
        lappend vectorizer_options "-mcpu=ultrasparc" "-mvis"
        set test_tree_vectorize 1
     } elseif { [istarget "alpha*-*-*"]
@@ -58,17 +67,26 @@ if ![info exists TORTURE_OPTIONS] {
        set test_tree_vectorize 0
     }
 
-    set TORTURE_OPTIONS [list \
-       { -O0 } { -O1 } { -O2 } \
+    set options {}
+
+    lappend options \
+       { -O0 } \
+       { -O1 } \
+       { -O2 } \
        { -O2 -fomit-frame-pointer -finline-functions } \
        { -O2 -fomit-frame-pointer -finline-functions -funroll-loops } \
        { -O2 -fbounds-check } \
        { -O3 -g } \
-       { -Os }]
-
+       { -Os }
     if { $test_tree_vectorize } {
-       lappend TORTURE_OPTIONS $vectorizer_options
+       lappend options $vectorizer_options
     }
+
+    if [info exists ADDITIONAL_TORTURE_OPTIONS] {
+       set options [concat $options $ADDITIONAL_TORTURE_OPTIONS]
+    }
+
+    return $options
 }
 
 
@@ -173,7 +191,7 @@ proc fortran-torture-execute { src } {
     global srcdir tmpdir
     global tool
     global compiler_conditional_xfail_data
-    global TORTURE_OPTIONS
+    global torture_with_loops
 
     # Check for alternate driver.
     set additional_flags ""
@@ -187,7 +205,7 @@ proc fortran-torture-execute { src } {
     }
 
     # Setup the options for the testcase run.
-    set option_list $TORTURE_OPTIONS
+    set option_list $torture_with_loops
     set executable $tmpdir/[file tail [file rootname $src].x]
     regsub "(?q)$srcdir/" $src "" testcase
 
@@ -347,6 +365,7 @@ proc search_for_re { file pattern } {
 proc fortran-torture { args } {
     global srcdir subdir
     global compiler_conditional_xfail_data
+    global torture_with_loops
 
     set src [lindex $args 0]
     if { [llength $args] > 1 } {
@@ -371,7 +390,7 @@ proc fortran-torture { args } {
     }
    
     # loop through all the options
-    set option_list [list { "-O" } ]
+    set option_list $torture_with_loops
     foreach option $option_list {
 
        # torture_compile_xfail is set by the .x script (if present)