Skip to content

Commit

Permalink
[driver][mips] Rename some variables to better reflect their purpose.…
Browse files Browse the repository at this point in the history
… NFC

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@270367 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
atanasyan committed May 22, 2016
1 parent a815f7e commit 349ec41
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions lib/Driver/ToolChains.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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");

Expand All @@ -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)
Expand Down Expand Up @@ -2058,16 +2059,16 @@ 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;
}

// 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(); });
Expand Down

0 comments on commit 349ec41

Please sign in to comment.