3 files changed, 32 insertions, 10 deletions

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 84e4cea3d0d..b59768d1d0c 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -1065,8 +1065,10 @@ const HostInfo *Driver::GetHostInfo(const char *Triple) const {
     Arch = "i386";
   else if (Arch == "amd64")
     Arch = "x86_64";
-  else if (Arch == "powerpc" || Arch == "Power Macintosh")
-    Arch = "ppc";
+  else if (Arch == "ppc" || Arch == "Power Macintosh")
+    Arch = "powerpc";
+  else if (Arch == "ppc64")
+    Arch = "powerpc64";
   
   if (memcmp(&OS[0], "darwin", 6) == 0)
     return createDarwinHostInfo(*this, Arch.c_str(), Platform.c_str(), 
@@ -1080,7 +1082,14 @@ const HostInfo *Driver::GetHostInfo(const char *Triple) const {
 }
 
 bool Driver::ShouldUseClangCompiler(const Compilation &C, const JobAction &JA,
-                                    const std::string &ArchName) const {
+                                    const std::string &ArchNameStr) const {
+  // FIXME: Remove this hack.
+  const char *ArchName = ArchNameStr.c_str();
+  if (ArchNameStr == "powerpc")
+    ArchName = "ppc";
+  else if (ArchNameStr == "powerpc64")
+    ArchName = "ppc64";
+
   // Check if user requested no clang, or clang doesn't understand
   // this type (we only handle single inputs for now).
   if (!CCCUseClang || JA.size() != 1 || 
diff --git a/clang/lib/Driver/HostInfo.cpp b/clang/lib/Driver/HostInfo.cpp
index 2ce06f512d1..8db18d4d38a 100644
--- a/clang/lib/Driver/HostInfo.cpp
+++ b/clang/lib/Driver/HostInfo.cpp
@@ -77,7 +77,7 @@ DarwinHostInfo::DarwinHostInfo(const Driver &D, const char *_Arch,
   : HostInfo(D, _Arch, _Platform, _OS) {
   
   assert((getArchName() == "i386" || getArchName() == "x86_64" || 
-          getArchName() == "ppc" || getArchName() == "ppc64") &&
+          getArchName() == "powerpc" || getArchName() == "powerpc64") &&
          "Unknown Darwin arch.");
 
   assert(memcmp(&getOSName()[0], "darwin", 6) == 0 &&
@@ -117,11 +117,17 @@ ToolChain *DarwinHostInfo::getToolChain(const ArgList &Args,
       if (getArchName() == "i386" || getArchName() == "x86_64") {
         ArchName = 
           (A->getOption().getId() == options::OPT_m32) ? "i386" : "x86_64";
-      } else if (getArchName() == "ppc" || getArchName() == "ppc64") {
-        ArchName = 
-          (A->getOption().getId() == options::OPT_m32) ? "ppc" : "ppc64";
+      } else if (getArchName() == "powerpc" || getArchName() == "powerpc64") {
+        ArchName = (A->getOption().getId() == options::OPT_m32) ? "powerpc" : 
+          "powerpc64";
       }
     } 
+  } else {
+    // Normalize arch name; we shouldn't be doing this here.
+    if (strcmp(ArchName, "ppc") == 0)
+      ArchName = "powerpc";
+    else if (strcmp(ArchName, "ppc64") == 0)
+      ArchName = "powerpc64";
   }
 
   ToolChain *&TC = ToolChains[ArchName];
@@ -190,9 +196,9 @@ ToolChain *UnknownHostInfo::getToolChain(const ArgList &Args,
     if (getArchName() == "i386" || getArchName() == "x86_64") {
       ArchName = 
         (A->getOption().getId() == options::OPT_m32) ? "i386" : "x86_64";
-    } else if (getArchName() == "ppc" || getArchName() == "ppc64") {
+    } else if (getArchName() == "powerpc" || getArchName() == "powerpc64") {
       ArchName = 
-        (A->getOption().getId() == options::OPT_m32) ? "ppc" : "ppc64";
+        (A->getOption().getId() == options::OPT_m32) ? "powerpc" : "powerpc64";
     }
   } 
   
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index e4fff9c8312..b8c07cc7a79 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -453,7 +453,14 @@ void gcc::Common::ConstructJob(Compilation &C, const JobAction &JA,
   // If using a driver driver, force the arch.
   if (getToolChain().getHost().useDriverDriver()) {
     CmdArgs.push_back("-arch");
-    CmdArgs.push_back(getToolChain().getArchName().c_str());
+
+    // FIXME: Remove these special cases.
+    const char *Str = getToolChain().getArchName().c_str();
+    if (strcmp(Str, "powerpc") == 0)
+      Str = "ppc";
+    else if (strcmp(Str, "powerpc64") == 0)
+      Str = "ppc64";
+    CmdArgs.push_back(Str);
   }
 
   if (Output.isPipe()) {