Use seperate usr/lib and usr/include directories for i686-nacl

lib/Driver/ToolChains.cpp

 //===--- ToolChains.cpp - ToolChain Implementations -----------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "ToolChains.h"
@@ skipping 2406 matching lines @@
 
   // Path for tools (clang, ld, etc..)
   std::string ProgPath(getDriver().Dir + "/../");
 
   // Path for toolchain libraries (libgcc.a, ...)
   std::string ToolPath(getDriver().ResourceDir + "/lib/");
 
   switch(Triple.getArch()) {
     case llvm::Triple::x86: {
       file_paths.push_back(FilePath + "x86_64-nacl/lib32");
-      file_paths.push_back(FilePath + "x86_64-nacl/usr/lib32");
+      file_paths.push_back(FilePath + "i686-nacl/usr/lib");
       prog_paths.push_back(ProgPath + "x86_64-nacl/bin");
       file_paths.push_back(ToolPath + "i686-nacl");
       break;
     }
     case llvm::Triple::x86_64: {
       file_paths.push_back(FilePath + "x86_64-nacl/lib");
       file_paths.push_back(FilePath + "x86_64-nacl/usr/lib");
       prog_paths.push_back(ProgPath + "x86_64-nacl/bin");
       file_paths.push_back(ToolPath + "x86_64-nacl");
       break;
@@ skipping 26 matching lines @@
     addSystemInclude(DriverArgs, CC1Args, P.str());
   }
 
   if (DriverArgs.hasArg(options::OPT_nostdlibinc))
     return;
 
   SmallString<128> P(D.Dir + "/../");
   if (getTriple().getArch() == llvm::Triple::arm) {
     llvm::sys::path::append(P, "arm-nacl/usr/include");
   } else if (getTriple().getArch() == llvm::Triple::x86) {
-    llvm::sys::path::append(P, "x86_64-nacl/usr/include");
+    llvm::sys::path::append(P, "i686-nacl/usr/include");
   } else if (getTriple().getArch() == llvm::Triple::x86_64) {
     llvm::sys::path::append(P, "x86_64-nacl/usr/include");
   } else {
     return;
   }
 
   addSystemInclude(DriverArgs, CC1Args, P.str());
   llvm::sys::path::remove_filename(P);
   llvm::sys::path::remove_filename(P);
   llvm::sys::path::append(P, "include");

[jvoung (off chromium), 2015/02/27 17:13:35]

This would have been x86_64-nacl/include, via the "x86_64-nacl/usr/include"
above.

Now it's changed to i686/include.

[Derek Schuff, 2015/02/27 17:51:56]

you're right. this also breaks the src/clang/test/Driver/nacl-direct.c test
(because it was not updated).
So yeah we should just revert it for now.

   addSystemInclude(DriverArgs, CC1Args, P.str());
 }
 
 void NaCl_TC::AddCXXStdlibLibArgs(const ArgList &Args,
                                     ArgStringList &CmdArgs) const {
   // Allow and ignore -stdlib=libc++ without warning, but not libstdc++
   GetCXXStdlibType(Args);
   CmdArgs.push_back("-lc++");
 }
 
@@ skipping 1253 matching lines @@
     StringRef(cl_include_dir).split(Dirs, StringRef(EnvPathSeparatorStr));
     ArrayRef<StringRef> DirVec(Dirs);
     addSystemIncludes(DriverArgs, CC1Args, DirVec);
   }
 }
 
 void XCore::AddCXXStdlibLibArgs(const ArgList &Args,
                                 ArgStringList &CmdArgs) const {
   // We don't output any lib args. This is handled by xcc.
 }