summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Atanasyan <simon@atanasyan.com>2016-05-22 15:27:58 +0000
committerSimon Atanasyan <simon@atanasyan.com>2016-05-22 15:27:58 +0000
commitcf7ac67f692e11dac3089d4bd69a9f001fb3fa9b (patch)
treea40c1616f9f58399ac530c93e8abe720ee02edd4
parent74468a5bc963286ce126bc581addadd0fd3cd9eb (diff)
downloadbcm5719-llvm-cf7ac67f692e11dac3089d4bd69a9f001fb3fa9b.tar.gz
bcm5719-llvm-cf7ac67f692e11dac3089d4bd69a9f001fb3fa9b.zip
[driver][mips] Rename some variables to better reflect their purpose. NFC
llvm-svn: 270367
-rw-r--r--clang/lib/Driver/ToolChains.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index dcad0cddb55..2871249e896 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -1865,8 +1865,8 @@ static bool findMIPSMultilibs(const Driver &D, const llvm::Triple &TargetTriple,
FilterNonExistent NonExistent(Path, D.getVFS());
- // Check for FSF toolchain multilibs
- MultilibSet FSFMipsMultilibs;
+ // Check for CodeScape MTI toolchain v1.2 and early.
+ MultilibSet MtiMipsMultilibsV1;
{
auto MArchMips32 = makeMultilib("/mips32")
.flag("+m32")
@@ -1908,7 +1908,7 @@ static bool findMIPSMultilibs(const Driver &D, const llvm::Triple &TargetTriple,
auto Nan2008 = makeMultilib("/nan2008").flag("+mnan=2008");
- FSFMipsMultilibs =
+ MtiMipsMultilibsV1 =
MultilibSet()
.Either(MArchMips32, MArchMicroMips, MArchMips64r2, MArchMips64,
MArchDefault)
@@ -1984,7 +1984,8 @@ static bool findMIPSMultilibs(const Driver &D, const llvm::Triple &TargetTriple,
MultilibSet().Either(M32, M64, MAbiN32).FilterOut(NonExistent);
}
- MultilibSet ImgMultilibs;
+ // Check for CodeScape IMG toolchain v1.2 and early.
+ MultilibSet ImgMultilibsV1;
{
auto Mips64r6 = makeMultilib("/mips64r6").flag("+m64").flag("-m32");
@@ -1993,7 +1994,7 @@ static bool findMIPSMultilibs(const Driver &D, const llvm::Triple &TargetTriple,
auto MAbi64 =
makeMultilib("/64").flag("+mabi=n64").flag("-mabi=n32").flag("-m32");
- ImgMultilibs =
+ ImgMultilibsV1 =
MultilibSet()
.Maybe(Mips64r6)
.Maybe(MAbi64)
@@ -2058,8 +2059,8 @@ static bool findMIPSMultilibs(const Driver &D, const llvm::Triple &TargetTriple,
TargetTriple.getOS() == llvm::Triple::Linux &&
TargetTriple.getEnvironment() == llvm::Triple::GNU) {
// Select mips-img-linux-gnu toolchain.
- if (ImgMultilibs.select(Flags, Result.SelectedMultilib)) {
- Result.Multilibs = ImgMultilibs;
+ if (ImgMultilibsV1.select(Flags, Result.SelectedMultilib)) {
+ Result.Multilibs = ImgMultilibsV1;
return true;
}
return false;
@@ -2067,7 +2068,7 @@ static bool findMIPSMultilibs(const Driver &D, const llvm::Triple &TargetTriple,
// Sort candidates. Toolchain that best meets the directories goes first.
// Then select the first toolchains matches command line flags.
- MultilibSet *candidates[] = {&DebianMipsMultilibs, &FSFMipsMultilibs};
+ MultilibSet *candidates[] = {&DebianMipsMultilibs, &MtiMipsMultilibsV1};
std::sort(
std::begin(candidates), std::end(candidates),
[](MultilibSet *a, MultilibSet *b) { return a->size() > b->size(); });
OpenPOWER on IntegriCloud