2005-11-11 Andreas Tobler <a.tobler@schweiz.ch>

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

diff --git a/gcc/testsuite/lib/gfortran.exp b/gcc/testsuite/lib/gfortran.exp
index 95af06a..435d715 100644 (file)
--- a/gcc/testsuite/lib/gfortran.exp
+++ b/gcc/testsuite/lib/gfortran.exp
@@ -1,18 +1,18 @@
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 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
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # This file is just 'sed -e 's/77/fortran/g' \
 #                       -e 's/f2c/gfortran' g77.exp > gfortran.exp'
@@ -49,8 +49,8 @@ proc gfortran_version { } {
     # verify that the compiler exists
     if { [is_remote host] || [which $compiler] != 0 } then {
        set tmp [remote_exec host "$compiler -v"]
-       set status [lindex $tmp 0];
-       set output [lindex $tmp 1];
+       set status [lindex $tmp 0]
+       set output [lindex $tmp 1]
        regexp " version \[^\n\r\]*" $output version
        if { $status == 0 && [info exists version] } then {
            if [is_remote host] {
@@ -73,42 +73,35 @@ proc gfortran_version { } {
 #
 
 proc gfortran_link_flags { paths } {
-    global rootme
     global srcdir
     global ld_library_path
     global GFORTRAN_UNDER_TEST
+    global shlib_ext
 
     set gccpath ${paths}
     set libio_dir ""
     set flags ""
     set ld_library_path "."
+    set shlib_ext [get_shlib_extension]
+    verbose "shared lib extension: $shlib_ext"
 
     if { $gccpath != "" } {
       if [file exists "${gccpath}/libgfortran/.libs/libgfortran.a"] {
           append flags "-L${gccpath}/libgfortran/.libs "
           append ld_library_path ":${gccpath}/libgfortran/.libs"
       }
+      if [file exists "${gccpath}/libgfortran/.libs/libgfortran.${shlib_ext}"] {
+         append flags "-L${gccpath}/libgfortran/.libs "
+         append ld_library_path ":${gccpath}/libgfortran/.libs"
+      }
       if [file exists "${gccpath}/libgfortran/libgforbegin.a"] {
           append flags "-L${gccpath}/libgfortran "
       }
       if [file exists "${gccpath}/libiberty/libiberty.a"] {
           append flags "-L${gccpath}/libiberty "
       }
-      append ld_library_path ":${rootme}"
-      set compiler [lindex $GFORTRAN_UNDER_TEST 0]
-      if { [is_remote host] == 0 && [which $compiler] != 0 } {
-       foreach i "[exec $compiler --print-multi-lib]" {
-         set mldir ""
-         regexp -- "\[a-z0-9=/\.-\]*;" $i mldir
-         set mldir [string trimright $mldir "\;@"]
-         if { "$mldir" == "." } {
-           continue
-         }
-         if { [llength [glob -nocomplain ${rootme}/${mldir}/libgcc_s*.so.*]] >= 1 } {
-           append ld_library_path ":${rootme}/${mldir}"
-         }
-       }
-      }
+      append ld_library_path \
+       [gcc-set-multilib-library-path $GFORTRAN_UNDER_TEST]
     }
 
     set_ld_library_path_env_vars
@@ -126,7 +119,7 @@ proc gfortran_init { args } {
     global base_dir
     global tmpdir
     global libdir
-    global gluefile wrap_flags;
+    global gluefile wrap_flags
     global objdir srcdir
     global ALWAYS_GFORTRANFLAGS
     global TOOL_EXECUTABLE TOOL_OPTIONS
@@ -139,7 +132,7 @@ proc gfortran_init { args } {
 
     if ![info exists GFORTRAN_UNDER_TEST] then {
        if [info exists TOOL_EXECUTABLE] {
-           set GFORTRAN_UNDER_TEST $TOOL_EXECUTABLE;
+           set GFORTRAN_UNDER_TEST $TOOL_EXECUTABLE
        } else {
            if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } {
                set GFORTRAN_UNDER_TEST [transform gfortran]
@@ -169,14 +162,14 @@ proc gfortran_init { args } {
 
     if ![is_remote host] {
        if [info exists TOOL_OPTIONS] {
-           lappend ALWAYS_GFORTRANFLAGS "ldflags=[gfortran_link_flags [get_multilibs ${TOOL_OPTIONS}] ]";
+           lappend ALWAYS_GFORTRANFLAGS "ldflags=[gfortran_link_flags [get_multilibs ${TOOL_OPTIONS}] ]"
        } else {
-           lappend ALWAYS_GFORTRANFLAGS "ldflags=[gfortran_link_flags [get_multilibs] ]";
+           lappend ALWAYS_GFORTRANFLAGS "ldflags=[gfortran_link_flags [get_multilibs] ]"
        }
     }
 
     if [info exists TOOL_OPTIONS] {
-       lappend ALWAYS_GFORTRANFLAGS "additional_flags=$TOOL_OPTIONS";
+       lappend ALWAYS_GFORTRANFLAGS "additional_flags=$TOOL_OPTIONS"
     }
 
     verbose -log "ALWAYS_GFORTRANFLAGS set to $ALWAYS_GFORTRANFLAGS"
@@ -189,19 +182,19 @@ proc gfortran_init { args } {
 #
 
 proc gfortran_target_compile { source dest type options } {
-    global tmpdir;
+    global tmpdir
     global gluefile wrap_flags
-    global ALWAYS_GFORTRANFLAGS;
-    global GFORTRAN_UNDER_TEST;
+    global ALWAYS_GFORTRANFLAGS
+    global GFORTRAN_UNDER_TEST
 
     if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } {
        lappend options "libs=${gluefile}"
        lappend options "ldflags=${wrap_flags}"
     }
 
-    lappend options "compiler=$GFORTRAN_UNDER_TEST";
-
-    set options [concat "$ALWAYS_GFORTRANFLAGS" $options];
+    lappend options "compiler=$GFORTRAN_UNDER_TEST"
 
+    set options [concat "$ALWAYS_GFORTRANFLAGS" $options]
+    set options [dg-additional-files-options $options $source]
     return [target_compile $source $dest $type $options]
 }