summaryrefslogtreecommitdiffstats
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
commit582498ad913d9842fb0fa89697468deebd35dd75 (patch)
tree8d868adc902d74eb5a1014d805845f9d4f04bbce
parentb8d7780ce366cb6d62180b2ee4fda3419f037477 (diff)
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. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_30@143949 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Driver/ToolChains.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 6d848ef7aa..4993d79501 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/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"