summaryrefslogtreecommitdiffstats
path: root/libgomp
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2022-04-06 12:26:13 +0200
committerThomas Schwinge <thomas@codesourcery.com>2022-05-11 14:27:42 +0200
commit876ac21b7e796f9efb859dfb46ae2a4126b0b782 (patch)
tree964b308a6dea891be4a71f3644de065d43f2bbb0 /libgomp
parentlibgomp GCN plugin: Clean up always-empty 'PLUGIN_GCN_CPPFLAGS', 'PLUGIN_GCN_... (diff)
downloadgcc-876ac21b7e796f9efb859dfb46ae2a4126b0b782.tar.gz
gcc-876ac21b7e796f9efb859dfb46ae2a4126b0b782.tar.bz2
gcc-876ac21b7e796f9efb859dfb46ae2a4126b0b782.tar.xz
libgomp: Remove unused '--with-hsa-runtime', '--with-hsa-runtime-include', '--with-hsa-runtime-lib'
With recent commit 2e309a4eff80e55b53d32d26926a2a94eabfea21 "libgomp testsuite: Don't amend 'LD_LIBRARY_PATH' for system-provided HSA Runtime library", and commit d6adba307508c75f1ccb2121eb1a43c9ab1d4056 "libgomp GCN plugin: Clean up unused references to system-provided HSA Runtime library", the last uses of '--with-hsa-runtime' etc. are gone. gcc/ * doc/install.texi: Don't document '--with-hsa-runtime', '--with-hsa-runtime-include', '--with-hsa-runtime-lib'. libgomp/ * plugin/configfrag.ac: Remove '--with-hsa-runtime', '--with-hsa-runtime-include', '--with-hsa-runtime-lib' processing. * Makefile.in: Regenerate. * configure: Likewise. * testsuite/Makefile.in: Likewise.
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/Makefile.in2
-rwxr-xr-xlibgomp/configure55
-rw-r--r--libgomp/plugin/configfrag.ac29
-rw-r--r--libgomp/testsuite/Makefile.in2
4 files changed, 2 insertions, 86 deletions
diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index 1c2ac5695ab..f2712aa5133 100644
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@ -385,8 +385,6 @@ FC = @FC@
385FCFLAGS = @FCFLAGS@ 385FCFLAGS = @FCFLAGS@
386FGREP = @FGREP@ 386FGREP = @FGREP@
387GREP = @GREP@ 387GREP = @GREP@
388HSA_RUNTIME_INCLUDE = @HSA_RUNTIME_INCLUDE@
389HSA_RUNTIME_LIB = @HSA_RUNTIME_LIB@
390INSTALL = @INSTALL@ 388INSTALL = @INSTALL@
391INSTALL_DATA = @INSTALL_DATA@ 389INSTALL_DATA = @INSTALL_DATA@
392INSTALL_PROGRAM = @INSTALL_PROGRAM@ 390INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/libgomp/configure b/libgomp/configure
index e735e4c5f2a..3de8eb2641f 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -675,8 +675,6 @@ offload_targets
675offload_plugins 675offload_plugins
676PLUGIN_GCN_LIBS 676PLUGIN_GCN_LIBS
677PLUGIN_GCN 677PLUGIN_GCN
678HSA_RUNTIME_LIB
679HSA_RUNTIME_INCLUDE
680PLUGIN_NVPTX_LIBS 678PLUGIN_NVPTX_LIBS
681PLUGIN_NVPTX_LDFLAGS 679PLUGIN_NVPTX_LDFLAGS
682PLUGIN_NVPTX_CPPFLAGS 680PLUGIN_NVPTX_CPPFLAGS
@@ -834,9 +832,6 @@ enable_maintainer_mode
834with_cuda_driver 832with_cuda_driver
835with_cuda_driver_include 833with_cuda_driver_include
836with_cuda_driver_lib 834with_cuda_driver_lib
837with_hsa_runtime
838with_hsa_runtime_include
839with_hsa_runtime_lib
840enable_linux_futex 835enable_linux_futex
841enable_tls 836enable_tls
842enable_symvers 837enable_symvers
@@ -1519,16 +1514,6 @@ Optional Packages:
1519 --with-cuda-driver-lib=PATH 1514 --with-cuda-driver-lib=PATH
1520 specify directory for the installed CUDA driver 1515 specify directory for the installed CUDA driver
1521 library 1516 library
1522 --with-hsa-runtime=PATH specify prefix directory for installed HSA run-time
1523 package. Equivalent to
1524 --with-hsa-runtime-include=PATH/include plus
1525 --with-hsa-runtime-lib=PATH/lib
1526 --with-hsa-runtime-include=PATH
1527 specify directory for installed HSA run-time include
1528 files
1529 --with-hsa-runtime-lib=PATH
1530 specify directory for the installed HSA run-time
1531 library
1532 --with-gcc-major-version-only 1517 --with-gcc-major-version-only
1533 use only GCC major number in filesystem paths 1518 use only GCC major number in filesystem paths
1534 1519
@@ -11429,7 +11414,7 @@ else
11429 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11414 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11430 lt_status=$lt_dlunknown 11415 lt_status=$lt_dlunknown
11431 cat > conftest.$ac_ext <<_LT_EOF 11416 cat > conftest.$ac_ext <<_LT_EOF
11432#line 11432 "configure" 11417#line 11417 "configure"
11433#include "confdefs.h" 11418#include "confdefs.h"
11434 11419
11435#if HAVE_DLFCN_H 11420#if HAVE_DLFCN_H
@@ -11535,7 +11520,7 @@ else
11535 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11520 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11536 lt_status=$lt_dlunknown 11521 lt_status=$lt_dlunknown
11537 cat > conftest.$ac_ext <<_LT_EOF 11522 cat > conftest.$ac_ext <<_LT_EOF
11538#line 11538 "configure" 11523#line 11523 "configure"
11539#include "confdefs.h" 11524#include "confdefs.h"
11540 11525
11541#if HAVE_DLFCN_H 11526#if HAVE_DLFCN_H
@@ -15236,42 +15221,6 @@ PLUGIN_NVPTX_DYNAMIC=0
15236 15221
15237 15222
15238 15223
15239# Look for HSA run-time, its includes and libraries
15240
15241HSA_RUNTIME_INCLUDE=
15242HSA_RUNTIME_LIB=
15243
15244
15245
15246
15247# Check whether --with-hsa-runtime was given.
15248if test "${with_hsa_runtime+set}" = set; then :
15249 withval=$with_hsa_runtime;
15250fi
15251
15252
15253# Check whether --with-hsa-runtime-include was given.
15254if test "${with_hsa_runtime_include+set}" = set; then :
15255 withval=$with_hsa_runtime_include;
15256fi
15257
15258
15259# Check whether --with-hsa-runtime-lib was given.
15260if test "${with_hsa_runtime_lib+set}" = set; then :
15261 withval=$with_hsa_runtime_lib;
15262fi
15263
15264if test "x$with_hsa_runtime" != x; then
15265 HSA_RUNTIME_INCLUDE=$with_hsa_runtime/include
15266 HSA_RUNTIME_LIB=$with_hsa_runtime/lib
15267fi
15268if test "x$with_hsa_runtime_include" != x; then
15269 HSA_RUNTIME_INCLUDE=$with_hsa_runtime_include
15270fi
15271if test "x$with_hsa_runtime_lib" != x; then
15272 HSA_RUNTIME_LIB=$with_hsa_runtime_lib
15273fi
15274
15275PLUGIN_GCN=0 15224PLUGIN_GCN=0
15276PLUGIN_GCN_LIBS= 15225PLUGIN_GCN_LIBS=
15277 15226
diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac
index 94d357f9a26..9eeac4562e4 100644
--- a/libgomp/plugin/configfrag.ac
+++ b/libgomp/plugin/configfrag.ac
@@ -91,35 +91,6 @@ AC_SUBST(PLUGIN_NVPTX_CPPFLAGS)
91AC_SUBST(PLUGIN_NVPTX_LDFLAGS) 91AC_SUBST(PLUGIN_NVPTX_LDFLAGS)
92AC_SUBST(PLUGIN_NVPTX_LIBS) 92AC_SUBST(PLUGIN_NVPTX_LIBS)
93 93
94# Look for HSA run-time, its includes and libraries
95
96HSA_RUNTIME_INCLUDE=
97HSA_RUNTIME_LIB=
98AC_SUBST(HSA_RUNTIME_INCLUDE)
99AC_SUBST(HSA_RUNTIME_LIB)
100
101AC_ARG_WITH(hsa-runtime,
102 [AS_HELP_STRING([--with-hsa-runtime=PATH],
103 [specify prefix directory for installed HSA run-time package.
104 Equivalent to --with-hsa-runtime-include=PATH/include
105 plus --with-hsa-runtime-lib=PATH/lib])])
106AC_ARG_WITH(hsa-runtime-include,
107 [AS_HELP_STRING([--with-hsa-runtime-include=PATH],
108 [specify directory for installed HSA run-time include files])])
109AC_ARG_WITH(hsa-runtime-lib,
110 [AS_HELP_STRING([--with-hsa-runtime-lib=PATH],
111 [specify directory for the installed HSA run-time library])])
112if test "x$with_hsa_runtime" != x; then
113 HSA_RUNTIME_INCLUDE=$with_hsa_runtime/include
114 HSA_RUNTIME_LIB=$with_hsa_runtime/lib
115fi
116if test "x$with_hsa_runtime_include" != x; then
117 HSA_RUNTIME_INCLUDE=$with_hsa_runtime_include
118fi
119if test "x$with_hsa_runtime_lib" != x; then
120 HSA_RUNTIME_LIB=$with_hsa_runtime_lib
121fi
122
123PLUGIN_GCN=0 94PLUGIN_GCN=0
124PLUGIN_GCN_LIBS= 95PLUGIN_GCN_LIBS=
125AC_SUBST(PLUGIN_GCN) 96AC_SUBST(PLUGIN_GCN)
diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in
index f0c7da68601..32be337b8fc 100644
--- a/libgomp/testsuite/Makefile.in
+++ b/libgomp/testsuite/Makefile.in
@@ -163,8 +163,6 @@ FC = @FC@
163FCFLAGS = @FCFLAGS@ 163FCFLAGS = @FCFLAGS@
164FGREP = @FGREP@ 164FGREP = @FGREP@
165GREP = @GREP@ 165GREP = @GREP@
166HSA_RUNTIME_INCLUDE = @HSA_RUNTIME_INCLUDE@
167HSA_RUNTIME_LIB = @HSA_RUNTIME_LIB@
168INSTALL = @INSTALL@ 166INSTALL = @INSTALL@
169INSTALL_DATA = @INSTALL_DATA@ 167INSTALL_DATA = @INSTALL_DATA@
170INSTALL_PROGRAM = @INSTALL_PROGRAM@ 168INSTALL_PROGRAM = @INSTALL_PROGRAM@