diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2023-05-10 15:01:55 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2023-05-15 12:11:18 +0200 |
commit | 982c869ec00c72176ddede9c0e3068c76dc871d2 (patch) | |
tree | 81db1e6219e4125f5b1adefe72d98d6473b6ef1c /libgomp/testsuite/libgomp.fortran | |
parent | 30e42bb66d39f542cb76e40ad367a7ae7f376dc7 (diff) | |
download | gcc-982c869ec00c72176ddede9c0e3068c76dc871d2.zip gcc-982c869ec00c72176ddede9c0e3068c76dc871d2.tar.gz gcc-982c869ec00c72176ddede9c0e3068c76dc871d2.tar.bz2 |
libgomp testsuite: As appropriate, use the 'gcc', 'g++', 'gfortran' driver [PR91884]
..., that is, 'GCC_UNDER_TEST', 'GXX_UNDER_TEST', 'GFORTRAN_UNDER_TEST' instead
of 'GCC_UNDER_TEST' for all of them. No need anymore for 'gcc -lstdc++ -x c++'
for C++ code, or 'gcc -lgfortran' plus conditional '-lquadmath' for Fortran
code. (Getting rid of explicit '-foffload=-lgfortran' is for another day.)
PR testsuite/91884
libgomp/
* configure.ac: 'AC_SUBST(CXX)'.
* configure: Regenerate.
* Makefile.in: Likewise.
* testsuite/Makefile.in: Likewise.
* testsuite/libgomp-site-extra.exp.in (GXX_UNDER_TEST)
(GFORTRAN_UNDER_TEST): Set.
* testsuite/lib/libgomp.exp (libgomp_init): Adjust.
* testsuite/libgomp.c++/c++.exp: Use 'GXX_UNDER_TEST'.
* testsuite/libgomp.oacc-c++/c++.exp: Likewise.
* testsuite/libgomp.fortran/fortran.exp: Use
'GFORTRAN_UNDER_TEST'.
* testsuite/libgomp.oacc-fortran/fortran.exp: Likewise.
Diffstat (limited to 'libgomp/testsuite/libgomp.fortran')
-rw-r--r-- | libgomp/testsuite/libgomp.fortran/fortran.exp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp index 9aeebd3..e69656b 100644 --- a/libgomp/testsuite/libgomp.fortran/fortran.exp +++ b/libgomp/testsuite/libgomp.fortran/fortran.exp @@ -28,8 +28,8 @@ if { $blddir != "" } { set lang_source_re {^.*\.[fF](|90|95|03|08)$} set lang_include_flags "-fintrinsic-modules-path=${blddir}" } -set lang_link_flags "-lgfortran -foffload=-lgfortran" -lappend ALWAYS_CFLAGS "compiler=$GCC_UNDER_TEST" +set lang_link_flags "-foffload=-lgfortran" +lappend ALWAYS_CFLAGS "compiler=$GFORTRAN_UNDER_TEST" # Initialize dg. dg-init @@ -46,13 +46,6 @@ if { $blddir != "" } { if { $libquadmath_library_path != "" } { append ld_library_path ":${blddir}/${libquadmath_library_path}" - append lang_link_flags " -lquadmath" - } -} else { - 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] |