Skip to content

Commit b06cd39

Browse files
committed
[Clang][Driver] Removes additional nfc divergence
Removes/adds newline changes leading to divergence from trunk.
1 parent 8f6a28b commit b06cd39

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
@@ -27,7 +27,9 @@ namespace NVPTX {
2727
class LLVM_LIBRARY_VISIBILITY Assembler final : public Tool {
2828
public:
2929
Assembler(const ToolChain &TC) : Tool("NVPTX::Assembler", "ptxas", TC) {}
30+
3031
bool hasIntegratedCPP() const override { return false; }
32+
3133
void ConstructJob(Compilation &C, const JobAction &JA,
3234
const InputInfo &Output, const InputInfoList &Inputs,
3335
const llvm::opt::ArgList &TCArgs,
@@ -38,7 +40,9 @@ class LLVM_LIBRARY_VISIBILITY Assembler final : public Tool {
3840
class LLVM_LIBRARY_VISIBILITY FatBinary : public Tool {
3941
public:
4042
FatBinary(const ToolChain &TC) : Tool("NVPTX::Linker", "fatbinary", TC) {}
43+
4144
bool hasIntegratedCPP() const override { return false; }
45+
4246
void ConstructJob(Compilation &C, const JobAction &JA,
4347
const InputInfo &Output, const InputInfoList &Inputs,
4448
const llvm::opt::ArgList &TCArgs,
@@ -50,6 +54,7 @@ class LLVM_LIBRARY_VISIBILITY Linker final : public Tool {
5054
Linker(const ToolChain &TC) : Tool("NVPTX::Linker", "nvlink", TC) {}
5155

5256
bool hasIntegratedCPP() const override { return false; }
57+
5358
void ConstructJob(Compilation &C, const JobAction &JA,
5459
const InputInfo &Output, const InputInfoList &Inputs,
5560
const llvm::opt::ArgList &TCArgs,
@@ -59,7 +64,9 @@ class LLVM_LIBRARY_VISIBILITY OpenMPLinker : public Tool {
5964
public:
6065
OpenMPLinker(const ToolChain &TC)
6166
: Tool("NVPTX::OpenMPLinker", "nvlink", TC) {}
67+
6268
bool hasIntegratedCPP() const override { return false; }
69+
6370
void ConstructJob(Compilation &C, const JobAction &JA,
6471
const InputInfo &Output, const InputInfoList &Inputs,
6572
const llvm::opt::ArgList &TCArgs,
@@ -158,6 +165,7 @@ class LLVM_LIBRARY_VISIBILITY CudaToolChain : public NVPTXToolChain {
158165
void AddIAMCUIncludeArgs(const llvm::opt::ArgList &DriverArgs,
159166
llvm::opt::ArgStringList &CC1Args) const override;
160167
SanitizerMask getSupportedSanitizers() const override;
168+
161169
VersionTuple
162170
computeMSVCVersion(const Driver *D,
163171
const llvm::opt::ArgList &Args) const override;

0 commit comments

Comments
 (0)