summaryrefslogtreecommitdiff
path: root/libgomp
diff options
context:
space:
mode:
authorbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2009-06-03 06:06:01 +0000
committerbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2009-06-03 06:06:01 +0000
commit2dda64a6258fe213cb75f8a1b381d6a8ce338bb4 (patch)
tree69dc5d71503b8283d8144704ac5beaf98a8a2c94 /libgomp
parentd3ed35175e394ed9bf2721192f14f57c91c1fbe9 (diff)
downloadgcc-2dda64a6258fe213cb75f8a1b381d6a8ce338bb4.tar.gz
2009-06-03 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r148111 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@148114 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/ChangeLog7
-rw-r--r--libgomp/testsuite/libgomp.fortran/fortran.exp8
2 files changed, 11 insertions, 4 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index e8a6fbf22f7..65144c31101 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-27 Janne Blomqvist <jb@gcc.gnu.org>
+
+ PR fortran/39718
+ * testsuite/libgomp.fortran/fortran.exp: Don't link with
+ libgfortranbegin, check existence of libgfortran.a instead of
+ libgfortranbegin.a.
+
2009-05-20 Jakub Jelinek <jakub@redhat.com>
PR libgomp/40174
diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp
index 0f7ad6e5a91..3d6615ffee7 100644
--- a/libgomp/testsuite/libgomp.fortran/fortran.exp
+++ b/libgomp/testsuite/libgomp.fortran/fortran.exp
@@ -1,5 +1,5 @@
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
@@ -8,11 +8,11 @@ load_lib libgomp-dg.exp
dg-init
if { $blddir != "" } {
- if [file exists "${blddir}/${lang_library_path}/libgfortranbegin.a"] {
- set lang_test_file "${lang_library_path}/libgfortranbegin.a"
+ if [file exists "${blddir}/${lang_library_path}/libgfortran.a"] {
+ set lang_test_file "${lang_library_path}/libgfortran.a"
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