Skip to content

Commit 9bfed15

Browse files
authored
[Clang][Driver] Removes additional nfc divergence (#763)
2 parents cf6797a + b06cd39 commit 9bfed15

File tree

4 files changed

+11
-0
lines changed

4 files changed

+11
-0
lines changed

clang/lib/Driver/Driver.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,6 +1300,7 @@ bool Driver::loadConfigFiles() {
13001300
UserConfigDir = static_cast<std::string>(CfgDir);
13011301
}
13021302
}
1303+
13031304
// Prepare list of directories where config file is searched for.
13041305
StringRef CfgFileSearchDirs[] = {UserConfigDir, SystemConfigDir, Dir};
13051306
ExpCtx.setSearchDirs(CfgFileSearchDirs);

clang/lib/Driver/ToolChain.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,7 @@ Tool *ToolChain::getTool(Action::ActionClass AC) const {
669669
case Action::OffloadBundlingJobClass:
670670
case Action::OffloadUnbundlingJobClass:
671671
return getOffloadBundler();
672+
672673
case Action::OffloadPackagerJobClass:
673674
return getOffloadPackager();
674675
case Action::LinkerWrapperJobClass:

clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8+
89
#include "Clang.h"
910
#include "AMDGPUOpenMP.h"
1011
#include "Arch/ARM.h"

clang/lib/Driver/ToolChains/Cuda.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ namespace NVPTX {
3030
class LLVM_LIBRARY_VISIBILITY Assembler final : public Tool {
3131
public:
3232
Assembler(const ToolChain &TC) : Tool("NVPTX::Assembler", "ptxas", TC) {}
33+
3334
bool hasIntegratedCPP() const override { return false; }
35+
3436
void ConstructJob(Compilation &C, const JobAction &JA,
3537
const InputInfo &Output, const InputInfoList &Inputs,
3638
const llvm::opt::ArgList &TCArgs,
@@ -42,7 +44,9 @@ class LLVM_LIBRARY_VISIBILITY Assembler final : public Tool {
4244
class LLVM_LIBRARY_VISIBILITY FatBinary : public Tool {
4345
public:
4446
FatBinary(const ToolChain &TC) : Tool("NVPTX::Linker", "fatbinary", TC) {}
47+
4548
bool hasIntegratedCPP() const override { return false; }
49+
4650
void ConstructJob(Compilation &C, const JobAction &JA,
4751
const InputInfo &Output, const InputInfoList &Inputs,
4852
const llvm::opt::ArgList &TCArgs,
@@ -55,6 +59,7 @@ class LLVM_LIBRARY_VISIBILITY Linker final : public Tool {
5559
Linker(const ToolChain &TC) : Tool("NVPTX::Linker", "nvlink", TC) {}
5660

5761
bool hasIntegratedCPP() const override { return false; }
62+
5863
void ConstructJob(Compilation &C, const JobAction &JA,
5964
const InputInfo &Output, const InputInfoList &Inputs,
6065
const llvm::opt::ArgList &TCArgs,
@@ -65,7 +70,9 @@ class LLVM_LIBRARY_VISIBILITY OpenMPLinker : public Tool {
6570
public:
6671
OpenMPLinker(const ToolChain &TC)
6772
: Tool("NVPTX::OpenMPLinker", "nvlink", TC) {}
73+
6874
bool hasIntegratedCPP() const override { return false; }
75+
6976
void ConstructJob(Compilation &C, const JobAction &JA,
7077
const InputInfo &Output, const InputInfoList &Inputs,
7178
const llvm::opt::ArgList &TCArgs,
@@ -178,6 +185,7 @@ class LLVM_LIBRARY_VISIBILITY CudaToolChain : public NVPTXToolChain {
178185
llvm::opt::ArgStringList &CC1Args) const override;
179186

180187
SanitizerMask getSupportedSanitizers() const override;
188+
181189
VersionTuple
182190
computeMSVCVersion(const Driver *D,
183191
const llvm::opt::ArgList &Args) const override;

0 commit comments

Comments
 (0)