[cfe-commits] r150602 - in /cfe/trunk/lib: Driver/Tools.cpp Frontend/InitHeaderSearch.cpp

[David Chisnall]

Author: theraven
Date: Wed Feb 15 12:24:31 2012
New Revision: 150602

URL: http://llvm.org/viewvc/llvm-project?rev=150602&view=rev
Log:
Add some Solaris include paths and fix a -lgcc_eh that apparently should be -lgcc_s.


Modified:
    cfe/trunk/lib/Driver/Tools.cpp
    cfe/trunk/lib/Frontend/InitHeaderSearch.cpp

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=150602&r1=150601&r2=150602&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Wed Feb 15 12:24:31 2012
@@ -4271,7 +4271,7 @@
   if (!Args.hasArg(options::OPT_nostdlib) &&
       !Args.hasArg(options::OPT_nodefaultlibs)) {
     CmdArgs.push_back("-lgcc");
-    CmdArgs.push_back("-lgcc_eh");
+    CmdArgs.push_back("-lgcc_s");
     if (!Args.hasArg(options::OPT_shared))
       CmdArgs.push_back("-lc");
 

Modified: cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitHeaderSearch.cpp?rev=150602&r1=150601&r2=150602&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/InitHeaderSearch.cpp (original)
+++ cfe/trunk/lib/Frontend/InitHeaderSearch.cpp Wed Feb 15 12:24:31 2012
@@ -415,6 +415,15 @@
                                 "", "", "", triple);
     break;
   case llvm::Triple::Solaris:
+    AddGnuCPlusPlusIncludePaths("/usr/gcc/4.5/include/c++/4.5.2/",
+                                "i386-pc-solaris2.11", "", "", triple);
+    AddGnuCPlusPlusIncludePaths(
+        "/usr/gcc/4.5/lib/gcc/i386-pc-solaris2.11/4.5.2/include",
+        "", "", "", triple);
+    AddGnuCPlusPlusIncludePaths(
+        "/usr/gcc/4.5/lib/gcc/i386-pc-solaris2.11/4.5.2/include-fixed",
+        "", "", "", triple);
+
     // Solaris - Fall though..
   case llvm::Triple::AuroraUX:
     // AuroraUX