[Differential] [Request, 27 lines] D3909: Get rid of the vendor suffix patch for clang.

[dim (Dimitry Andric)]

dim created this revision.
dim added reviewers: emaste, theraven.
dim added a subscriber: freebsd-toolchain-list.
Herald added a subscriber: imp.

REVISION SUMMARY
  Get rid of the vendor suffix patch for clang, since it is very unlikely
  that anyone has ever used the suffix (which was mostly the approximate
  datetime stamp of the import from the vendor area).  This changes the
  first line of "clang -v" output (in -current) from:
  
      FreeBSD clang version 3.7.0 (tags/RELEASE_370/final 246257) 20150906
  
  to:
  
      FreeBSD clang version 3.7.0 (tags/RELEASE_370/final 246257) (based on LLVM 3.7.0)

TEST PLAN
  There no functional change, this is purely cosmetic.

REPOSITORY
  rS FreeBSD src repository

BRANCH
  /head

REVISION DETAIL
  https://reviews.freebsd.org/D3909

AFFECTED FILES
  contrib/llvm/patches/patch-01-clang-vendor-suffix.diff
  contrib/llvm/tools/clang/lib/Basic/Version.cpp
  lib/clang/include/clang/Basic/Version.inc

CHANGE DETAILS
  diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc
  --- a/lib/clang/include/clang/Basic/Version.inc
  +++ b/lib/clang/include/clang/Basic/Version.inc
  @@ -6,6 +6,5 @@
   #define	CLANG_VERSION_PATCHLEVEL	0
   
   #define	CLANG_VENDOR			"FreeBSD "
  -#define	CLANG_VENDOR_SUFFIX		" 20150906"
   
   #define	SVN_REVISION			"246257"
  diff --git a/contrib/llvm/tools/clang/lib/Basic/Version.cpp b/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  --- a/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  +++ b/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  @@ -128,10 +128,8 @@
     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/patches/patch-01-clang-vendor-suffix.diff b/contrib/llvm/patches/patch-01-clang-vendor-suffix.diff
  --- 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
  -

EMAIL PREFERENCES
  https://reviews.freebsd.org/settings/panel/emailpreferences/

To: dim, emaste, theraven
Cc: imp, freebsd-toolchain-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D3909.9434.patch
Type: text/x-patch
Size: 2015 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-toolchain/attachments/20151015/75cd7aa1/attachment.bin>