Rebased localmods in clang to 223109.

lib/Frontend/InitHeaderSearch.cpp

Index: lib/Frontend/InitHeaderSearch.cpp
diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp
index 5e89c8c4d302a0dc10c63376faca7c976885371b..aa876b5a8da5d4d2fe0b56a83694c76e48ad2060 100644
--- a/lib/Frontend/InitHeaderSearch.cpp
+++ b/lib/Frontend/InitHeaderSearch.cpp
@@ -231,6 +231,8 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
     case llvm::Triple::NetBSD:
     case llvm::Triple::OpenBSD:
     case llvm::Triple::Bitrig:
+    case llvm::Triple::NaCl:    // @LOCALMOD
+
       break;
     default:
       // FIXME: temporary hack: hard-coded paths.
@@ -340,7 +342,10 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
     break;
   }
 
-  if ( os != llvm::Triple::RTEMS )
+  // @LOCALMOD-BEGIN
+  // NaCl only uses toolchain provided headers.
+  if ( os != llvm::Triple::RTEMS && os != llvm::Triple::NaCl)
+  // @LOCALMOD-END
     AddPath("/usr/include", ExternCSystem, false);
 }