This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[Patch, libgomp, testsuite] Another libquadmath tweak.


Hi,

If the target embeds the dependency of libgfortan -> libquadmath, then uninstalled testing of libgomp.fortran can fail because the path to libquadmath is unknown in the libgomp test harness.

Note that libgomp uses xgcc to drive fortran tests - not gfortran (so we have to supply needed libs by hand).

As discussed with Tobias and Dominique on irc.

tested with uninstalled make check-target-libgomp on {i686,powerpc}- darwin9.
OK for trunk?
Iain


libgomp:

	* testsuite/libgomp.fortran/fortran.exp: Add paths for libquadmath.
	

Index: libgomp/testsuite/libgomp.fortran/fortran.exp
===================================================================
--- libgomp/testsuite/libgomp.fortran/fortran.exp	(revision 166967)
+++ libgomp/testsuite/libgomp.fortran/fortran.exp	(working copy)
@@ -6,8 +6,8 @@ set shlib_ext [get_shlib_extension]
 set lang_library_path	"../libgfortran/.libs"
 set lang_link_flags	"-lgfortran"
 set lang_test_file_found 0
+set quadmath_library_path "../libquadmath/.libs"

-
 # Initialize dg.
 dg-init

@@ -36,7 +36,13 @@ if { $lang_test_file_found } {
     set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]]

if { $blddir != "" } {
- set ld_library_path "$always_ld_library_path:${blddir}/$ {lang_library_path}"
+ # 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.
+ lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/${quadmath_library_path}/"
+ # Allow for spec subsitution.
+ lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/$ {quadmath_library_path}/"
+ set ld_library_path "$always_ld_library_path:${blddir}/$ {lang_library_path}:${blddir}/${quadmath_library_path}"
} else {
set ld_library_path "$always_ld_library_path"
}



Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]