From 2fb8c8c77882df225d9d42e52915e3eb04606d46 Mon Sep 17 00:00:00 2001 From: Andrew Jenner Date: Wed, 30 Jan 2019 09:38:46 -0800 Subject: [PATCH] Link libquadmath in Fortran libgomp tests When invoking gcc to compile fortran code, fortran.exp is currently adding the options -lgfortran -foffload=-lgfortran to the gcc command line. libgfortran statically links to libquadmath and the gfortran driver invokes the linker with -lquadmath as well as -lgfortran so fortran.exp should do so too. libgomp/ * testsuite/libgomp.fortan/fortran.exp (lang_link_flags): Add -lquadmath. * testsuite/libgomp.oacc-fortran/fortran.exp (lang_link_flags): Add -lquadmath. (cherry picked from openacc-gcc-9-branch commit bb65425bb284f3efc08bff4d94661123cdc27b41) --- libgomp/ChangeLog.omp | 7 +++++++ libgomp/testsuite/libgomp.fortran/fortran.exp | 2 +- libgomp/testsuite/libgomp.oacc-fortran/fortran.exp | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 88d432b97755..8f9cd6116c7e 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,10 @@ +2019-01-30 Andrew Jenner + + * testsuite/libgomp.fortan/fortran.exp (lang_link_flags): Add + -lquadmath. + * testsuite/libgomp.oacc-fortran/fortran.exp (lang_link_flags): Add + -lquadmath. + 2019-05-30 Kwok Cheung Yeung * libgomp_g.h: Include stdint.h instead of gstdint.h. diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp index d848ed4d47fe..f6b6c590df58 100644 --- a/libgomp/testsuite/libgomp.fortran/fortran.exp +++ b/libgomp/testsuite/libgomp.fortran/fortran.exp @@ -7,7 +7,7 @@ global ALWAYS_CFLAGS set shlib_ext [get_shlib_extension] set lang_library_path "../libgfortran/.libs" -set lang_link_flags "-lgfortran -foffload=-lgfortran" +set lang_link_flags "-lgfortran -foffload=-lgfortran -lquadmath" if [info exists lang_include_flags] then { unset lang_include_flags } diff --git a/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp b/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp index fb54e486c87b..56694a6eef55 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp +++ b/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp @@ -9,7 +9,7 @@ global ALWAYS_CFLAGS set shlib_ext [get_shlib_extension] set lang_library_path "../libgfortran/.libs" -set lang_link_flags "-lgfortran -foffload=-lgfortran" +set lang_link_flags "-lgfortran -foffload=-lgfortran -lquadmath" if [info exists lang_include_flags] then { unset lang_include_flags } -- 2.47.2