Patchwork [committed,gomp] PR 47758 - Check for existence of libquadmath.a before adding the libpath

login
register
mail settings
Submitter Tobias Burnus
Date Feb. 16, 2011, 5:45 p.m.
Message ID <4D5C0D25.4080900@net-b.de>
Download mbox | patch
Permalink /patch/83378/
State New
Headers show

Comments

Tobias Burnus - Feb. 16, 2011, 5:45 p.m.
I have committed the attached patch as Rev. 170216.

The patch was approved by Jakub in the PR and tested on x86-64-linux and 
- by the bug reporter - on PowerPC Darwin.

Tobias

Patch

Index: libgomp/ChangeLog
===================================================================
--- libgomp/ChangeLog	(revision 170215)
+++ libgomp/ChangeLog	(working copy)
@@ -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
Index: libgomp/testsuite/libgomp.fortran/fortran.exp
===================================================================
--- libgomp/testsuite/libgomp.fortran/fortran.exp	(revision 170215)
+++ libgomp/testsuite/libgomp.fortran/fortran.exp	(working copy)
@@ -37,10 +37,7 @@ 
     # 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}/"