[llvm-branch-commits] [cfe-branch] r143949 - in /cfe/branches/release_30: ./ lib/Driver/ToolChains.cpp

[Chandler Carruth]

Author: chandlerc
Date: Mon Nov  7 04:40:08 2011
New Revision: 143949

URL: http://llvm.org/viewvc/llvm-project?rev=143949&view=rev
Log:
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.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_30/   (props changed)
    cfe/branches/release_30/lib/Driver/ToolChains.cpp

Propchange: cfe/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  7 04:40:08 2011
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344-143345,143684,143686-143687,143751-143752,143798,143801,143804-143807,143822-143823,143836,143838-143842,143863,143866,143869,143871
+/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344-143345,143684,143686-143687,143751-143752,143798,143801,143804-143807,143822-143823,143836,143838-143842,143863,143866,143869,143871,143873
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_30/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_30/lib/Driver/ToolChains.cpp?rev=143949&r1=143948&r2=143949&view=diff
==============================================================================
--- cfe/branches/release_30/lib/Driver/ToolChains.cpp (original)
+++ cfe/branches/release_30/lib/Driver/ToolChains.cpp Mon Nov  7 04:40:08 2011
@@ -1676,10 +1676,11 @@
     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"