[llvm-branch-commits] [cfe-branch] r105042 - /cfe/branches/Apple/whitney/lib/Frontend/InitHeaderSearch.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Fri May 28 18:07:00 2010
New Revision: 105042

URL: http://llvm.org/viewvc/llvm-project?rev=105042&view=rev
Log:
Merge r104921:
--
Author: Daniel Dunbar <daniel at zuster.org>
Date:   Fri May 28 01:54:31 2010 +0000

    Frontend: Sprinkle in some C++ header paths for ARM/Darwin. Also, don't add x86
    paths on non-x86.

    I really detest this file.

Modified:
    cfe/branches/Apple/whitney/lib/Frontend/InitHeaderSearch.cpp

Modified: cfe/branches/Apple/whitney/lib/Frontend/InitHeaderSearch.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Frontend/InitHeaderSearch.cpp?rev=105042&r1=105041&r2=105042&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Frontend/InitHeaderSearch.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Frontend/InitHeaderSearch.cpp Fri May 28 18:07:00 2010
@@ -559,10 +559,25 @@
     AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.3.0");
     break;
   case llvm::Triple::Darwin:
-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
-                                "i686-apple-darwin10", "", "x86_64", triple);
-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
-                                "i686-apple-darwin8", "", "", triple);
+    switch (triple.getArch()) {
+    default: break;
+
+    case llvm::Triple::x86:
+    case llvm::Triple::x86_64:
+      AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
+                                  "i686-apple-darwin10", "", "x86_64", triple);
+      AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
+                                  "i686-apple-darwin8", "", "", triple);
+      break;
+
+    case llvm::Triple::arm:
+    case llvm::Triple::thumb:
+      AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
+                                  "arm-apple-darwin10", "v7", "", triple);
+      AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
+                                  "arm-apple-darwin10", "v6", "", triple);
+      break;
+    }
     break;
   case llvm::Triple::DragonFly:
     AddPath("/usr/include/c++/4.1", System, true, false, false);