Date: Thu, 15 Oct 2015 20:11:29 +0000 From: "dim (Dimitry Andric)" <phabric-noreply@FreeBSD.org> To: freebsd-toolchain@freebsd.org Subject: [Differential] [Request, 27 lines] D3909: Get rid of the vendor suffix patch for clang. Message-ID: <differential-rev-PHID-DREV-resyxh5rgmr5c6iekey4-req@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
--b1_b71a8b0fac0bd82e2ccfbb5b31133d6e
Content-Type: text/plain; charset = "utf-8"
Content-Transfer-Encoding: 8bit
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
--b1_b71a8b0fac0bd82e2ccfbb5b31133d6e
Content-Type: text/x-patch; charset=utf-8; name="D3909.9434.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="D3909.9434.patch"
ZGlmZiAtLWdpdCBhL2xpYi9jbGFuZy9pbmNsdWRlL2NsYW5nL0Jhc2ljL1ZlcnNpb24uaW5jIGIv
bGliL2NsYW5nL2luY2x1ZGUvY2xhbmcvQmFzaWMvVmVyc2lvbi5pbmMKLS0tIGEvbGliL2NsYW5n
L2luY2x1ZGUvY2xhbmcvQmFzaWMvVmVyc2lvbi5pbmMKKysrIGIvbGliL2NsYW5nL2luY2x1ZGUv
Y2xhbmcvQmFzaWMvVmVyc2lvbi5pbmMKQEAgLTYsNiArNiw1IEBACiAjZGVmaW5lCUNMQU5HX1ZF
UlNJT05fUEFUQ0hMRVZFTAkwCiAKICNkZWZpbmUJQ0xBTkdfVkVORE9SCQkJIkZyZWVCU0QgIgot
I2RlZmluZQlDTEFOR19WRU5ET1JfU1VGRklYCQkiIDIwMTUwOTA2IgogCiAjZGVmaW5lCVNWTl9S
RVZJU0lPTgkJCSIyNDYyNTciCmRpZmYgLS1naXQgYS9jb250cmliL2xsdm0vdG9vbHMvY2xhbmcv
bGliL0Jhc2ljL1ZlcnNpb24uY3BwIGIvY29udHJpYi9sbHZtL3Rvb2xzL2NsYW5nL2xpYi9CYXNp
Yy9WZXJzaW9uLmNwcAotLS0gYS9jb250cmliL2xsdm0vdG9vbHMvY2xhbmcvbGliL0Jhc2ljL1Zl
cnNpb24uY3BwCisrKyBiL2NvbnRyaWIvbGx2bS90b29scy9jbGFuZy9saWIvQmFzaWMvVmVyc2lv
bi5jcHAKQEAgLTEyOCwxMCArMTI4LDggQEAKICAgT1MgPDwgVG9vbE5hbWUgPDwgIiB2ZXJzaW9u
ICIgQ0xBTkdfVkVSU0lPTl9TVFJJTkcgIiAiCiAgICAgIDw8IGdldENsYW5nRnVsbFJlcG9zaXRv
cnlWZXJzaW9uKCk7CiAKLSNpZmRlZiBDTEFOR19WRU5ET1JfU1VGRklYCi0gIE9TIDw8IENMQU5H
X1ZFTkRPUl9TVUZGSVg7Ci0jZWxpZiBkZWZpbmVkKENMQU5HX1ZFTkRPUikKICAgLy8gSWYgdmVu
ZG9yIHN1cHBsaWVkLCBpbmNsdWRlIHRoZSBiYXNlIExMVk0gdmVyc2lvbiBhcyB3ZWxsLgorI2lm
ZGVmIENMQU5HX1ZFTkRPUgogICBPUyA8PCAiIChiYXNlZCBvbiAiIDw8IEJBQ0tFTkRfUEFDS0FH
RV9TVFJJTkcgPDwgIikiOwogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL2NvbnRyaWIvbGx2bS9wYXRj
aGVzL3BhdGNoLTAxLWNsYW5nLXZlbmRvci1zdWZmaXguZGlmZiBiL2NvbnRyaWIvbGx2bS9wYXRj
aGVzL3BhdGNoLTAxLWNsYW5nLXZlbmRvci1zdWZmaXguZGlmZgotLS0gYS9jb250cmliL2xsdm0v
cGF0Y2hlcy9wYXRjaC0wMS1jbGFuZy12ZW5kb3Itc3VmZml4LmRpZmYKKysrIC9kZXYvbnVsbApA
QCAtMSwyMiArMCwwIEBACi1UaGlzIHBhdGNoIGFkZHMgYSBGcmVlQlNELXNwZWNpZmljIHN1ZmZp
eCB0byBjbGFuZydzIHZlcnNpb24gc3RyaW5nLiAgVGhpcyBpcwotdXN1YWxseSBvZiB0aGUgZm9y
bSAiKHl5eXlkZG1tKSIsIHJlcHJlc2VudGluZyB0aGUgZGF0ZSB3aGVuIHRoZSBjb21waWxlciB3
YXMKLWxhc3QgdXBkYXRlZC4KLQotSW50cm9kdWNlZCBoZXJlOiBodHRwOi8vc3Zud2ViLmZyZWVi
c2Qub3JnL2NoYW5nZXNldC9iYXNlLzIwOTEwNwotCi1JbmRleDogdG9vbHMvY2xhbmcvbGliL0Jh
c2ljL1ZlcnNpb24uY3BwCi09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLS0gdG9vbHMvY2xhbmcvbGliL0Jhc2ljL1Zl
cnNpb24uY3BwCi0rKysgdG9vbHMvY2xhbmcvbGliL0Jhc2ljL1ZlcnNpb24uY3BwCi1AQCAtMTI4
LDggKzEyOCwxMCBAQCBzdGQ6OnN0cmluZyBnZXRDbGFuZ1Rvb2xGdWxsVmVyc2lvbihTdHJpbmdS
ZWYgVG9vbAotICAgT1MgPDwgVG9vbE5hbWUgPDwgIiB2ZXJzaW9uICIgQ0xBTkdfVkVSU0lPTl9T
VFJJTkcgIiAiCi0gICAgICA8PCBnZXRDbGFuZ0Z1bGxSZXBvc2l0b3J5VmVyc2lvbigpOwotIAot
KyNpZmRlZiBDTEFOR19WRU5ET1JfU1VGRklYCi0rICBPUyA8PCBDTEFOR19WRU5ET1JfU1VGRklY
OwotKyNlbGlmIGRlZmluZWQoQ0xBTkdfVkVORE9SKQotICAgLy8gSWYgdmVuZG9yIHN1cHBsaWVk
LCBpbmNsdWRlIHRoZSBiYXNlIExMVk0gdmVyc2lvbiBhcyB3ZWxsLgotLSNpZmRlZiBDTEFOR19W
RU5ET1IKLSAgIE9TIDw8ICIgKGJhc2VkIG9uICIgPDwgQkFDS0VORF9QQUNLQUdFX1NUUklORyA8
PCAiKSI7Ci0gI2VuZGlmCi0gCgo=
--b1_b71a8b0fac0bd82e2ccfbb5b31133d6e--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?differential-rev-PHID-DREV-resyxh5rgmr5c6iekey4-req>