From 3246ac86dc83cac9c6a29552d3588dc7674e3dac Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Sat, 15 Dec 2018 15:21:37 +0000
Subject: [PATCH] Upgrade to LLVM 7.0.1 Release.

Avoid calling realpath unless it is actually needed (D17990).
---
 devel/llvm70/Makefile                         |  4 +--
 devel/llvm70/distinfo                         | 30 +++++++++----------
 .../files/clang/patch-head-r339019.diff       | 30 -------------------
 devel/llvm70/files/llvm-wrapper.sh.in         |  3 +-
 4 files changed, 19 insertions(+), 48 deletions(-)
 delete mode 100644 devel/llvm70/files/clang/patch-head-r339019.diff

diff --git a/devel/llvm70/Makefile b/devel/llvm70/Makefile
index f7556d6f3962..cf257382aa1d 100644
--- a/devel/llvm70/Makefile
+++ b/devel/llvm70/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	7.0.0
-PORTREVISION=	2
+DISTVERSION=	7.0.1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
diff --git a/devel/llvm70/distinfo b/devel/llvm70/distinfo
index 4c8a662a7c96..ce2756b1518a 100644
--- a/devel/llvm70/distinfo
+++ b/devel/llvm70/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1537379349
-SHA256 (llvm-7.0.0.src.tar.xz) = 8bc1f844e6cbde1b652c19c1edebc1864456fd9c78b8c1bea038e51b363fe222
-SIZE (llvm-7.0.0.src.tar.xz) = 28324368
-SHA256 (cfe-7.0.0.src.tar.xz) = 550212711c752697d2f82c648714a7221b1207fd9441543ff4aa9e3be45bba55
-SIZE (cfe-7.0.0.src.tar.xz) = 12541904
-SHA256 (compiler-rt-7.0.0.src.tar.xz) = bdec7fe3cf2c85f55656c07dfb0bd93ae46f2b3dd8f33ff3ad6e7586f4c670d6
-SIZE (compiler-rt-7.0.0.src.tar.xz) = 1815168
-SHA256 (clang-tools-extra-7.0.0.src.tar.xz) = 937c5a8c8c43bc185e4805144744799e524059cac877a44d9063926cd7a19dbe
-SIZE (clang-tools-extra-7.0.0.src.tar.xz) = 902780
-SHA256 (lld-7.0.0.src.tar.xz) = fbcf47c5e543f4cdac6bb9bbbc6327ff24217cd7eafc5571549ad6d237287f9c
-SIZE (lld-7.0.0.src.tar.xz) = 915692
-SHA256 (lldb-7.0.0.src.tar.xz) = 7ff6d8fee49977d25b3b69be7d22937b92592c7609cf283ed0dcf9e5cd80aa32
-SIZE (lldb-7.0.0.src.tar.xz) = 19403012
-SHA256 (openmp-7.0.0.src.tar.xz) = 30662b632f5556c59ee9215c1309f61de50b3ea8e89dcc28ba9a9494bba238ff
-SIZE (openmp-7.0.0.src.tar.xz) = 910680
+TIMESTAMP = 1544884573
+SHA256 (llvm-7.0.1.src.tar.xz) = a38dfc4db47102ec79dcc2aa61e93722c5f6f06f0a961073bd84b78fb949419b
+SIZE (llvm-7.0.1.src.tar.xz) = 28311056
+SHA256 (cfe-7.0.1.src.tar.xz) = a45b62dde5d7d5fdcdfa876b0af92f164d434b06e9e89b5d0b1cbc65dfe3f418
+SIZE (cfe-7.0.1.src.tar.xz) = 12488668
+SHA256 (compiler-rt-7.0.1.src.tar.xz) = 782edfc119ee172f169c91dd79f2c964fb6b248bd9b73523149030ed505bbe18
+SIZE (compiler-rt-7.0.1.src.tar.xz) = 1864520
+SHA256 (clang-tools-extra-7.0.1.src.tar.xz) = 4c93c7d2bb07923a8b272da3ef7914438080aeb693725f4fc5c19cd0e2613bed
+SIZE (clang-tools-extra-7.0.1.src.tar.xz) = 901368
+SHA256 (lld-7.0.1.src.tar.xz) = 8869aab2dd2d8e00d69943352d3166d159d7eae2615f66a684f4a0999fc74031
+SIZE (lld-7.0.1.src.tar.xz) = 912812
+SHA256 (lldb-7.0.1.src.tar.xz) = 76b46be75b412a3d22f0d26279306ae7e274fe4d7988a2184c529c38a6a76982
+SIZE (lldb-7.0.1.src.tar.xz) = 19384628
+SHA256 (openmp-7.0.1.src.tar.xz) = bf16b78a678da67d68405214ec7ee59d86a15f599855806192a75dcfca9b0d0c
+SIZE (openmp-7.0.1.src.tar.xz) = 909316
diff --git a/devel/llvm70/files/clang/patch-head-r339019.diff b/devel/llvm70/files/clang/patch-head-r339019.diff
deleted file mode 100644
index 240772d184c2..000000000000
--- a/devel/llvm70/files/clang/patch-head-r339019.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-r339019 | emaste | 2018-09-29 22:01:23 +0200 (Sat, 29 Sep 2018) | 15 lines
-
-clang: allow ifunc resolvers to accept arguments
-
-Previously Clang required ifunc resolution functions to take no
-arguments, presumably because GCC documented ifunc resolvers as taking
-no arguments.  However, GCC accepts resolvers accepting arguments, and
-our rtld passes CPU ID information (cpuid, hwcap, etc.) to ifunc
-resolvers.  Just remove the check from the in-tree compiler for our in-
-tree compiler; a different (per-OS) approach may be required upstream.
-
-Reported by:	mjg
-Approved by:	re (rgrimes)
-MFC after:	1 week
-Relnotes:	Yes
-Sponsored by:	The FreeBSD Foundation
-
-Index: tools/clang/lib/CodeGen/CodeGenModule.cpp
-===================================================================
---- tools/clang/lib/CodeGen/CodeGenModule.cpp	(revision 339018)
-+++ tools/clang/lib/CodeGen/CodeGenModule.cpp	(revision 339019)
-@@ -321,8 +321,6 @@ void CodeGenModule::checkAliases() {
-       assert(FTy);
-       if (!FTy->getReturnType()->isPointerTy())
-         Diags.Report(Location, diag::err_ifunc_resolver_return);
--      if (FTy->getNumParams())
--        Diags.Report(Location, diag::err_ifunc_resolver_params);
-     }
- 
-     llvm::Constant *Aliasee = Alias->getIndirectSymbol();
diff --git a/devel/llvm70/files/llvm-wrapper.sh.in b/devel/llvm70/files/llvm-wrapper.sh.in
index 8b5b864b38e8..dfece2c0ced9 100644
--- a/devel/llvm70/files/llvm-wrapper.sh.in
+++ b/devel/llvm70/files/llvm-wrapper.sh.in
@@ -4,7 +4,8 @@
 LLVM_PREFIX="%%LLVM_PREFIX%%"
 LLVM_SUFFIX="%%LLVM_SUFFIX%%"
 
-tool=$(/bin/realpath $0)
+tool=$0
+[ -L "$tool" ] && tool=$(/bin/realpath $tool)
 tool=${tool##*/}
 tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
 LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \