summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2011-11-07 10:40:08 +0000
committerChandler Carruth <chandlerc@gmail.com>2011-11-07 10:40:08 +0000
commitafa0e6fb4216284ba3d1eaeeff8522f5e871bb3a (patch)
treea241d2194386644f32565e287e57c09cdc89c68c
parentc954a30696f312d13c22ff0e7c26b58e0723c558 (diff)
downloadllvm-afa0e6fb4216284ba3d1eaeeff8522f5e871bb3a.tar.gz
Merging r143873:
------------------------------------------------------------------------ r143873 | chandlerc | 2011-11-06 02:30:58 -0800 (Sun, 06 Nov 2011) | 2 lines Add a missing triple spotted by inspecting and testing of the include path triples. Also order the 32-bit triples a bit more reasonably. ------------------------------------------------------------------------ llvm-svn: 143949
-rw-r--r--clang/lib/Driver/ToolChains.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 6d848ef7aa07..4993d7950199 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -1676,10 +1676,11 @@ Linux::GCCInstallationDetector::GCCInstallationDetector(const Driver &D)
static const char *const X86LibDirs[] = { "/lib32", "/lib" };
static const char *const X86Triples[] = {
"i686-linux-gnu",
- "i386-linux-gnu",
"i686-pc-linux-gnu",
"i486-linux-gnu",
+ "i386-linux-gnu",
"i686-redhat-linux",
+ "i586-redhat-linux",
"i386-redhat-linux",
"i586-suse-linux",
"i486-slackware-linux"