From 6abaa8e2103760025cee76528f555de7cf6698e6 Mon Sep 17 00:00:00 2001 From: Joseph Huber Date: Wed, 13 Jul 2022 15:56:15 -0400 Subject: [PATCH] [CUDA][HIP][NFC] Do not add `-fgpu-rdc` flag twice Summary: We currently add the `-fgpu-rdc` flag twice. Once unconditionally for both the host and device phases of compilation, and a second time only for the host. When we moved to an unconditional addition of this flag it the old one was most likely not removed. This patch simply removes the redundant flag and changes no functionality. --- clang/lib/Driver/ToolChains/Clang.cpp | 2 -- clang/test/Driver/cuda-external-tools.cu | 2 -- 2 files changed, 4 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index e187fce..0081426 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -7011,8 +7011,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, if ((IsCuda || IsHIP) && CudaDeviceInput) { CmdArgs.push_back("-fcuda-include-gpubinary"); CmdArgs.push_back(CudaDeviceInput->getFilename()); - if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false)) - CmdArgs.push_back("-fgpu-rdc"); } if (IsCuda) { diff --git a/clang/test/Driver/cuda-external-tools.cu b/clang/test/Driver/cuda-external-tools.cu index 198443e..1aa87cc 100644 --- a/clang/test/Driver/cuda-external-tools.cu +++ b/clang/test/Driver/cuda-external-tools.cu @@ -160,7 +160,5 @@ // ARCH64-SAME: "-triple" "x86_64- // ARCH32-SAME: "-triple" "i386- // CHECK-SAME: "-fcuda-include-gpubinary" "[[FATBINARY]]" -// RDC-SAME: "-fgpu-rdc" -// CHECK-NOT: "-fgpu-rdc" // CHK-PTXAS-VERBOSE: ptxas{{.*}}" "-v" -- 2.7.4