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 | |
| parent | 2e309a4eff80e55b53d32d26926a2a94eabfea21 (diff) | |
| download | gcc-d6adba307508c75f1ccb2121eb1a43c9ab1d4056.zip gcc-d6adba307508c75f1ccb2121eb1a43c9ab1d4056.tar.gz gcc-d6adba307508c75f1ccb2121eb1a43c9ab1d4056.tar.bz2 | |
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.
| -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 5ef071e..cf1d1fb 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -15244,8 +15244,6 @@ HSA_RUNTIME_INCLUDE= HSA_RUNTIME_LIB= -HSA_RUNTIME_CPPFLAGS= -HSA_RUNTIME_LDFLAGS= # Check whether --with-hsa-runtime was given. @@ -15275,12 +15273,6 @@ fi if test "x$with_hsa_runtime_lib" != x; then HSA_RUNTIME_LIB=$with_hsa_runtime_lib fi -if test "x$HSA_RUNTIME_INCLUDE" != x; then - HSA_RUNTIME_CPPFLAGS=-I$HSA_RUNTIME_INCLUDE -fi -if test "x$HSA_RUNTIME_LIB" != x; then - HSA_RUNTIME_LDFLAGS=-L$HSA_RUNTIME_LIB -fi PLUGIN_GCN=0 PLUGIN_GCN_CPPFLAGS= @@ -15389,8 +15381,6 @@ rm -f core conftest.err conftest.$ac_objext \ *) tgt_plugin=gcn PLUGIN_GCN=$tgt - PLUGIN_GCN_CPPFLAGS=$HSA_RUNTIME_CPPFLAGS - PLUGIN_GCN_LDFLAGS="$HSA_RUNTIME_LDFLAGS" PLUGIN_GCN_LIBS="-ldl" PLUGIN_GCN=1 ;; diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac index 09f87f4..52c3da0 100644 --- a/libgomp/plugin/configfrag.ac +++ b/libgomp/plugin/configfrag.ac @@ -97,8 +97,6 @@ HSA_RUNTIME_INCLUDE= HSA_RUNTIME_LIB= AC_SUBST(HSA_RUNTIME_INCLUDE) AC_SUBST(HSA_RUNTIME_LIB) -HSA_RUNTIME_CPPFLAGS= -HSA_RUNTIME_LDFLAGS= AC_ARG_WITH(hsa-runtime, [AS_HELP_STRING([--with-hsa-runtime=PATH], @@ -121,12 +119,6 @@ fi if test "x$with_hsa_runtime_lib" != x; then HSA_RUNTIME_LIB=$with_hsa_runtime_lib fi -if test "x$HSA_RUNTIME_INCLUDE" != x; then - HSA_RUNTIME_CPPFLAGS=-I$HSA_RUNTIME_INCLUDE -fi -if test "x$HSA_RUNTIME_LIB" != x; then - HSA_RUNTIME_LDFLAGS=-L$HSA_RUNTIME_LIB -fi PLUGIN_GCN=0 PLUGIN_GCN_CPPFLAGS= @@ -224,8 +216,6 @@ if test x"$enable_offload_targets" != x; then *) tgt_plugin=gcn PLUGIN_GCN=$tgt - PLUGIN_GCN_CPPFLAGS=$HSA_RUNTIME_CPPFLAGS - PLUGIN_GCN_LDFLAGS="$HSA_RUNTIME_LDFLAGS" PLUGIN_GCN_LIBS="-ldl" PLUGIN_GCN=1 ;; |