From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1729) id 8858A384D185; Wed, 29 Jun 2022 14:47:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8858A384D185 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Kwok Yeung To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] libgomp GCN plugin: Clean up always-empty 'PLUGIN_GCN_CPPFLAGS', 'PLUGIN_GCN_LDFLAGS' X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: 125d17558bf3b6b4ce0d53b7cc30ac0adfd2e904 X-Git-Newrev: a309e5a14574a74e1641706dc58573792a1d2096 Message-Id: <20220629144752.8858A384D185@sourceware.org> Date: Wed, 29 Jun 2022 14:47:52 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2022 14:47:52 -0000 https://gcc.gnu.org/g:a309e5a14574a74e1641706dc58573792a1d2096 commit a309e5a14574a74e1641706dc58573792a1d2096 Author: Thomas Schwinge Date: Wed Apr 6 12:15:28 2022 +0200 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: --- libgomp/ChangeLog.omp | 15 +++++++++++++++ libgomp/Makefile.in | 10 ++++------ libgomp/configure | 10 ++-------- libgomp/plugin/Makefrag.am | 3 +-- libgomp/plugin/configfrag.ac | 4 ---- libgomp/testsuite/Makefile.in | 2 -- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 85a6cd8ec27..6082a762cee 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,18 @@ +2022-04-06 Thomas Schwinge + + Backport from mainline: + 2022-04-06 Thomas Schwinge + + * 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 Backport from mainline: diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index 0bc746e67e9..9f65163f3c8 100644 --- 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 cf1d1fbe195..e735e4c5f2a 100755 --- 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 3fe50b61cfd..11929d4ff29 100644 --- 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 52c3da09b43..94d357f9a26 100644 --- 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 5eed05f5dde..f5a5438769f 100644 --- 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@