Skip to content

Commit 26c854f

Browse files
committed
Rename isARMBareMetal -> isArmEABIBareMetal
To make it clearer what the fn is testing for.
1 parent b972b8b commit 26c854f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

clang/lib/Driver/ToolChains/BareMetal.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ namespace clang {
132132
namespace driver {
133133
namespace toolchains {
134134
/// Is the triple {arm,armeb,thumb,thumbeb}-none-none-{eabi,eabihf} ?
135-
bool isARMBareMetal(const llvm::Triple &Triple) {
135+
bool isARMEABIBareMetal(const llvm::Triple &Triple) {
136136
auto arch = Triple.getArch();
137137
if (arch != llvm::Triple::arm && arch != llvm::Triple::thumb &&
138138
arch != llvm::Triple::armeb && arch != llvm::Triple::thumbeb)
@@ -272,7 +272,7 @@ void BareMetal::findMultilibs(const Driver &D, const llvm::Triple &Triple,
272272
}
273273

274274
bool BareMetal::handlesTarget(const llvm::Triple &Triple) {
275-
return isARMBareMetal(Triple) || isAArch64BareMetal(Triple) ||
275+
return isARMEABIBareMetal(Triple) || isAArch64BareMetal(Triple) ||
276276
isRISCVBareMetal(Triple) || isPPCBareMetal(Triple);
277277
}
278278

@@ -566,7 +566,7 @@ void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA,
566566
// The R_ARM_TARGET2 relocation must be treated as R_ARM_REL32 on arm*-*-elf
567567
// and arm*-*-eabi (the default is R_ARM_GOT_PREL, used on arm*-*-linux and
568568
// arm*-*-*bsd).
569-
if (isARMBareMetal(TC.getTriple()))
569+
if (isARMEABIBareMetal(TC.getTriple()))
570570
CmdArgs.push_back("--target2=rel");
571571

572572
CmdArgs.push_back("-o");

clang/lib/Driver/ToolChains/BareMetal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace driver {
1919

2020
namespace toolchains {
2121

22-
bool isARMBareMetal(const llvm::Triple &Triple);
22+
bool isARMEABIBareMetal(const llvm::Triple &Triple);
2323

2424
class LLVM_LIBRARY_VISIBILITY BareMetal : public ToolChain {
2525
public:

clang/lib/Driver/ToolChains/CommonArgs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ static bool useFramePointerForTargetByDefault(const llvm::opt::ArgList &Args,
152152
}
153153
}
154154

155-
if (toolchains::isARMBareMetal(Triple))
155+
if (toolchains::isARMEABIBareMetal(Triple))
156156
return false;
157157

158158
return true;

0 commit comments

Comments
 (0)