[gcc/devel/omp/gcc-12] libgomp GCN plugin: Clean up unused references to system-provided HSA Runtime library

[gcc/devel/omp/gcc-12] libgomp GCN plugin: Clean up unused references to system-provided HSA Runtime library

[Kwok Yeung]

https://gcc.gnu.org/g:125d17558bf3b6b4ce0d53b7cc30ac0adfd2e904

commit 125d17558bf3b6b4ce0d53b7cc30ac0adfd2e904
Author: Thomas Schwinge <thomas@codesourcery.com>
Date:   Wed Apr 6 11:31:45 2022 +0200

    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.
    
    (cherry picked from commit d6adba307508c75f1ccb2121eb1a43c9ab1d4056)

Diff:
---
 libgomp/ChangeLog.omp        |  9 +++++++++
 libgomp/configure            | 10 ----------
 libgomp/plugin/configfrag.ac | 10 ----------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index fe766716ae1..85a6cd8ec27 100644
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,12 @@
+2022-04-06  Thomas Schwinge  <thomas@codesourcery.com>
+
+	Backport from mainline:
+	2022-04-06  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* plugin/configfrag.ac (HSA_RUNTIME_CPPFLAGS)
+	(HSA_RUNTIME_LDFLAGS): Remove.
+	* configure: Regenerate.
+
 2022-04-06  Thomas Schwinge  <thomas@codesourcery.com>
 
 	Backport from mainline:
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=
 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 09f87f48bc7..52c3da09b43 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
 		;;