summaryrefslogtreecommitdiffstats
path: root/libgomp
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2022-04-06 11:31:45 +0200
committerThomas Schwinge <thomas@codesourcery.com>2022-05-11 14:24:55 +0200
commitd6adba307508c75f1ccb2121eb1a43c9ab1d4056 (patch)
tree8c40961cd8a27ab0afeac6bd150d542b5603fd54 /libgomp
parentlibgomp testsuite: Don't amend 'LD_LIBRARY_PATH' for system-provided HSA Runt... (diff)
downloadgcc-d6adba307508c75f1ccb2121eb1a43c9ab1d4056.tar.gz
gcc-d6adba307508c75f1ccb2121eb1a43c9ab1d4056.tar.bz2
gcc-d6adba307508c75f1ccb2121eb1a43c9ab1d4056.tar.xz
libgomp GCN plugin: Clean up unused references to system-provided HSA Runtime library
This is only active if GCC is 'configure'd with '--with-hsa-runtime=[...]' or '--with-hsa-runtime-include=[...]', '--with-hsa-runtime-lib=[...]' -- which nobody really is doing, as far as I can tell. Originally changed for the libgomp HSA plugin in commit b8d89b03db5f212919e4571671ebb4f5f8b1e19d (r242749) "Remove build dependence on HSA run-time", and later propagated into the GCN plugin, these are no longer built against system-provided HSA Runtime library. Instead, unconditionally built against the GCC-shipped 'include/hsa*.h' header files, and at run time does 'dlopen("libhsa-runtime64.so.1")'. It thus doesn't make sense to consider references to system-provided HSA Runtime library during libgomp GCN plugin build. libgomp/ * plugin/configfrag.ac (HSA_RUNTIME_CPPFLAGS) (HSA_RUNTIME_LDFLAGS): Remove. * configure: Regenerate.
Diffstat (limited to 'libgomp')
-rwxr-xr-xlibgomp/configure10
-rw-r--r--libgomp/plugin/configfrag.ac10
2 files changed, 0 insertions, 20 deletions
diff --git a/libgomp/configure b/libgomp/configure
index 5ef071ea046..cf1d1fbe195 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -15244,8 +15244,6 @@ HSA_RUNTIME_INCLUDE=
15244HSA_RUNTIME_LIB= 15244HSA_RUNTIME_LIB=
15245 15245
15246 15246
15247HSA_RUNTIME_CPPFLAGS=
15248HSA_RUNTIME_LDFLAGS=
15249 15247
15250 15248
15251# Check whether --with-hsa-runtime was given. 15249# Check whether --with-hsa-runtime was given.
@@ -15275,12 +15273,6 @@ fi
15275if test "x$with_hsa_runtime_lib" != x; then 15273if test "x$with_hsa_runtime_lib" != x; then
15276 HSA_RUNTIME_LIB=$with_hsa_runtime_lib 15274 HSA_RUNTIME_LIB=$with_hsa_runtime_lib
15277fi 15275fi
15278if test "x$HSA_RUNTIME_INCLUDE" != x; then
15279 HSA_RUNTIME_CPPFLAGS=-I$HSA_RUNTIME_INCLUDE
15280fi
15281if test "x$HSA_RUNTIME_LIB" != x; then
15282 HSA_RUNTIME_LDFLAGS=-L$HSA_RUNTIME_LIB
15283fi
15284 15276
15285PLUGIN_GCN=0 15277PLUGIN_GCN=0
15286PLUGIN_GCN_CPPFLAGS= 15278PLUGIN_GCN_CPPFLAGS=
@@ -15389,8 +15381,6 @@ rm -f core conftest.err conftest.$ac_objext \
15389 *) 15381 *)
15390 tgt_plugin=gcn 15382 tgt_plugin=gcn
15391 PLUGIN_GCN=$tgt 15383 PLUGIN_GCN=$tgt
15392 PLUGIN_GCN_CPPFLAGS=$HSA_RUNTIME_CPPFLAGS
15393 PLUGIN_GCN_LDFLAGS="$HSA_RUNTIME_LDFLAGS"
15394 PLUGIN_GCN_LIBS="-ldl" 15384 PLUGIN_GCN_LIBS="-ldl"
15395 PLUGIN_GCN=1 15385 PLUGIN_GCN=1
15396 ;; 15386 ;;
diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac
index 09f87f48bc7..52c3da09b43 100644
--- a/libgomp/plugin/configfrag.ac
+++ b/libgomp/plugin/configfrag.ac
@@ -97,8 +97,6 @@ HSA_RUNTIME_INCLUDE=
97HSA_RUNTIME_LIB= 97HSA_RUNTIME_LIB=
98AC_SUBST(HSA_RUNTIME_INCLUDE) 98AC_SUBST(HSA_RUNTIME_INCLUDE)
99AC_SUBST(HSA_RUNTIME_LIB) 99AC_SUBST(HSA_RUNTIME_LIB)
100HSA_RUNTIME_CPPFLAGS=
101HSA_RUNTIME_LDFLAGS=
102 100
103AC_ARG_WITH(hsa-runtime, 101AC_ARG_WITH(hsa-runtime,
104 [AS_HELP_STRING([--with-hsa-runtime=PATH], 102 [AS_HELP_STRING([--with-hsa-runtime=PATH],
@@ -121,12 +119,6 @@ fi
121if test "x$with_hsa_runtime_lib" != x; then 119if test "x$with_hsa_runtime_lib" != x; then
122 HSA_RUNTIME_LIB=$with_hsa_runtime_lib 120 HSA_RUNTIME_LIB=$with_hsa_runtime_lib
123fi 121fi
124if test "x$HSA_RUNTIME_INCLUDE" != x; then
125 HSA_RUNTIME_CPPFLAGS=-I$HSA_RUNTIME_INCLUDE
126fi
127if test "x$HSA_RUNTIME_LIB" != x; then
128 HSA_RUNTIME_LDFLAGS=-L$HSA_RUNTIME_LIB
129fi
130 122
131PLUGIN_GCN=0 123PLUGIN_GCN=0
132PLUGIN_GCN_CPPFLAGS= 124PLUGIN_GCN_CPPFLAGS=
@@ -224,8 +216,6 @@ if test x"$enable_offload_targets" != x; then
224 *) 216 *)
225 tgt_plugin=gcn 217 tgt_plugin=gcn
226 PLUGIN_GCN=$tgt 218 PLUGIN_GCN=$tgt
227 PLUGIN_GCN_CPPFLAGS=$HSA_RUNTIME_CPPFLAGS
228 PLUGIN_GCN_LDFLAGS="$HSA_RUNTIME_LDFLAGS"
229 PLUGIN_GCN_LIBS="-ldl" 219 PLUGIN_GCN_LIBS="-ldl"
230 PLUGIN_GCN=1 220 PLUGIN_GCN=1
231 ;; 221 ;;