libgomp GCN plugin: Clean up always-empty 'PLUGIN_GCN_CPPFLAGS', 'PLUGIN_GCN_LDFLAGS'

After recent commit d6adba307508c75f1ccb2121eb1a43c9ab1d4056
"libgomp GCN plugin: Clean up unused references to system-provided HSA Runtime
library", these aren't set anymore.

	libgomp/
	* plugin/Makefrag.am (libgomp_plugin_gcn_la_CPPFLAGS): Don't
	consider 'PLUGIN_GCN_CPPFLAGS'.
	(libgomp_plugin_gcn_la_LDFLAGS): Don't consider
	'PLUGIN_GCN_LDFLAGS'.
	* plugin/configfrag.ac (PLUGIN_GCN_CPPFLAGS, PLUGIN_GCN_LDFLAGS):
	Remove.
	* Makefile.in: Regenerate.
	* configure: Likewise.
	* testsuite/Makefile.in: Likewise.

(cherry picked from commit 91a6dcd14915181b4bce51cd44b56a3e9f9d35d8)

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 85a6cd8ec27ceb4111debefdf378241c4712af5d..6082a762cee320955cf656eff6f12e33a92ab7c2 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,18 @@
+2022-04-06  Thomas Schwinge  <thomas@codesourcery.com>
+
+       Backport from mainline:
+       2022-04-06  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * plugin/Makefrag.am (libgomp_plugin_gcn_la_CPPFLAGS): Don't
+       consider 'PLUGIN_GCN_CPPFLAGS'.
+       (libgomp_plugin_gcn_la_LDFLAGS): Don't consider
+       'PLUGIN_GCN_LDFLAGS'.
+       * plugin/configfrag.ac (PLUGIN_GCN_CPPFLAGS, PLUGIN_GCN_LDFLAGS):
+       Remove.
+       * Makefile.in: Regenerate.
+       * configure: Likewise.
+       * testsuite/Makefile.in: Likewise.
+
 2022-04-06  Thomas Schwinge  <thomas@codesourcery.com>
 
        Backport from mainline:

diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index 0bc746e67e9b01b9d2e0598b51fd56f648f1d792..9f65163f3c8a356b8f067b78bfe3adf88e8490ff 100644 (file)
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@ -435,8 +435,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PLUGIN_GCN = @PLUGIN_GCN@
-PLUGIN_GCN_CPPFLAGS = @PLUGIN_GCN_CPPFLAGS@
-PLUGIN_GCN_LDFLAGS = @PLUGIN_GCN_LDFLAGS@
 PLUGIN_GCN_LIBS = @PLUGIN_GCN_LIBS@
 PLUGIN_NVPTX = @PLUGIN_NVPTX@
 PLUGIN_NVPTX_CPPFLAGS = @PLUGIN_NVPTX_CPPFLAGS@
@@ -577,12 +575,12 @@ libgomp_la_SOURCES = alloc.c atomic.c barrier.c critical.c env.c \
 # AMD GCN plugin
 @PLUGIN_GCN_TRUE@libgomp_plugin_gcn_version_info = -version-info $(libtool_VERSION)
 @PLUGIN_GCN_TRUE@libgomp_plugin_gcn_la_SOURCES = plugin/plugin-gcn.c
-@PLUGIN_GCN_TRUE@libgomp_plugin_gcn_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_GCN_CPPFLAGS) \
+@PLUGIN_GCN_TRUE@libgomp_plugin_gcn_la_CPPFLAGS = $(AM_CPPFLAGS) \
 @PLUGIN_GCN_TRUE@      -D_GNU_SOURCE
 
-@PLUGIN_GCN_TRUE@libgomp_plugin_gcn_la_LDFLAGS =  \
-@PLUGIN_GCN_TRUE@      $(libgomp_plugin_gcn_version_info) \
-@PLUGIN_GCN_TRUE@      $(lt_host_flags) $(PLUGIN_GCN_LDFLAGS)
+@PLUGIN_GCN_TRUE@libgomp_plugin_gcn_la_LDFLAGS = $(libgomp_plugin_gcn_version_info) \
+@PLUGIN_GCN_TRUE@      $(lt_host_flags)
+
 @PLUGIN_GCN_TRUE@libgomp_plugin_gcn_la_LIBADD = libgomp.la $(PLUGIN_GCN_LIBS)
 @PLUGIN_GCN_TRUE@libgomp_plugin_gcn_la_LIBTOOLFLAGS = --tag=disable-static
 nodist_noinst_HEADERS = libgomp_f.h

diff --git a/libgomp/configure b/libgomp/configure
index cf1d1fbe195d7bcd4e9e2b680b4203baad9493bf..e735e4c5f2a38da056a6d8f1cd4399ef4f63a20b 100755 (executable)
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -674,8 +674,6 @@ offload_additional_options
 offload_targets
 offload_plugins
 PLUGIN_GCN_LIBS
-PLUGIN_GCN_LDFLAGS
-PLUGIN_GCN_CPPFLAGS
 PLUGIN_GCN
 HSA_RUNTIME_LIB
 HSA_RUNTIME_INCLUDE
@@ -11431,7 +11429,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11434 "configure"
+#line 11432 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11537,7 +11535,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11540 "configure"
+#line 11538 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15275,14 +15273,10 @@ if test "x$with_hsa_runtime_lib" != x; then
 fi
 
 PLUGIN_GCN=0
-PLUGIN_GCN_CPPFLAGS=
-PLUGIN_GCN_LDFLAGS=
 PLUGIN_GCN_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.

diff --git a/libgomp/plugin/Makefrag.am b/libgomp/plugin/Makefrag.am
index 3fe50b61cfdb74759c4904cab1a027455c68547e..11929d4ff293137e3ef887ee6b877b80ffd5d70b 100644 (file)
--- a/libgomp/plugin/Makefrag.am
+++ b/libgomp/plugin/Makefrag.am
@@ -44,11 +44,10 @@ if PLUGIN_GCN
 libgomp_plugin_gcn_version_info = -version-info $(libtool_VERSION)
 toolexeclib_LTLIBRARIES += libgomp-plugin-gcn.la
 libgomp_plugin_gcn_la_SOURCES = plugin/plugin-gcn.c
-libgomp_plugin_gcn_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_GCN_CPPFLAGS) \
+libgomp_plugin_gcn_la_CPPFLAGS = $(AM_CPPFLAGS) \
        -D_GNU_SOURCE
 libgomp_plugin_gcn_la_LDFLAGS = $(libgomp_plugin_gcn_version_info) \
        $(lt_host_flags)
-libgomp_plugin_gcn_la_LDFLAGS += $(PLUGIN_GCN_LDFLAGS)
 libgomp_plugin_gcn_la_LIBADD = libgomp.la $(PLUGIN_GCN_LIBS)
 libgomp_plugin_gcn_la_LIBTOOLFLAGS = --tag=disable-static
 endif

diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac
index 52c3da09b43d48b422d26ec28eff80ae934ebdb5..94d357f9a26acb6eee995e278e1b8993df3d9d05 100644 (file)
--- a/libgomp/plugin/configfrag.ac
+++ b/libgomp/plugin/configfrag.ac
@@ -121,12 +121,8 @@ if test "x$with_hsa_runtime_lib" != x; then
 fi
 
 PLUGIN_GCN=0
-PLUGIN_GCN_CPPFLAGS=
-PLUGIN_GCN_LDFLAGS=
 PLUGIN_GCN_LIBS=
 AC_SUBST(PLUGIN_GCN)
-AC_SUBST(PLUGIN_GCN_CPPFLAGS)
-AC_SUBST(PLUGIN_GCN_LDFLAGS)
 AC_SUBST(PLUGIN_GCN_LIBS)
 
 # Parse '--enable-offload-targets', figure out the corresponding libgomp

diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in
index 5eed05f5dde6845fcb793405975fe75432fba022..f5a5438769ffd3ff6b30eeb5039a4a8cc01ee562 100644 (file)
--- a/libgomp/testsuite/Makefile.in
+++ b/libgomp/testsuite/Makefile.in
@@ -212,8 +212,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PLUGIN_GCN = @PLUGIN_GCN@
-PLUGIN_GCN_CPPFLAGS = @PLUGIN_GCN_CPPFLAGS@
-PLUGIN_GCN_LDFLAGS = @PLUGIN_GCN_LDFLAGS@
 PLUGIN_GCN_LIBS = @PLUGIN_GCN_LIBS@
 PLUGIN_NVPTX = @PLUGIN_NVPTX@
 PLUGIN_NVPTX_CPPFLAGS = @PLUGIN_NVPTX_CPPFLAGS@