From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1729) id C2FCB3850239; Wed, 29 Jun 2022 14:48:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C2FCB3850239 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 plugins: Don't 'AC_SUBST' and 'AC_DEFINE_UNQUOTED' for 'PLUGIN_GCN', 'PLUGIN_NVPTX' X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: 2e67f6f70fa495df16a15f12179be73a420f4d2b X-Git-Newrev: 828926a5259a092eca295ef66ac609228bca1614 Message-Id: <20220629144807.C2FCB3850239@sourceware.org> Date: Wed, 29 Jun 2022 14:48:07 +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:07 -0000 https://gcc.gnu.org/g:828926a5259a092eca295ef66ac609228bca1614 commit 828926a5259a092eca295ef66ac609228bca1614 Author: Thomas Schwinge Date: Thu May 5 23:10:23 2022 +0200 libgomp plugins: Don't 'AC_SUBST' and 'AC_DEFINE_UNQUOTED' for 'PLUGIN_GCN', 'PLUGIN_NVPTX' Nothing ever used these. libgomp/ * plugin/configfrag.ac: Don't 'AC_SUBST' and 'AC_DEFINE_UNQUOTED' for 'PLUGIN_GCN', 'PLUGIN_NVPTX'. * Makefile.in: Regenerate. * config.h.in: Likewise. * configure: Likewise. * testsuite/Makefile.in: Likewise. (cherry picked from commit edbd2b1caaa79d68467418a4571c3b09f9602805) Diff: --- libgomp/ChangeLog.omp | 12 ++++++++++++ libgomp/Makefile.in | 2 -- libgomp/config.h.in | 6 ------ libgomp/configure | 18 ++---------------- libgomp/plugin/configfrag.ac | 6 ------ libgomp/testsuite/Makefile.in | 2 -- 6 files changed, 14 insertions(+), 32 deletions(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 0d4d2d12583..b244391a02d 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,15 @@ +2022-05-05 Thomas Schwinge + + Backport from mainline: + 2022-05-05 Thomas Schwinge + + * plugin/configfrag.ac: Don't 'AC_SUBST' and 'AC_DEFINE_UNQUOTED' + for 'PLUGIN_GCN', 'PLUGIN_NVPTX'. + * Makefile.in: Regenerate. + * config.h.in: Likewise. + * configure: Likewise. + * testsuite/Makefile.in: Likewise. + 2022-05-12 Jakub Jelinek Backport from mainline: diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index 3eab45ad6cd..5aa156df55e 100644 --- a/libgomp/Makefile.in +++ b/libgomp/Makefile.in @@ -432,9 +432,7 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ -PLUGIN_GCN = @PLUGIN_GCN@ PLUGIN_GCN_LIBS = @PLUGIN_GCN_LIBS@ -PLUGIN_NVPTX = @PLUGIN_NVPTX@ PLUGIN_NVPTX_CPPFLAGS = @PLUGIN_NVPTX_CPPFLAGS@ PLUGIN_NVPTX_LDFLAGS = @PLUGIN_NVPTX_LDFLAGS@ PLUGIN_NVPTX_LIBS = @PLUGIN_NVPTX_LIBS@ diff --git a/libgomp/config.h.in b/libgomp/config.h.in index e702625ab6e..5611ed925ad 100644 --- a/libgomp/config.h.in +++ b/libgomp/config.h.in @@ -170,12 +170,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to 1 if the GCN plugin is built, 0 if not. */ -#undef PLUGIN_GCN - -/* Define to 1 if the NVIDIA plugin is built, 0 if not. */ -#undef PLUGIN_NVPTX - /* Define to 1 if the NVIDIA plugin should dlopen libcuda.so.1, 0 if it should be linked against it. */ #undef PLUGIN_NVPTX_DYNAMIC diff --git a/libgomp/configure b/libgomp/configure index 3de8eb2641f..be675a6b8ab 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -674,11 +674,9 @@ offload_additional_options offload_targets offload_plugins PLUGIN_GCN_LIBS -PLUGIN_GCN PLUGIN_NVPTX_LIBS PLUGIN_NVPTX_LDFLAGS PLUGIN_NVPTX_CPPFLAGS -PLUGIN_NVPTX CUDA_DRIVER_LIB CUDA_DRIVER_INCLUDE libtool_VERSION @@ -11414,7 +11412,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11417 "configure" +#line 11415 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11520,7 +11518,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11523 "configure" +#line 11521 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15220,12 +15218,10 @@ PLUGIN_NVPTX_DYNAMIC=0 - PLUGIN_GCN=0 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. @@ -15373,11 +15369,6 @@ else fi -cat >>confdefs.h <<_ACEOF -#define PLUGIN_NVPTX $PLUGIN_NVPTX -_ACEOF - - cat >>confdefs.h <<_ACEOF #define PLUGIN_NVPTX_DYNAMIC $PLUGIN_NVPTX_DYNAMIC _ACEOF @@ -15391,11 +15382,6 @@ else fi -cat >>confdefs.h <<_ACEOF -#define PLUGIN_GCN $PLUGIN_GCN -_ACEOF - - # Check for functions needed. for ac_func in getloadavg clock_gettime strtoull diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac index 9eeac4562e4..1a61db94381 100644 --- a/libgomp/plugin/configfrag.ac +++ b/libgomp/plugin/configfrag.ac @@ -86,14 +86,12 @@ PLUGIN_NVPTX_CPPFLAGS= PLUGIN_NVPTX_LDFLAGS= PLUGIN_NVPTX_LIBS= PLUGIN_NVPTX_DYNAMIC=0 -AC_SUBST(PLUGIN_NVPTX) AC_SUBST(PLUGIN_NVPTX_CPPFLAGS) AC_SUBST(PLUGIN_NVPTX_LDFLAGS) AC_SUBST(PLUGIN_NVPTX_LIBS) PLUGIN_GCN=0 PLUGIN_GCN_LIBS= -AC_SUBST(PLUGIN_GCN) AC_SUBST(PLUGIN_GCN_LIBS) # Parse '--enable-offload-targets', figure out the corresponding libgomp @@ -221,10 +219,6 @@ fi AC_DEFINE_UNQUOTED(OFFLOAD_PLUGINS, "$offload_plugins", [Define to offload plugins, separated by commas.]) AM_CONDITIONAL([PLUGIN_NVPTX], [test $PLUGIN_NVPTX = 1]) -AC_DEFINE_UNQUOTED([PLUGIN_NVPTX], [$PLUGIN_NVPTX], - [Define to 1 if the NVIDIA plugin is built, 0 if not.]) AC_DEFINE_UNQUOTED([PLUGIN_NVPTX_DYNAMIC], [$PLUGIN_NVPTX_DYNAMIC], [Define to 1 if the NVIDIA plugin should dlopen libcuda.so.1, 0 if it should be linked against it.]) AM_CONDITIONAL([PLUGIN_GCN], [test $PLUGIN_GCN = 1]) -AC_DEFINE_UNQUOTED([PLUGIN_GCN], [$PLUGIN_GCN], - [Define to 1 if the GCN plugin is built, 0 if not.]) diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in index 4f8b68d712b..74a07d4e7de 100644 --- a/libgomp/testsuite/Makefile.in +++ b/libgomp/testsuite/Makefile.in @@ -209,9 +209,7 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ -PLUGIN_GCN = @PLUGIN_GCN@ PLUGIN_GCN_LIBS = @PLUGIN_GCN_LIBS@ -PLUGIN_NVPTX = @PLUGIN_NVPTX@ PLUGIN_NVPTX_CPPFLAGS = @PLUGIN_NVPTX_CPPFLAGS@ PLUGIN_NVPTX_LDFLAGS = @PLUGIN_NVPTX_LDFLAGS@ PLUGIN_NVPTX_LIBS = @PLUGIN_NVPTX_LIBS@