Rebased localmods in clang to 223109.

lib/Frontend/InitHeaderSearch.cpp

 //===--- InitHeaderSearch.cpp - Initialize header search paths ------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the InitHeaderSearch class.
@@ skipping 213 matching lines @@
 void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
                                             const HeaderSearchOptions &HSOpts) {
   llvm::Triple::OSType os = triple.getOS();
 
   if (HSOpts.UseStandardSystemIncludes) {
     switch (os) {
     case llvm::Triple::FreeBSD:
     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.
       AddPath("/usr/local/include", System, false);
       break;
     }
   }
 
   // Builtin includes use #include_next directives and should be positioned
   // just prior C include dirs.
@@ skipping 89 matching lines @@
 #if defined(LLVM_ON_WIN32)
       AddPath("c:/mingw/include", System, false); 
 #endif
       break;
     }
     break;
   default:
     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);
 }
 
 void InitHeaderSearch::
 AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOptions &HSOpts) {
   llvm::Triple::OSType os = triple.getOS();
   // FIXME: temporary hack: hard-coded paths.
 
   if (triple.isOSDarwin()) {
     switch (triple.getArch()) {
@@ skipping 344 matching lines @@
   if (HSOpts.UseBuiltinIncludes) {
     // Set up the builtin include directory in the module map.
     SmallString<128> P = StringRef(HSOpts.ResourceDir);
     llvm::sys::path::append(P, "include");
     if (const DirectoryEntry *Dir = HS.getFileMgr().getDirectory(P.str()))
       HS.getModuleMap().setBuiltinIncludeDir(Dir);
   }
 
   Init.Realize(Lang);
 }