[llvm-branch-commits] [cfe-branch] r143433 - in /cfe/branches/release_30: ./ lib/Frontend/InitHeaderSearch.cpp test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Mon Oct 31 23:12:17 2011
New Revision: 143433

URL: http://llvm.org/viewvc/llvm-project?rev=143433&view=rev
Log:
Merging r143345:
------------------------------------------------------------------------
r143345 | chandlerc | 2011-10-31 01:42:27 -0700 (Mon, 31 Oct 2011) | 7 lines

Add "just one more" include path to the monstrosity that is our header
search logic. The Debian multiarch seems to have completely changed from
when these were originally added, and I'd like to remove a bunch of
them, but I'll be lazy and delay that until this logic is hoisted into
the driver where it belongs.

This should resolve PR11223.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_30/   (props changed)
    cfe/branches/release_30/lib/Frontend/InitHeaderSearch.cpp
    cfe/branches/release_30/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 31 23:12:17 2011
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344
+/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344-143345
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_30/lib/Frontend/InitHeaderSearch.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_30/lib/Frontend/InitHeaderSearch.cpp?rev=143433&r1=143432&r2=143433&view=diff
==============================================================================
--- cfe/branches/release_30/lib/Frontend/InitHeaderSearch.cpp (original)
+++ cfe/branches/release_30/lib/Frontend/InitHeaderSearch.cpp Mon Oct 31 23:12:17 2011
@@ -566,6 +566,7 @@
       AddPath("/usr/include/x86_64-linux-gnu/32", System, false, false, false);
       AddPath("/usr/include/i686-linux-gnu", System, false, false, false);
       AddPath("/usr/include/i486-linux-gnu", System, false, false, false);
+      AddPath("/usr/include/i386-linux-gnu", System, false, false, false);
     } else if (triple.getArch() == llvm::Triple::arm) {
       AddPath("/usr/include/arm-linux-gnueabi", System, false, false, false);
     }

Propchange: cfe/branches/release_30/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 31 23:12:17 2011
@@ -1,2 +1,2 @@
 /cfe/branches/type-system-rewrite/test/SemaCXX/warn-unreachable.cpp:134693-134817
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,142113,142133-142134,142187,142349,142474,142476,142918,143344
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,142113,142133-142134,142187,142349,142474,142476,142918,143344-143345