diff options
| author | Fraser Cormack <fraser@codeplay.com> | 2024-10-09 16:17:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-09 16:17:43 +0100 |
| commit | 72a957ba4c8ef059f1572f6d4ee0cba8dc615268 (patch) | |
| tree | 964a910dc70c42fe8cb54afc110648e1bbd247b7 /clang/lib | |
| parent | e637a5c9fef866158018dcaecc3c385d157460f5 (diff) | |
| download | llvm-72a957ba4c8ef059f1572f6d4ee0cba8dc615268.zip llvm-72a957ba4c8ef059f1572f6d4ee0cba8dc615268.tar.gz llvm-72a957ba4c8ef059f1572f6d4ee0cba8dc615268.tar.bz2 | |
[Cuda] Handle -fcuda-short-ptr even with -nocudalib (#111682)
When passed -nocudalib/-nogpulib, Cuda's argument handling would bail
out before handling -fcuda-short-ptr, meaning the frontend and backend
data layouts would mismatch.
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Driver/ToolChains/Cuda.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp index 509cd87..7a70cf1 100644 --- a/clang/lib/Driver/ToolChains/Cuda.cpp +++ b/clang/lib/Driver/ToolChains/Cuda.cpp @@ -848,6 +848,10 @@ void CudaToolChain::addClangTargetOptions( if (CudaInstallation.version() >= CudaVersion::CUDA_90) CC1Args.push_back("-fcuda-allow-variadic-functions"); + if (DriverArgs.hasFlag(options::OPT_fcuda_short_ptr, + options::OPT_fno_cuda_short_ptr, false)) + CC1Args.append({"-mllvm", "--nvptx-short-ptr"}); + if (DriverArgs.hasArg(options::OPT_nogpulib)) return; @@ -873,10 +877,6 @@ void CudaToolChain::addClangTargetOptions( clang::CudaVersion CudaInstallationVersion = CudaInstallation.version(); - if (DriverArgs.hasFlag(options::OPT_fcuda_short_ptr, - options::OPT_fno_cuda_short_ptr, false)) - CC1Args.append({"-mllvm", "--nvptx-short-ptr"}); - if (CudaInstallationVersion >= CudaVersion::UNKNOWN) CC1Args.push_back( DriverArgs.MakeArgString(Twine("-target-sdk-version=") + |