From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1729) id 0552C384D18C; Wed, 29 Jun 2022 14:48:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0552C384D18C 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 nvptx plugin: Only consider '--with-cuda-driver=[...]' when applicable X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: 6468241ffe19f698a8d456c8cd6f908b0cbde0ef X-Git-Newrev: e99ae0c02546e395f7dff7cdeb97cebea8296a0c Message-Id: <20220629144823.0552C384D18C@sourceware.org> Date: Wed, 29 Jun 2022 14:48:23 +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:48:23 -0000 https://gcc.gnu.org/g:e99ae0c02546e395f7dff7cdeb97cebea8296a0c commit e99ae0c02546e395f7dff7cdeb97cebea8296a0c Author: Thomas Schwinge Date: Thu May 12 17:51:43 2022 +0200 libgomp nvptx plugin: Only consider '--with-cuda-driver=[...]' when applicable They're not applicable in 'PLUGIN_NVPTX_DYNAMIC' configurations. libgomp/ * plugin/Makefrag.am (libgomp_plugin_nvptx_la_CPPFLAGS) [PLUGIN_NVPTX_DYNAMIC]: Don't append '$(PLUGIN_NVPTX_CPPFLAGS)'. (libgomp_plugin_nvptx_la_LDFLAGS) [PLUGIN_NVPTX_DYNAMIC]: Don't append '$(PLUGIN_NVPTX_LDFLAGS)'. * Makefile.in: Regenerate. (cherry picked from commit 1f89e48789d230c78ec60ff3dc9e7e2478cc3df9) Diff: --- libgomp/ChangeLog.omp | 11 +++++++++++ libgomp/Makefile.in | 18 ++++++++++-------- libgomp/plugin/Makefrag.am | 5 +++-- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index e17c2cb7fe9..5e7bd4a796a 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,14 @@ +2022-05-12 Thomas Schwinge + + Backport from mainline: + 2022-05-12 Thomas Schwinge + + * plugin/Makefrag.am (libgomp_plugin_nvptx_la_CPPFLAGS) + [PLUGIN_NVPTX_DYNAMIC]: Don't append '$(PLUGIN_NVPTX_CPPFLAGS)'. + (libgomp_plugin_nvptx_la_LDFLAGS) [PLUGIN_NVPTX_DYNAMIC]: Don't + append '$(PLUGIN_NVPTX_LDFLAGS)'. + * Makefile.in: Regenerate. + 2022-05-05 Thomas Schwinge Backport from mainline: diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index 5546d1e50cc..ba65164e1c4 100644 --- a/libgomp/Makefile.in +++ b/libgomp/Makefile.in @@ -122,13 +122,15 @@ target_triplet = @target@ # Including the GCC-shipped 'include/cuda/cuda.h' vs. system . @PLUGIN_NVPTX_DYNAMIC_FALSE@@PLUGIN_NVPTX_TRUE@am__append_2 = -DPLUGIN_NVPTX_INCLUDE_SYSTEM_CUDA_H \ +@PLUGIN_NVPTX_DYNAMIC_FALSE@@PLUGIN_NVPTX_TRUE@ $(PLUGIN_NVPTX_CPPFLAGS) \ @PLUGIN_NVPTX_DYNAMIC_FALSE@@PLUGIN_NVPTX_TRUE@ -DPLUGIN_NVPTX_LINK_LIBCUDA # 'dlopen'ing the CUDA Driver library vs. linking it. @PLUGIN_NVPTX_DYNAMIC_TRUE@@PLUGIN_NVPTX_TRUE@am__append_3 = $(DL_LIBS) -@PLUGIN_NVPTX_DYNAMIC_FALSE@@PLUGIN_NVPTX_TRUE@am__append_4 = $(PLUGIN_NVPTX_LIBS) -@PLUGIN_GCN_TRUE@am__append_5 = libgomp-plugin-gcn.la -@USE_FORTRAN_TRUE@am__append_6 = openacc.f90 +@PLUGIN_NVPTX_DYNAMIC_FALSE@@PLUGIN_NVPTX_TRUE@am__append_4 = $(PLUGIN_NVPTX_LDFLAGS) +@PLUGIN_NVPTX_DYNAMIC_FALSE@@PLUGIN_NVPTX_TRUE@am__append_5 = $(PLUGIN_NVPTX_LIBS) +@PLUGIN_GCN_TRUE@am__append_6 = libgomp-plugin-gcn.la +@USE_FORTRAN_TRUE@am__append_7 = openacc.f90 subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ @@ -538,7 +540,7 @@ libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include AM_CPPFLAGS = $(addprefix -I, $(search_path)) AM_CFLAGS = $(XCFLAGS) AM_LDFLAGS = $(XLDFLAGS) $(SECTION_LDFLAGS) $(OPT_LDFLAGS) -toolexeclib_LTLIBRARIES = libgomp.la $(am__append_1) $(am__append_5) +toolexeclib_LTLIBRARIES = libgomp.la $(am__append_1) $(am__append_6) nodist_toolexeclib_HEADERS = libgomp.spec # -Wc is only a libtool option. @@ -566,18 +568,18 @@ libgomp_la_SOURCES = alloc.c atomic.c barrier.c critical.c env.c \ oacc-mem.c oacc-async.c oacc-plugin.c oacc-cuda.c \ priority_queue.c affinity-fmt.c teams.c allocator.c \ oacc-profiling.c oacc-target.c \ - oacc-profiling-acc_register_library.c $(am__append_6) + oacc-profiling-acc_register_library.c $(am__append_7) # Nvidia PTX OpenACC plugin. @PLUGIN_NVPTX_TRUE@libgomp_plugin_nvptx_version_info = -version-info $(libtool_VERSION) @PLUGIN_NVPTX_TRUE@libgomp_plugin_nvptx_la_SOURCES = plugin/plugin-nvptx.c @PLUGIN_NVPTX_TRUE@libgomp_plugin_nvptx_la_CPPFLAGS = $(AM_CPPFLAGS) \ -@PLUGIN_NVPTX_TRUE@ $(PLUGIN_NVPTX_CPPFLAGS) $(am__append_2) +@PLUGIN_NVPTX_TRUE@ $(am__append_2) @PLUGIN_NVPTX_TRUE@libgomp_plugin_nvptx_la_LDFLAGS = \ @PLUGIN_NVPTX_TRUE@ $(libgomp_plugin_nvptx_version_info) \ -@PLUGIN_NVPTX_TRUE@ $(lt_host_flags) $(PLUGIN_NVPTX_LDFLAGS) +@PLUGIN_NVPTX_TRUE@ $(lt_host_flags) $(am__append_4) @PLUGIN_NVPTX_TRUE@libgomp_plugin_nvptx_la_LIBADD = libgomp.la \ -@PLUGIN_NVPTX_TRUE@ $(am__append_3) $(am__append_4) +@PLUGIN_NVPTX_TRUE@ $(am__append_3) $(am__append_5) @PLUGIN_NVPTX_TRUE@libgomp_plugin_nvptx_la_LIBTOOLFLAGS = --tag=disable-static # AMD GCN plugin diff --git a/libgomp/plugin/Makefrag.am b/libgomp/plugin/Makefrag.am index 3e453ff6fee..66c8c12c1a6 100644 --- a/libgomp/plugin/Makefrag.am +++ b/libgomp/plugin/Makefrag.am @@ -33,10 +33,9 @@ if PLUGIN_NVPTX libgomp_plugin_nvptx_version_info = -version-info $(libtool_VERSION) toolexeclib_LTLIBRARIES += libgomp-plugin-nvptx.la libgomp_plugin_nvptx_la_SOURCES = plugin/plugin-nvptx.c -libgomp_plugin_nvptx_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_NVPTX_CPPFLAGS) +libgomp_plugin_nvptx_la_CPPFLAGS = $(AM_CPPFLAGS) libgomp_plugin_nvptx_la_LDFLAGS = $(libgomp_plugin_nvptx_version_info) \ $(lt_host_flags) -libgomp_plugin_nvptx_la_LDFLAGS += $(PLUGIN_NVPTX_LDFLAGS) libgomp_plugin_nvptx_la_LIBADD = libgomp.la libgomp_plugin_nvptx_la_LIBTOOLFLAGS = --tag=disable-static @@ -44,6 +43,7 @@ libgomp_plugin_nvptx_la_LIBTOOLFLAGS = --tag=disable-static if PLUGIN_NVPTX_DYNAMIC else libgomp_plugin_nvptx_la_CPPFLAGS += -DPLUGIN_NVPTX_INCLUDE_SYSTEM_CUDA_H +libgomp_plugin_nvptx_la_CPPFLAGS += $(PLUGIN_NVPTX_CPPFLAGS) endif # 'dlopen'ing the CUDA Driver library vs. linking it. @@ -51,6 +51,7 @@ if PLUGIN_NVPTX_DYNAMIC libgomp_plugin_nvptx_la_LIBADD += $(DL_LIBS) else libgomp_plugin_nvptx_la_CPPFLAGS += -DPLUGIN_NVPTX_LINK_LIBCUDA +libgomp_plugin_nvptx_la_LDFLAGS += $(PLUGIN_NVPTX_LDFLAGS) libgomp_plugin_nvptx_la_LIBADD += $(PLUGIN_NVPTX_LIBS) endif endif