summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/llvm/patches/patch-01-clang-vendor-suffix.diff22
-rw-r--r--contrib/llvm/tools/clang/lib/Basic/Version.cpp4
2 files changed, 1 insertions, 25 deletions
diff --git a/contrib/llvm/patches/patch-01-clang-vendor-suffix.diff b/contrib/llvm/patches/patch-01-clang-vendor-suffix.diff
deleted file mode 100644
index f94b9f3..0000000
--- a/contrib/llvm/patches/patch-01-clang-vendor-suffix.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-This patch adds a FreeBSD-specific suffix to clang's version string. This is
-usually of the form "(yyyyddmm)", representing the date when the compiler was
-last updated.
-
-Introduced here: http://svnweb.freebsd.org/changeset/base/209107
-
-Index: tools/clang/lib/Basic/Version.cpp
-===================================================================
---- tools/clang/lib/Basic/Version.cpp
-+++ tools/clang/lib/Basic/Version.cpp
-@@ -128,8 +128,10 @@ std::string getClangToolFullVersion(StringRef Tool
- OS << ToolName << " version " CLANG_VERSION_STRING " "
- << getClangFullRepositoryVersion();
-
-+#ifdef CLANG_VENDOR_SUFFIX
-+ OS << CLANG_VENDOR_SUFFIX;
-+#elif defined(CLANG_VENDOR)
- // If vendor supplied, include the base LLVM version as well.
--#ifdef CLANG_VENDOR
- OS << " (based on " << BACKEND_PACKAGE_STRING << ")";
- #endif
-
diff --git a/contrib/llvm/tools/clang/lib/Basic/Version.cpp b/contrib/llvm/tools/clang/lib/Basic/Version.cpp
index 6accb04..a1a67c2 100644
--- a/contrib/llvm/tools/clang/lib/Basic/Version.cpp
+++ b/contrib/llvm/tools/clang/lib/Basic/Version.cpp
@@ -128,10 +128,8 @@ std::string getClangToolFullVersion(StringRef ToolName) {
OS << ToolName << " version " CLANG_VERSION_STRING " "
<< getClangFullRepositoryVersion();
-#ifdef CLANG_VENDOR_SUFFIX
- OS << CLANG_VENDOR_SUFFIX;
-#elif defined(CLANG_VENDOR)
// If vendor supplied, include the base LLVM version as well.
+#ifdef CLANG_VENDOR
OS << " (based on " << BACKEND_PACKAGE_STRING << ")";
#endif
OpenPOWER on IntegriCloud