[gcc] GCC 4.5.0=>4.5.1

gcc/libgomp/testsuite/libgomp.fortran/fortran.exp

Index: gcc/libgomp/testsuite/libgomp.fortran/fortran.exp
diff --git a/gcc/libgomp/testsuite/libgomp.fortran/fortran.exp b/gcc/libgomp/testsuite/libgomp.fortran/fortran.exp
index 0f7ad6e5a911c059f7262839e86735efc94b669b..acbfe49e5e31c464e3365de16e04a94d4ecea936 100644
--- a/gcc/libgomp/testsuite/libgomp.fortran/fortran.exp
+++ b/gcc/libgomp/testsuite/libgomp.fortran/fortran.exp
@@ -1,18 +1,27 @@
+load_lib libgomp-dg.exp
+
+global shlib_ext
+
+set shlib_ext [get_shlib_extension]
 set lang_library_path	"../libgfortran/.libs"
-set lang_link_flags	"-lgfortranbegin -lgfortran"
+set lang_link_flags	"-lgfortran"
 set lang_test_file_found 0
 
-load_lib libgomp-dg.exp
 
 # Initialize dg.
 dg-init
 
 if { $blddir != "" } {
-    if [file exists "${blddir}/${lang_library_path}/libgfortranbegin.a"] {
-        set lang_test_file "${lang_library_path}/libgfortranbegin.a"
+    # Look for a static libgfortran first.
+    if [file exists "${blddir}/${lang_library_path}/libgfortran.a"] {
+        set lang_test_file "${lang_library_path}/libgfortran.a"
+        set lang_test_file_found 1
+	# We may have a shared only build, so look for a shared libgfortran.
+    } elseif [file exists "${blddir}/${lang_library_path}/libgfortran.${shlib_ext}"] {
+        set lang_test_file "${lang_library_path}/libgfortran.${shlib_ext}"
         set lang_test_file_found 1
     } else {
-        puts "No libgfortranbegin library found, will not execute fortran tests"
+        puts "No libgfortran library found, will not execute fortran tests"
     }
 } elseif [info exists GFORTRAN_UNDER_TEST] {
     set lang_test_file_found 1