From eba3dee8eb78ac999b408c369d6d9ef8fdac1c02 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Wed, 9 Oct 2019 08:37:44 +0000 Subject: [PATCH] re PR testsuite/91884 (libgomp testsuite: (not) using a specific driver for C++, Fortran) 2019-10-09 Tobias Burnus PR testsuite/91884 * testsuite/libgomp.fortran/fortran.exp: Conditionally add -lquadmath. * testsuite/libgomp.oacc-fortran/fortran.exp: Ditto. From-SVN: r276754 --- libgomp/ChangeLog | 7 +++++++ libgomp/testsuite/libgomp.fortran/fortran.exp | 6 ++++++ libgomp/testsuite/libgomp.oacc-fortran/fortran.exp | 6 ++++++ 3 files changed, 19 insertions(+) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index dcd57cfd570..1b43c456741 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,10 @@ +2019-10-09 Tobias Burnus + + PR testsuite/91884 + * testsuite/libgomp.fortran/fortran.exp: Conditionally + add -lquadmath. + * testsuite/libgomp.oacc-fortran/fortran.exp: Ditto. + 2019-10-09 Jakub Jelinek PR libgomp/92028 diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp index d848ed4d47f..eb701311b6a 100644 --- 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 af25a22a522..852f372b319 100644 --- 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 -- 2.30.2