Begin refactoring to use the newly added triple predicates for
simplicity. Also addresses a FIXME, although not one that could be
observed.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@150294 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 716e78d..00f8c1b 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -2001,12 +2001,7 @@
// to the link paths.
path_list &Paths = getFilePaths();
- const bool Is32Bits = (Arch == llvm::Triple::x86 ||
- Arch == llvm::Triple::mips ||
- Arch == llvm::Triple::mipsel ||
- Arch == llvm::Triple::ppc);
-
- const std::string Multilib = Is32Bits ? "lib32" : "lib64";
+ const std::string Multilib = Triple.isArch32Bit() ? "lib32" : "lib64";
const std::string MultiarchTriple = getMultiarchTriple(Triple, SysRoot);
// Add the multilib suffixed paths where they are available.
diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
index 071a367..c454db5 100644
--- a/lib/Driver/ToolChains.h
+++ b/lib/Driver/ToolChains.h
@@ -134,13 +134,10 @@
/// @{
/// \brief Check whether the target triple's architecture is 64-bits.
- bool isTarget64Bit() const {
- return (getTriple().getArch() == llvm::Triple::x86_64 ||
- getTriple().getArch() == llvm::Triple::ppc64);
- }
+ bool isTarget64Bit() const { return getTriple().isArch64Bit(); }
+
/// \brief Check whether the target triple's architecture is 32-bits.
- /// FIXME: This should likely do more than just negate the 64-bit query.
- bool isTarget32Bit() const { return !isTarget64Bit(); }
+ bool isTarget32Bit() const { return getTriple().isArch32Bit(); }
/// @}
};