diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2022-04-06 11:31:45 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2022-05-11 14:24:55 +0200 |
commit | d6adba307508c75f1ccb2121eb1a43c9ab1d4056 (patch) | |
tree | 8c40961cd8a27ab0afeac6bd150d542b5603fd54 /libgomp | |
parent | libgomp testsuite: Don't amend 'LD_LIBRARY_PATH' for system-provided HSA Runt... (diff) | |
download | gcc-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-x | libgomp/configure | 10 | ||||
-rw-r--r-- | libgomp/plugin/configfrag.ac | 10 |
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= | |||
15244 | HSA_RUNTIME_LIB= | 15244 | HSA_RUNTIME_LIB= |
15245 | 15245 | ||
15246 | 15246 | ||
15247 | HSA_RUNTIME_CPPFLAGS= | ||
15248 | HSA_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 | |||
15275 | if test "x$with_hsa_runtime_lib" != x; then | 15273 | if test "x$with_hsa_runtime_lib" != x; then |
15276 | HSA_RUNTIME_LIB=$with_hsa_runtime_lib | 15274 | HSA_RUNTIME_LIB=$with_hsa_runtime_lib |
15277 | fi | 15275 | fi |
15278 | if test "x$HSA_RUNTIME_INCLUDE" != x; then | ||
15279 | HSA_RUNTIME_CPPFLAGS=-I$HSA_RUNTIME_INCLUDE | ||
15280 | fi | ||
15281 | if test "x$HSA_RUNTIME_LIB" != x; then | ||
15282 | HSA_RUNTIME_LDFLAGS=-L$HSA_RUNTIME_LIB | ||
15283 | fi | ||
15284 | 15276 | ||
15285 | PLUGIN_GCN=0 | 15277 | PLUGIN_GCN=0 |
15286 | PLUGIN_GCN_CPPFLAGS= | 15278 | PLUGIN_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= | |||
97 | HSA_RUNTIME_LIB= | 97 | HSA_RUNTIME_LIB= |
98 | AC_SUBST(HSA_RUNTIME_INCLUDE) | 98 | AC_SUBST(HSA_RUNTIME_INCLUDE) |
99 | AC_SUBST(HSA_RUNTIME_LIB) | 99 | AC_SUBST(HSA_RUNTIME_LIB) |
100 | HSA_RUNTIME_CPPFLAGS= | ||
101 | HSA_RUNTIME_LDFLAGS= | ||
102 | 100 | ||
103 | AC_ARG_WITH(hsa-runtime, | 101 | AC_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 | |||
121 | if test "x$with_hsa_runtime_lib" != x; then | 119 | if test "x$with_hsa_runtime_lib" != x; then |
122 | HSA_RUNTIME_LIB=$with_hsa_runtime_lib | 120 | HSA_RUNTIME_LIB=$with_hsa_runtime_lib |
123 | fi | 121 | fi |
124 | if test "x$HSA_RUNTIME_INCLUDE" != x; then | ||
125 | HSA_RUNTIME_CPPFLAGS=-I$HSA_RUNTIME_INCLUDE | ||
126 | fi | ||
127 | if test "x$HSA_RUNTIME_LIB" != x; then | ||
128 | HSA_RUNTIME_LDFLAGS=-L$HSA_RUNTIME_LIB | ||
129 | fi | ||
130 | 122 | ||
131 | PLUGIN_GCN=0 | 123 | PLUGIN_GCN=0 |
132 | PLUGIN_GCN_CPPFLAGS= | 124 | PLUGIN_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 | ;; |