diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2022-04-06 14:12:29 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2022-04-06 22:30:14 +0200 |
| commit | 5e431ae4ccc5fb0e077e598cb4efb1e12fc66c68 (patch) | |
| tree | 1e4a8ca3d571895cb30d293511407f51ce52c0e7 | |
| parent | 790e9814454662b6cd51d2fce1aa022ef73fedb8 (diff) | |
| download | gcc-5e431ae4ccc5fb0e077e598cb4efb1e12fc66c68.zip gcc-5e431ae4ccc5fb0e077e598cb4efb1e12fc66c68.tar.gz gcc-5e431ae4ccc5fb0e077e598cb4efb1e12fc66c68.tar.bz2 | |
Move 'libgomp/plugin/cuda/cuda.h' to 'include/cuda/cuda.h'
... so that it may be used by other projects that inherit GCC's 'include'
directory.
include/
* cuda/cuda.h: New file.
libgomp/
* plugin/cuda/cuda.h: Remove file.
* plugin/plugin-nvptx.c [PLUGIN_NVPTX_DYNAMIC]: Include
"cuda/cuda.h" instead of <cuda.h>.
* plugin/configfrag.ac <PLUGIN_NVPTX_DYNAMIC>: Don't set
'PLUGIN_NVPTX_CPPFLAGS'.
* configure: Regenerate.
| -rw-r--r-- | include/cuda/cuda.h (renamed from libgomp/plugin/cuda/cuda.h) | 7 | ||||
| -rwxr-xr-x | libgomp/configure | 1 | ||||
| -rw-r--r-- | libgomp/plugin/configfrag.ac | 1 | ||||
| -rw-r--r-- | libgomp/plugin/plugin-nvptx.c | 6 |
4 files changed, 8 insertions, 7 deletions
diff --git a/libgomp/plugin/cuda/cuda.h b/include/cuda/cuda.h index 5c679c1..5c813ad 100644 --- a/libgomp/plugin/cuda/cuda.h +++ b/include/cuda/cuda.h @@ -1,4 +1,4 @@ -/* CUDA API description. +/* CUDA Driver API description. Copyright (C) 2017-2022 Free Software Foundation, Inc. This file is part of GCC. @@ -22,9 +22,8 @@ a copy of the GCC Runtime Library Exception along with this program; see the files COPYING3 and COPYING.RUNTIME respectively. If not, see <http://www.gnu.org/licenses/>. -This header provides the minimum amount of typedefs, enums and function -declarations to be able to compile plugin-nvptx.c if cuda.h and -libcuda.so.1 are not available. */ +This header provides parts of the CUDA Driver API, without having to rely on +the proprietary CUDA toolkit. */ #ifndef GCC_CUDA_H #define GCC_CUDA_H diff --git a/libgomp/configure b/libgomp/configure index bdbe3d1..5ef071e 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -15362,7 +15362,6 @@ rm -f core conftest.err conftest.$ac_objext \ && (test "x$CUDA_DRIVER_LIB" = x \ || test "x$CUDA_DRIVER_LIB" = xno); then PLUGIN_NVPTX=1 - PLUGIN_NVPTX_CPPFLAGS='-I$(srcdir)/plugin/cuda' PLUGIN_NVPTX_LIBS='-ldl' PLUGIN_NVPTX_DYNAMIC=1 else diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac index 9f9d0a7..09f87f4 100644 --- a/libgomp/plugin/configfrag.ac +++ b/libgomp/plugin/configfrag.ac @@ -197,7 +197,6 @@ if test x"$enable_offload_targets" != x; then && (test "x$CUDA_DRIVER_LIB" = x \ || test "x$CUDA_DRIVER_LIB" = xno); then PLUGIN_NVPTX=1 - PLUGIN_NVPTX_CPPFLAGS='-I$(srcdir)/plugin/cuda' PLUGIN_NVPTX_LIBS='-ldl' PLUGIN_NVPTX_DYNAMIC=1 else diff --git a/libgomp/plugin/plugin-nvptx.c b/libgomp/plugin/plugin-nvptx.c index b4f0a84..b28dfca 100644 --- a/libgomp/plugin/plugin-nvptx.c +++ b/libgomp/plugin/plugin-nvptx.c @@ -41,7 +41,11 @@ #include "oacc-int.h" #include <pthread.h> -#include <cuda.h> +#if PLUGIN_NVPTX_DYNAMIC +# include "cuda/cuda.h" +#else +# include <cuda.h> +#endif #include <stdbool.h> #include <limits.h> #include <string.h> |