1 files changed, 39 insertions, 0 deletions
diff --git a/contrib/llvm/patches/patch-r208961-clang-version-include.diff b/contrib/llvm/patches/patch-r208961-clang-version-include.diff
new file mode 100644
index 0000000..fb0ac18
--- /dev/null
+++ b/contrib/llvm/patches/patch-r208961-clang-version-include.diff
@@ -0,0 +1,39 @@
+This patch adjusts clang's default include paths to add FreeBSD-specific
+directories.
+
+Introduced here: http://svn.freebsd.org/changeset/base/208961
+
+Index: tools/clang/lib/Frontend/InitHeaderSearch.cpp
+===================================================================
+--- tools/clang/lib/Frontend/InitHeaderSearch.cpp
++++ tools/clang/lib/Frontend/InitHeaderSearch.cpp
+@@ -14,6 +14,7 @@
+ #include "clang/Frontend/Utils.h"
+ #include "clang/Basic/FileManager.h"
+ #include "clang/Basic/LangOptions.h"
++#include "clang/Basic/Version.h"
+ #include "clang/Config/config.h" // C_INCLUDE_DIRS
+ #include "clang/Lex/HeaderSearch.h"
+ #include "clang/Lex/HeaderSearchOptions.h"
+@@ -333,6 +334,9 @@ void InitHeaderSearch::AddDefaultCIncludePaths(con
+ #endif
+     }
+     break;
++  case llvm::Triple::FreeBSD:
++    AddPath("/usr/include/clang/" CLANG_VERSION_STRING, System, false);
++    break;
+       
+   default:
+     break;
+@@ -423,11 +427,6 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple
+     else
+       AddPath("/usr/include/c++/4.4", CXXSystem, false);
+     break;
+-  case llvm::Triple::FreeBSD:
+-    // FreeBSD 8.0
+-    // FreeBSD 7.3
+-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2", "", "", "", triple);
+-    break;
+   case llvm::Triple::OpenBSD: {
+     std::string t = triple.getTriple();
+     if (t.substr(0, 6) == "x86_64")