PR4308: Fix support for -m32/-m64 on Linux.

I'll look into cleaning this up a bit as a followup.

llvm-svn: 72794

2 files changed, 23 insertions, 8 deletions

diff --git a/clang/include/clang/Driver/HostInfo.h b/clang/include/clang/Driver/HostInfo.h
index 020bb3ab5a8..3485f5fbfd7 100644
--- a/clang/include/clang/Driver/HostInfo.h
+++ b/clang/include/clang/Driver/HostInfo.h
@@ -28,10 +28,10 @@ namespace driver {
 /// being run from. For testing purposes, the HostInfo used by the
 /// driver may differ from the actual host.
 class HostInfo {
+protected:
   const Driver &TheDriver;
   const llvm::Triple Triple;
 
-protected:
   HostInfo(const Driver &D, const llvm::Triple &_Triple);
 
 public:
diff --git a/clang/lib/Driver/HostInfo.cpp b/clang/lib/Driver/HostInfo.cpp
index 603b3ab230f..2d577f82fd4 100644
--- a/clang/lib/Driver/HostInfo.cpp
+++ b/clang/lib/Driver/HostInfo.cpp
@@ -194,11 +194,13 @@ ToolChain *UnknownHostInfo::getToolChain(const ArgList &Args,
   std::string Arch = getArchName();
   ArchName = Arch.c_str();
   if (Arg *A = Args.getLastArg(options::OPT_m32, options::OPT_m64)) {
-    if (getArchName() == "i386" || getArchName() == "x86_64") {
-      ArchName = 
+    if (Triple.getArch() == llvm::Triple::x86 ||
+        Triple.getArch() == llvm::Triple::x86_64) {
+      ArchName =
         (A->getOption().getId() == options::OPT_m32) ? "i386" : "x86_64";
-    } else if (getArchName() == "powerpc" || getArchName() == "powerpc64") {
-      ArchName = 
+    } else if (Triple.getArch() == llvm::Triple::ppc ||
+               Triple.getArch() == llvm::Triple::ppc64) {
+      ArchName =
         (A->getOption().getId() == options::OPT_m32) ? "powerpc" : "powerpc64";
     }
   } 
@@ -361,13 +363,26 @@ ToolChain *LinuxHostInfo::getToolChain(const ArgList &Args,
   assert(!ArchName && 
          "Unexpected arch name on platform without driver driver support.");
 
-  ArchName = getArchName().c_str();
-  
+  // Automatically handle some instances of -m32/-m64 we know about.
+  std::string Arch = getArchName();
+  ArchName = Arch.c_str();
+  if (Arg *A = Args.getLastArg(options::OPT_m32, options::OPT_m64)) {
+    if (Triple.getArch() == llvm::Triple::x86 ||
+        Triple.getArch() == llvm::Triple::x86_64) {
+      ArchName =
+        (A->getOption().getId() == options::OPT_m32) ? "i386" : "x86_64";
+    } else if (Triple.getArch() == llvm::Triple::ppc ||
+               Triple.getArch() == llvm::Triple::ppc64) {
+      ArchName =
+        (A->getOption().getId() == options::OPT_m32) ? "powerpc" : "powerpc64";
+    }
+  }
+
   ToolChain *&TC = ToolChains[ArchName];
 
   if (!TC) {
     llvm::Triple TCTriple(getTriple());
-    TCTriple.setArchName(getArchName());
+    TCTriple.setArchName(ArchName);
 
     TC = new toolchains::Linux(*this, TCTriple);
   }