Skip to content

Commit a5c847e

Browse files
committed
[PS4][NFC] Rename classes to align with prevailing practice
Rename classes Assemble -> Assembler, Link -> Linker, for consistency with names other toolchains use.
1 parent e6d5680 commit a5c847e

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

clang/lib/Driver/ToolChains/PS4CPU.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ void tools::PScpu::addProfileRTArgs(const ToolChain &TC, const ArgList &Args,
5454
Args, "--dependent-lib=", PSTC.getProfileRTLibName(), ""));
5555
}
5656

57-
void tools::PScpu::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
58-
const InputInfo &Output,
59-
const InputInfoList &Inputs,
60-
const ArgList &Args,
61-
const char *LinkingOutput) const {
57+
void tools::PScpu::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
58+
const InputInfo &Output,
59+
const InputInfoList &Inputs,
60+
const ArgList &Args,
61+
const char *LinkingOutput) const {
6262
auto &TC = static_cast<const toolchains::PS4PS5Base &>(getToolChain());
6363
claimNoWarnArgs(Args);
6464
ArgStringList CmdArgs;
@@ -117,11 +117,11 @@ void toolchains::PS5CPU::addSanitizerArgs(const ArgList &Args,
117117
CmdArgs.push_back(arg("SceThreadSanitizer_nosubmission_stub_weak"));
118118
}
119119

120-
void tools::PScpu::Link::ConstructJob(Compilation &C, const JobAction &JA,
121-
const InputInfo &Output,
122-
const InputInfoList &Inputs,
123-
const ArgList &Args,
124-
const char *LinkingOutput) const {
120+
void tools::PScpu::Linker::ConstructJob(Compilation &C, const JobAction &JA,
121+
const InputInfo &Output,
122+
const InputInfoList &Inputs,
123+
const ArgList &Args,
124+
const char *LinkingOutput) const {
125125
auto &TC = static_cast<const toolchains::PS4PS5Base &>(getToolChain());
126126
const Driver &D = TC.getDriver();
127127
ArgStringList CmdArgs;
@@ -245,7 +245,7 @@ toolchains::PS4PS5Base::PS4PS5Base(const Driver &D, const llvm::Triple &Triple,
245245
}
246246

247247
Tool *toolchains::PS4CPU::buildAssembler() const {
248-
return new tools::PScpu::Assemble(*this);
248+
return new tools::PScpu::Assembler(*this);
249249
}
250250

251251
Tool *toolchains::PS5CPU::buildAssembler() const {
@@ -255,7 +255,7 @@ Tool *toolchains::PS5CPU::buildAssembler() const {
255255
}
256256

257257
Tool *toolchains::PS4PS5Base::buildLinker() const {
258-
return new tools::PScpu::Link(*this);
258+
return new tools::PScpu::Linker(*this);
259259
}
260260

261261
SanitizerMask toolchains::PS4PS5Base::getSupportedSanitizers() const {

clang/lib/Driver/ToolChains/PS4CPU.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ void addProfileRTArgs(const ToolChain &TC, const llvm::opt::ArgList &Args,
2727
void addSanitizerArgs(const ToolChain &TC, const llvm::opt::ArgList &Args,
2828
llvm::opt::ArgStringList &CmdArgs);
2929

30-
class LLVM_LIBRARY_VISIBILITY Assemble : public Tool {
30+
class LLVM_LIBRARY_VISIBILITY Assembler : public Tool {
3131
public:
32-
Assemble(const ToolChain &TC) : Tool("PScpu::Assemble", "assembler", TC) {}
32+
Assembler(const ToolChain &TC) : Tool("PScpu::Assembler", "assembler", TC) {}
3333

3434
bool hasIntegratedCPP() const override { return false; }
3535

@@ -39,9 +39,9 @@ class LLVM_LIBRARY_VISIBILITY Assemble : public Tool {
3939
const char *LinkingOutput) const override;
4040
};
4141

42-
class LLVM_LIBRARY_VISIBILITY Link : public Tool {
42+
class LLVM_LIBRARY_VISIBILITY Linker : public Tool {
4343
public:
44-
Link(const ToolChain &TC) : Tool("PScpu::Link", "linker", TC) {}
44+
Linker(const ToolChain &TC) : Tool("PScpu::Linker", "linker", TC) {}
4545

4646
bool hasIntegratedCPP() const override { return false; }
4747
bool isLinkJob() const override { return true; }

0 commit comments

Comments
 (0)