summaryrefslogtreecommitdiffstats
path: root/contrib/llvm/patches/patch-r208961-clang-version-include.diff
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2014-11-24 18:43:37 +0000
committerdim <dim@FreeBSD.org>2014-11-24 18:43:37 +0000
commit82ca21468e7fe6a5112961ba86434579bed3f204 (patch)
treec2772f1f62ff857fee7802d46eb79f45d45d6d54 /contrib/llvm/patches/patch-r208961-clang-version-include.diff
parent6148c19c738a92f344008aa3f88f4e008bada0ee (diff)
downloadFreeBSD-src-82ca21468e7fe6a5112961ba86434579bed3f204.zip
FreeBSD-src-82ca21468e7fe6a5112961ba86434579bed3f204.tar.gz
Cleanup patch set, and update README.TXT. Add three new patches.
Diffstat (limited to 'contrib/llvm/patches/patch-r208961-clang-version-include.diff')
-rw-r--r--contrib/llvm/patches/patch-r208961-clang-version-include.diff39
1 files changed, 0 insertions, 39 deletions
diff --git a/contrib/llvm/patches/patch-r208961-clang-version-include.diff b/contrib/llvm/patches/patch-r208961-clang-version-include.diff
deleted file mode 100644
index 993ecd9d..0000000
--- a/contrib/llvm/patches/patch-r208961-clang-version-include.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-This patch adjusts clang's default include paths to add FreeBSD-specific
-directories.
-
-Introduced here: http://svnweb.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")
OpenPOWER on IntegriCloud