diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index e28447620020d95bf6b535260ee0909c0e4f05cc..87491a1b2db93fc9d540382a1f12140f6f24a285 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-16  Tobias Burnus  <burnus@net-b.de>
+
+	PR libgomp/47758
+	* testsuite/libgomp.fortran/fortran.exp: Check for the existence
+	of libquadmath.a before adding its libpath to ldflags.
+
 2011-02-14  Jakub Jelinek  <jakub@redhat.com>
 
 	PR libgomp/47731
diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp
index 5529f191ed97e47282a8fa897554067a11e23ff7..87db855ba607522fafaac05218d3f6e00ce0d64c 100644
--- a/libgomp/testsuite/libgomp.fortran/fortran.exp
+++ b/libgomp/testsuite/libgomp.fortran/fortran.exp
@@ -37,10 +37,7 @@ if { $lang_test_file_found } {
     # Gather a list of all tests.
     set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]]
 
-    if { $blddir != "" } {
-	# We could, perhaps, test for the presence of the quad math lib - but if it 
-	# is required then its absence will cause a fail, and if it is not required
-	# the additions here should be harmless.
+    if { ($blddir != "") && [file exists "${blddir}/${quadmath_library_path}/libquadmath.a"] } {
 	lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/${quadmath_library_path}/"
 	# Allow for spec subsitution.
 	lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/${quadmath_library_path}/"