[cfe-commits] r150358 - /cfe/trunk/lib/Driver/ToolChains.cpp
Chandler Carruth
chandlerc at gmail.com
Sun Feb 12 18:02:10 PST 2012
Author: chandlerc
Date: Sun Feb 12 20:02:09 2012
New Revision: 150358
URL: http://llvm.org/viewvc/llvm-project?rev=150358&view=rev
Log:
Delete a simplistic helper function now that llvm::Triple can provide
this functionality.
Modified:
cfe/trunk/lib/Driver/ToolChains.cpp
Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=150358&r1=150357&r2=150358&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Sun Feb 12 20:02:09 2012
@@ -1091,18 +1091,6 @@
return false;
}
-// FIXME: Factor this helper into llvm::Triple itself.
-static llvm::Triple getMultiarchAlternateTriple(llvm::Triple Triple) {
- switch (Triple.getArch()) {
- default: break;
- case llvm::Triple::x86: Triple.setArchName("x86_64"); break;
- case llvm::Triple::x86_64: Triple.setArchName("i386"); break;
- case llvm::Triple::ppc: Triple.setArchName("powerpc64"); break;
- case llvm::Triple::ppc64: Triple.setArchName("powerpc"); break;
- }
- return Triple;
-}
-
/// \brief Construct a GCCInstallationDetector from the driver.
///
/// This performs all of the autodetection and sets up the various paths.
@@ -1116,7 +1104,9 @@
const Driver &D,
const llvm::Triple &TargetTriple)
: IsValid(false) {
- llvm::Triple MultiarchTriple = getMultiarchAlternateTriple(TargetTriple);
+ llvm::Triple MultiarchTriple
+ = TargetTriple.isArch32Bit() ? TargetTriple.get64BitArchVariant()
+ : TargetTriple.get32BitArchVariant();
llvm::Triple::ArchType TargetArch = TargetTriple.getArch();
// The library directories which may contain GCC installations.
SmallVector<StringRef, 4> CandidateLibDirs, CandidateMultiarchLibDirs;
More information about the cfe-commits
mailing list