diff options
Diffstat (limited to 'clang/lib/Driver/HostInfo.cpp')
| -rw-r--r-- | clang/lib/Driver/HostInfo.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
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"; } } |
