summaryrefslogtreecommitdiffstats
path: root/libgomp
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2022-05-05 23:10:23 +0200
committerThomas Schwinge <thomas@codesourcery.com>2022-05-12 13:28:23 +0200
commitedbd2b1caaa79d68467418a4571c3b09f9602805 (patch)
treedaccf531ee97c19ca521e4a9cdff2e96ada36f0a /libgomp
parenttree-optimization/105562 - avoid uninit diagnostic with better FRE (diff)
downloadgcc-edbd2b1caaa79d68467418a4571c3b09f9602805.tar.gz
gcc-edbd2b1caaa79d68467418a4571c3b09f9602805.tar.bz2
gcc-edbd2b1caaa79d68467418a4571c3b09f9602805.tar.xz
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.
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/Makefile.in2
-rw-r--r--libgomp/config.h.in6
-rwxr-xr-xlibgomp/configure18
-rw-r--r--libgomp/plugin/configfrag.ac6
-rw-r--r--libgomp/testsuite/Makefile.in2
5 files changed, 2 insertions, 32 deletions
diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index f2712aa5133..1d55f4b65e2 100644
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@ -431,9 +431,7 @@ PACKAGE_URL = @PACKAGE_URL@
431PACKAGE_VERSION = @PACKAGE_VERSION@ 431PACKAGE_VERSION = @PACKAGE_VERSION@
432PATH_SEPARATOR = @PATH_SEPARATOR@ 432PATH_SEPARATOR = @PATH_SEPARATOR@
433PERL = @PERL@ 433PERL = @PERL@
434PLUGIN_GCN = @PLUGIN_GCN@
435PLUGIN_GCN_LIBS = @PLUGIN_GCN_LIBS@ 434PLUGIN_GCN_LIBS = @PLUGIN_GCN_LIBS@
436PLUGIN_NVPTX = @PLUGIN_NVPTX@
437PLUGIN_NVPTX_CPPFLAGS = @PLUGIN_NVPTX_CPPFLAGS@ 435PLUGIN_NVPTX_CPPFLAGS = @PLUGIN_NVPTX_CPPFLAGS@
438PLUGIN_NVPTX_LDFLAGS = @PLUGIN_NVPTX_LDFLAGS@ 436PLUGIN_NVPTX_LDFLAGS = @PLUGIN_NVPTX_LDFLAGS@
439PLUGIN_NVPTX_LIBS = @PLUGIN_NVPTX_LIBS@ 437PLUGIN_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 @@
170/* Define to the version of this package. */ 170/* Define to the version of this package. */
171#undef PACKAGE_VERSION 171#undef PACKAGE_VERSION
172 172
173/* Define to 1 if the GCN plugin is built, 0 if not. */
174#undef PLUGIN_GCN
175
176/* Define to 1 if the NVIDIA plugin is built, 0 if not. */
177#undef PLUGIN_NVPTX
178
179/* Define to 1 if the NVIDIA plugin should dlopen libcuda.so.1, 0 if it should 173/* Define to 1 if the NVIDIA plugin should dlopen libcuda.so.1, 0 if it should
180 be linked against it. */ 174 be linked against it. */
181#undef PLUGIN_NVPTX_DYNAMIC 175#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
674offload_targets 674offload_targets
675offload_plugins 675offload_plugins
676PLUGIN_GCN_LIBS 676PLUGIN_GCN_LIBS
677PLUGIN_GCN
678PLUGIN_NVPTX_LIBS 677PLUGIN_NVPTX_LIBS
679PLUGIN_NVPTX_LDFLAGS 678PLUGIN_NVPTX_LDFLAGS
680PLUGIN_NVPTX_CPPFLAGS 679PLUGIN_NVPTX_CPPFLAGS
681PLUGIN_NVPTX
682CUDA_DRIVER_LIB 680CUDA_DRIVER_LIB
683CUDA_DRIVER_INCLUDE 681CUDA_DRIVER_INCLUDE
684libtool_VERSION 682libtool_VERSION
@@ -11414,7 +11412,7 @@ else
11414 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11412 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11415 lt_status=$lt_dlunknown 11413 lt_status=$lt_dlunknown
11416 cat > conftest.$ac_ext <<_LT_EOF 11414 cat > conftest.$ac_ext <<_LT_EOF
11417#line 11417 "configure" 11415#line 11415 "configure"
11418#include "confdefs.h" 11416#include "confdefs.h"
11419 11417
11420#if HAVE_DLFCN_H 11418#if HAVE_DLFCN_H
@@ -11520,7 +11518,7 @@ else
11520 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11518 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11521 lt_status=$lt_dlunknown 11519 lt_status=$lt_dlunknown
11522 cat > conftest.$ac_ext <<_LT_EOF 11520 cat > conftest.$ac_ext <<_LT_EOF
11523#line 11523 "configure" 11521#line 11521 "configure"
11524#include "confdefs.h" 11522#include "confdefs.h"
11525 11523
11526#if HAVE_DLFCN_H 11524#if HAVE_DLFCN_H
@@ -15220,12 +15218,10 @@ PLUGIN_NVPTX_DYNAMIC=0
15220 15218
15221 15219
15222 15220
15223
15224PLUGIN_GCN=0 15221PLUGIN_GCN=0
15225PLUGIN_GCN_LIBS= 15222PLUGIN_GCN_LIBS=
15226 15223
15227 15224
15228
15229# Parse '--enable-offload-targets', figure out the corresponding libgomp 15225# Parse '--enable-offload-targets', figure out the corresponding libgomp
15230# plugins, and configure to find the corresponding offload compilers. 15226# plugins, and configure to find the corresponding offload compilers.
15231# 'offload_plugins' and 'offload_targets' will be populated in the same order. 15227# 'offload_plugins' and 'offload_targets' will be populated in the same order.
@@ -15374,11 +15370,6 @@ fi
15374 15370
15375 15371
15376cat >>confdefs.h <<_ACEOF 15372cat >>confdefs.h <<_ACEOF
15377#define PLUGIN_NVPTX $PLUGIN_NVPTX
15378_ACEOF
15379
15380
15381cat >>confdefs.h <<_ACEOF
15382#define PLUGIN_NVPTX_DYNAMIC $PLUGIN_NVPTX_DYNAMIC 15373#define PLUGIN_NVPTX_DYNAMIC $PLUGIN_NVPTX_DYNAMIC
15383_ACEOF 15374_ACEOF
15384 15375
@@ -15391,11 +15382,6 @@ else
15391fi 15382fi
15392 15383
15393 15384
15394cat >>confdefs.h <<_ACEOF
15395#define PLUGIN_GCN $PLUGIN_GCN
15396_ACEOF
15397
15398
15399 15385
15400# Check for functions needed. 15386# Check for functions needed.
15401for ac_func in getloadavg clock_gettime strtoull 15387for 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=
86PLUGIN_NVPTX_LDFLAGS= 86PLUGIN_NVPTX_LDFLAGS=
87PLUGIN_NVPTX_LIBS= 87PLUGIN_NVPTX_LIBS=
88PLUGIN_NVPTX_DYNAMIC=0 88PLUGIN_NVPTX_DYNAMIC=0
89AC_SUBST(PLUGIN_NVPTX)
90AC_SUBST(PLUGIN_NVPTX_CPPFLAGS) 89AC_SUBST(PLUGIN_NVPTX_CPPFLAGS)
91AC_SUBST(PLUGIN_NVPTX_LDFLAGS) 90AC_SUBST(PLUGIN_NVPTX_LDFLAGS)
92AC_SUBST(PLUGIN_NVPTX_LIBS) 91AC_SUBST(PLUGIN_NVPTX_LIBS)
93 92
94PLUGIN_GCN=0 93PLUGIN_GCN=0
95PLUGIN_GCN_LIBS= 94PLUGIN_GCN_LIBS=
96AC_SUBST(PLUGIN_GCN)
97AC_SUBST(PLUGIN_GCN_LIBS) 95AC_SUBST(PLUGIN_GCN_LIBS)
98 96
99# Parse '--enable-offload-targets', figure out the corresponding libgomp 97# Parse '--enable-offload-targets', figure out the corresponding libgomp
@@ -221,10 +219,6 @@ fi
221AC_DEFINE_UNQUOTED(OFFLOAD_PLUGINS, "$offload_plugins", 219AC_DEFINE_UNQUOTED(OFFLOAD_PLUGINS, "$offload_plugins",
222 [Define to offload plugins, separated by commas.]) 220 [Define to offload plugins, separated by commas.])
223AM_CONDITIONAL([PLUGIN_NVPTX], [test $PLUGIN_NVPTX = 1]) 221AM_CONDITIONAL([PLUGIN_NVPTX], [test $PLUGIN_NVPTX = 1])
224AC_DEFINE_UNQUOTED([PLUGIN_NVPTX], [$PLUGIN_NVPTX],
225 [Define to 1 if the NVIDIA plugin is built, 0 if not.])
226AC_DEFINE_UNQUOTED([PLUGIN_NVPTX_DYNAMIC], [$PLUGIN_NVPTX_DYNAMIC], 222AC_DEFINE_UNQUOTED([PLUGIN_NVPTX_DYNAMIC], [$PLUGIN_NVPTX_DYNAMIC],
227 [Define to 1 if the NVIDIA plugin should dlopen libcuda.so.1, 0 if it should be linked against it.]) 223 [Define to 1 if the NVIDIA plugin should dlopen libcuda.so.1, 0 if it should be linked against it.])
228AM_CONDITIONAL([PLUGIN_GCN], [test $PLUGIN_GCN = 1]) 224AM_CONDITIONAL([PLUGIN_GCN], [test $PLUGIN_GCN = 1])
229AC_DEFINE_UNQUOTED([PLUGIN_GCN], [$PLUGIN_GCN],
230 [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 32be337b8fc..2d1bf8f20d7 100644
--- a/libgomp/testsuite/Makefile.in
+++ b/libgomp/testsuite/Makefile.in
@@ -209,9 +209,7 @@ PACKAGE_URL = @PACKAGE_URL@
209PACKAGE_VERSION = @PACKAGE_VERSION@ 209PACKAGE_VERSION = @PACKAGE_VERSION@
210PATH_SEPARATOR = @PATH_SEPARATOR@ 210PATH_SEPARATOR = @PATH_SEPARATOR@
211PERL = @PERL@ 211PERL = @PERL@
212PLUGIN_GCN = @PLUGIN_GCN@
213PLUGIN_GCN_LIBS = @PLUGIN_GCN_LIBS@ 212PLUGIN_GCN_LIBS = @PLUGIN_GCN_LIBS@
214PLUGIN_NVPTX = @PLUGIN_NVPTX@
215PLUGIN_NVPTX_CPPFLAGS = @PLUGIN_NVPTX_CPPFLAGS@ 213PLUGIN_NVPTX_CPPFLAGS = @PLUGIN_NVPTX_CPPFLAGS@
216PLUGIN_NVPTX_LDFLAGS = @PLUGIN_NVPTX_LDFLAGS@ 214PLUGIN_NVPTX_LDFLAGS = @PLUGIN_NVPTX_LDFLAGS@
217PLUGIN_NVPTX_LIBS = @PLUGIN_NVPTX_LIBS@ 215PLUGIN_NVPTX_LIBS = @PLUGIN_NVPTX_LIBS@