aboutsummaryrefslogtreecommitdiff
path: root/libgomp/configure
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2019-02-22 11:51:20 +0100
committerThomas Schwinge <tschwinge@gcc.gnu.org>2019-02-22 11:51:20 +0100
commit0a0384b43ad3f5abb1382bbd2ad2ade5fea7ff77 (patch)
treeb6b0847e784e9606c84e27b44db790b4e3bf86fc /libgomp/configure
parentee332b4a9a19552d160a23155f59b11692d8f07e (diff)
downloadgcc-0a0384b43ad3f5abb1382bbd2ad2ade5fea7ff77.zip
gcc-0a0384b43ad3f5abb1382bbd2ad2ade5fea7ff77.tar.gz
gcc-0a0384b43ad3f5abb1382bbd2ad2ade5fea7ff77.tar.bz2
[libgomp] In OpenACC testing, cycle though all offload targets
... instead of through offload plugins. libgomp/ * plugin/configfrag.ac: Populate and AC_SUBST offload_targets. * testsuite/libgomp-test-support.exp.in: Adjust. * testsuite/lib/libgomp.exp: Likewise. Don't populate openacc_device_types_s. (offload_target_to_openacc_device_type): New proc. * testsuite/libgomp.oacc-c++/c++.exp: Adjust. * testsuite/libgomp.oacc-c/c.exp: Likewise. * testsuite/libgomp.oacc-fortran/fortran.exp: Likewise. * Makefile.in: Regenerate. * configure: Likewise. * testsuite/Makefile.in: Likewise. From-SVN: r269108
Diffstat (limited to 'libgomp/configure')
-rwxr-xr-xlibgomp/configure10
1 files changed, 8 insertions, 2 deletions
diff --git a/libgomp/configure b/libgomp/configure
index 1033ae4..b4bc4f4 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -667,6 +667,7 @@ PLUGIN_NVPTX_FALSE
PLUGIN_NVPTX_TRUE
offload_additional_lib_paths
offload_additional_options
+offload_targets
offload_plugins
PLUGIN_HSA_LIBS
PLUGIN_HSA_LDFLAGS
@@ -11392,7 +11393,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11395 "configure"
+#line 11396 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11498,7 +11499,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11501 "configure"
+#line 11502 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15621,7 +15622,10 @@ PLUGIN_HSA_LIBS=
# Parse '--enable-offload-targets', figure out the corresponding libgomp
# plugins, and configure to find the corresponding offload compilers.
+# 'offload_plugins' and 'offload_targets' will be populated in the same order.
offload_plugins=
+offload_targets=
+
offload_additional_options=
offload_additional_lib_paths=
@@ -15737,8 +15741,10 @@ rm -f core conftest.err conftest.$ac_objext \
continue
elif test x"$offload_plugins" = x; then
offload_plugins=$tgt_plugin
+ offload_targets=$tgt
else
offload_plugins=$offload_plugins,$tgt_plugin
+ offload_targets=$offload_targets,$tgt
fi
# Configure additional search paths.
if test "$tgt_plugin" = hsa; then