re PR testsuite/91884 (libgomp testsuite: (not) using a specific driver for C++,...

2019-10-09  Tobias Burnus  <tobias@codesourcery.com>

        PR testsuite/91884
        * testsuite/libgomp.fortran/fortran.exp: Conditionally
        add -lquadmath.
        * testsuite/libgomp.oacc-fortran/fortran.exp: Ditto.

From-SVN: r276754

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index dcd57cfd57098bf5668e30d14e9c7f853ca8a279..1b43c456741e26396fe51a9bfb1ca9b681f82798 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-09  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR testsuite/91884
+       * testsuite/libgomp.fortran/fortran.exp: Conditionally
+       add -lquadmath.
+       * testsuite/libgomp.oacc-fortran/fortran.exp: Ditto.
+
 2019-10-09  Jakub Jelinek  <jakub@redhat.com>
 
        PR libgomp/92028

diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp
index d848ed4d47feb5b531c57282b033d4e774374046..eb701311b6a05b1ce943d4087adeee5918a7ffe6 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/fortran.exp
+++ b/libgomp/testsuite/libgomp.fortran/fortran.exp
@@ -54,11 +54,17 @@ if { $lang_test_file_found } {
            # 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}"
+           append lang_link_flags " -lquadmath"
        } else {
            set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}"
        }
     } else {
         set ld_library_path "$always_ld_library_path"
+        if { [check_no_compiler_messages has_libquadmath executable {
+                 int main() {return 0;}
+              } "-lgfortran -lquadmath"] } then {
+            append lang_link_flags " -lquadmath"
+        }
     }
     append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]
     set_ld_library_path_env_vars

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp b/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp
index af25a22a522b424c3ff700f0fd8c1e41dedfdf4d..852f372b319606e452f3879512fba57697c9f97e 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp
+++ b/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp
@@ -56,11 +56,17 @@ if { $lang_test_file_found } {
            # 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}"
+           append lang_link_flags " -lquadmath"
        } else {
            set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}"
        }
     } else {
         set ld_library_path "$always_ld_library_path"
+        if { [check_no_compiler_messages has_libquadmath executable {
+                 int main() {return 0;}
+              } "-lgfortran -lquadmath"] } then {
+            append lang_link_flags " -lquadmath"
+        }
     }
     append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]
     set_ld_library_path_env_vars