Patchwork [libgomp,testsuite] Another libquadmath tweak.

login
register
mail settings
Submitter IainS
Date Nov. 20, 2010, 12:19 p.m.
Message ID <76A74365-D6CC-4189-8947-18D0AB7C82A8@sandoe-acoustics.co.uk>
Download mbox | patch
Permalink /patch/72351/
State New
Headers show

Comments

IainS - Nov. 20, 2010, 12:19 p.m.
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.
	

+	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"
      }
Jakub Jelinek - Nov. 23, 2010, 11:45 p.m.
On Sat, Nov 20, 2010 at 12:19:26PM +0000, IainS wrote:
> 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?

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

	Jakub
IainS - Nov. 24, 2010, 7:27 p.m.
On 23 Nov 2010, at 23:45, Jakub Jelinek wrote:

> On Sat, Nov 20, 2010 at 12:19:26PM +0000, IainS wrote:
>> 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?
>
> Okay.
>>
>> 	* testsuite/libgomp.fortran/fortran.exp: Add paths for libquadmath.

ci 167127
cheers
Iain

Patch

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}/"