From owner-svn-src-projects@freebsd.org  Wed Dec 30 16:42:10 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E480EA55DC7
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 30 Dec 2015 16:42:10 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B80BB11C0;
 Wed, 30 Dec 2015 16:42:10 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBUGg9HS041499;
 Wed, 30 Dec 2015 16:42:09 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBUGg9p8041498;
 Wed, 30 Dec 2015 16:42:09 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201512301642.tBUGg9p8041498@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 30 Dec 2015 16:42:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r292952 - in projects/clang380-import/contrib/llvm:
 patches tools/clang/lib/Basic
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Dec 2015 16:42:11 -0000

Author: dim
Date: Wed Dec 30 16:42:09 2015
New Revision: 292952
URL: https://svnweb.freebsd.org/changeset/base/292952

Log:
  Drop the clang patch which added a custom vendor suffix to the version
  printed with -v.  We have historically put a date stamp there (roughly
  corresponding to the date of import), but this has never been used for
  anything, and the patch has also never been upstreamed, so let's get rid
  of it now.

Deleted:
  projects/clang380-import/contrib/llvm/patches/patch-01-clang-vendor-suffix.diff
Modified:
  projects/clang380-import/contrib/llvm/tools/clang/lib/Basic/Version.cpp

Modified: projects/clang380-import/contrib/llvm/tools/clang/lib/Basic/Version.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/tools/clang/lib/Basic/Version.cpp	Wed Dec 30 16:20:24 2015	(r292951)
+++ projects/clang380-import/contrib/llvm/tools/clang/lib/Basic/Version.cpp	Wed Dec 30 16:42:09 2015	(r292952)
@@ -128,10 +128,8 @@ std::string getClangToolFullVersion(Stri
   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