commit b37fe61e661453800f826897706b1d75f98dd7c1
author Chandler Carruth <chandlerc@gmail.com> Sun Nov 06 23:39:37 2011 +0000
committer Chandler Carruth <chandlerc@gmail.com> Sun Nov 06 23:39:37 2011 +0000
tree ccebf8110fbdcfd4aaeaeea149aa2e13d7ef75d9
parent 19347edf7809866350750a1997ec4db009832fa4

Begin lifting some of the one-off checking logic into generic helper
routines on the base toolchain class.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@143900 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/ToolChains.cpp

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 51f7b77..fec2209 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -2011,9 +2011,6 @@
     return;
 
   const llvm::Triple &TargetTriple = getTriple();
-  const llvm::Triple::ArchType TargetArch = TargetTriple.getArch();
-  bool IsTarget64Bit = (TargetArch == llvm::Triple::x86_64 ||
-                        TargetArch == llvm::Triple::ppc64);
 
   StringRef CxxIncludeRoot(CXX_INCLUDE_ROOT);
   if (!CxxIncludeRoot.empty()) {
@@ -2023,8 +2020,8 @@
 
     addLibStdCXXIncludePaths(
       CxxIncludeRoot,
-      CxxIncludeArch + (IsTarget64Bit ? CXX_INCLUDE_64BIT_DIR
-                                      : CXX_INCLUDE_32BIT_DIR),
+      CxxIncludeArch + (isTarget64Bit() ? CXX_INCLUDE_64BIT_DIR
+                                        : CXX_INCLUDE_32BIT_DIR),
       DriverArgs, CC1Args);
     return;
   }
@@ -2034,6 +2031,7 @@
   // mismatches of just bit width.
   llvm::Triple::ArchType HostArch =
     llvm::Triple(getDriver().DefaultHostTriple).getArch();
+  llvm::Triple::ArchType TargetArch = TargetTriple.getArch();
   StringRef Suffix;
   if ((HostArch == llvm::Triple::x86 && TargetArch == llvm::Triple::x86_64) ||
       (HostArch == llvm::Triple::ppc && TargetArch == llvm::Triple::ppc64))