4 files changed, 104 insertions, 23 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index a6fb72a03af2..81162e6e6af9 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -32,11 +32,15 @@ GH_TAGNAME=	${LLVM_COMMIT}
 .include "Makefile.snapshot"
 
 OPTIONS_DEFINE=	CLANG DOCS EXTRAS GOLD LIT LLD LLDB
-OPTIONS_DEFINE_amd64=	OPENMP
+OPTIONS_DEFINE_amd64=	COMPILER_RT OPENMP
+OPTIONS_DEFINE_i386=	COMPILER_RT
 OPTIONS_DEFAULT=	CLANG EXTRAS GOLD LIT LLD LLDB
-OPTIONS_DEFAULT_amd64=	OPENMP
+OPTIONS_DEFAULT_amd64=	COMPILER_RT OPENMP
+OPTIONS_DEFAULT_i386=	COMPILER_RT
 OPTIONS_SUB=	yes
 
+PLIST_FILES=
+
 CLANG_DESC=	Build clang
 CLANG_EXTRA_PATCHES= \
 	${PATCHDIR}/clang-patch-fformat_extensions.diff \
@@ -46,6 +50,10 @@ CLANG_GH_PROJECT=	clang:clang
 CLANG_GH_TAGNAME=	${CLANG_COMMIT}:clang
 CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
 CLANG_PORTDOCS=		clang
+COMPILER_RT_DESC=	Sanitizer libraries
+COMPILER_RT_GH_PROJECT=	compiler-rt:compiler_rt
+COMPILER_RT_GH_TAGNAME=	${COMPILER_RT_COMMIT}:compiler_rt
+COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|}
 DOCS_PORTDOCS=		llvm
 DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
 			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
@@ -184,6 +192,47 @@ NOT_FOR_ARCH=	ia64
 
 .include <bsd.port.pre.mk>
 
+_CRTLIBDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/lib/freebsd
+.if ${ARCH} == "amd64"
+_COMPILER_RT_LIBS= \
+	libclang_rt.asan-preinit-x86_64.a \
+	libclang_rt.asan-x86_64.a \
+	libclang_rt.asan-x86_64.a.syms \
+	libclang_rt.asan-x86_64.so \
+	libclang_rt.asan_cxx-x86_64.a \
+	libclang_rt.asan_cxx-x86_64.a.syms \
+	libclang_rt.builtins-x86_64.a \
+	libclang_rt.dd-x86_64.a \
+	libclang_rt.dyndd-x86_64.so \
+	libclang_rt.lsan-x86_64.a \
+	libclang_rt.profile-x86_64.a \
+	libclang_rt.safestack-x86_64.a \
+	libclang_rt.stats-x86_64.a \
+	libclang_rt.stats_client-x86_64.a \
+	libclang_rt.tsan-x86_64.a \
+	libclang_rt.tsan-x86_64.a.syms \
+	libclang_rt.tsan_cxx-x86_64.a \
+	libclang_rt.tsan_cxx-x86_64.a.syms \
+	libclang_rt.ubsan_standalone-x86_64.a \
+	libclang_rt.ubsan_standalone-x86_64.a.syms \
+	libclang_rt.ubsan_standalone_cxx-x86_64.a \
+	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
+.endif
+.if ${ARCH} == "i386" || ${ARCH} == "amd64"
+_COMPILER_RT_LIBS+= \
+	libclang_rt.asan-i386.a \
+	libclang_rt.asan-i386.so \
+	libclang_rt.asan-preinit-i386.a \
+	libclang_rt.asan_cxx-i386.a \
+	libclang_rt.builtins-i386.a \
+	libclang_rt.profile-i386.a \
+	libclang_rt.safestack-i386.a \
+	libclang_rt.stats-i386.a \
+	libclang_rt.stats_client-i386.a \
+	libclang_rt.ubsan_standalone-i386.a \
+	libclang_rt.ubsan_standalone_cxx-i386.a
+.endif
+
 .if ${PORT_OPTIONS:MEXTRAS}
 COMMANDS+=	${EXTRAS_COMMANDS}
 MAN1SRCS+=	extraclangtools.1
@@ -225,6 +274,14 @@ post-patch:
 	    -e 's|lit\.|lit${LLVM_SUFFIX}.|' \
 	    ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py
 
+post-build-COMPILER_RT-on:
+	${MKDIR} ${WRKSRC}/compiler-rt-build
+	cd ${WRKSRC}/compiler-rt-build && \
+	${CMAKE_BIN} ${CMAKE_ARGS} \
+	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
+	    ${WRKSRC_compiler_rt} && \
+	${MAKE_ENV} ${MAKE_CMD}
+
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
 	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
@@ -250,6 +307,10 @@ post-install-CLANG-on:
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
 
+post-install-COMPILER_RT-on:
+	cd ${WRKSRC}/compiler-rt-build && \
+	${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
+
 post-install-LIT-on:
 	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/lit
@@ -295,7 +356,9 @@ build-plist:
 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' | \
 	    ${SORT} >> ${PLIST}.tmp
 	awk '{ \
-	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /omp.h|${EXTRAS_PATTERN}/) {printf "%%%%CLANG%%%%"} \
+	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /omp.h|${EXTRAS_PATTERN}|libclang_rt/) {printf "%%%%CLANG%%%%"} \
+	    if ($$0 ~ /asan_blacklist.txt|sanitizer/) \
+		{printf "%%%%COMPILER_RT%%%%"} \
 	    if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
 	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
 	    if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
@@ -305,6 +368,7 @@ build-plist:
 	}' ${PLIST}.tmp >> ${PLIST}
 	${RM} -f ${PLIST}.tmp
 
+
 check-commands:
 .for command in ${COMMANDS}
 	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index 903065568c04..9671da6832f4 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -6,12 +6,12 @@
 #
 LLVM_MAJOR=	3.9
 LLVM_RELEASE=	${LLVM_MAJOR}.0
-SNAPDATE=	20160418
+SNAPDATE=	20160424
 
-LLVM_COMMIT=		6320b788a291bf1b1d24d5619c47c106cad1333d
-CLANG_COMMIT=		86a3fc0fb95b653579aabf38588b96635d159b9c
-COMPILER_RT_COMMIT=	82cd9449dfb3fe89012fd2294133dc93e6aa5cb5
-EXTRAS_COMMIT=		5778510702e0b009ade08b80c01fd730d9544328
-LLD_COMMIT=		5feae6211a2448e7e3e0d34d467c9b3bc91f6663
-LLDB_COMMIT=		b3ce9c850ed2b0a5c76e0408ac67038bd21bc86a
-OPENMP_COMMIT=		c87f146dfd04c0478c8609b0158d77865a65a588
+LLVM_COMMIT=		028b451b44aefae091f5221f67973587e8715c6b
+CLANG_COMMIT=		102c3e12543ad484452934b22c7805553497da09
+COMPILER_RT_COMMIT=	5d4cf0cc374036478e6227110f022fed3fe4df52
+EXTRAS_COMMIT=		46f563960f119f8ff3760f4df35f7f0081b71ad9
+LLD_COMMIT=		5d4a5f79d0a9d205f70eac103e546f04d214dd5a
+LLDB_COMMIT=		e7c932b408a4552264477e462ebef0c53cb52cf3
+OPENMP_COMMIT=		43ffd469908d01f0ff94d0d3325384c09de6d3b3
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index bb0508c11704..ce90d167bb1a 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,12 +1,14 @@
-SHA256 (llvm-mirror-llvm-3.9.d20160418-6320b788a291bf1b1d24d5619c47c106cad1333d_GH0.tar.gz) = a6537f48129d19c72bbfe36281b4d26ece213aa03a01624b965cd437e8735673
-SIZE (llvm-mirror-llvm-3.9.d20160418-6320b788a291bf1b1d24d5619c47c106cad1333d_GH0.tar.gz) = 25070292
-SHA256 (llvm-mirror-clang-86a3fc0fb95b653579aabf38588b96635d159b9c_GH0.tar.gz) = 48cbb1758bfeb48092bdb6ee842d6fd53e047b6e471ea920d4f0b0be2a5e1530
-SIZE (llvm-mirror-clang-86a3fc0fb95b653579aabf38588b96635d159b9c_GH0.tar.gz) = 13762731
-SHA256 (llvm-mirror-clang-tools-extra-5778510702e0b009ade08b80c01fd730d9544328_GH0.tar.gz) = b6f2c01aa20278fc50cec3463c6d1324f599552e249ef72a0826e4cd178dc57a
-SIZE (llvm-mirror-clang-tools-extra-5778510702e0b009ade08b80c01fd730d9544328_GH0.tar.gz) = 520587
-SHA256 (llvm-mirror-lld-5feae6211a2448e7e3e0d34d467c9b3bc91f6663_GH0.tar.gz) = 8460cc0a6de7ec167bc208f4894ed3096f23487ad6eef7771cf84c155074aa0b
-SIZE (llvm-mirror-lld-5feae6211a2448e7e3e0d34d467c9b3bc91f6663_GH0.tar.gz) = 572955
-SHA256 (llvm-mirror-lldb-b3ce9c850ed2b0a5c76e0408ac67038bd21bc86a_GH0.tar.gz) = 023dd1dcdeea338c40294f71a10054c922c5210e52cf36d10850e4b73e127d5a
-SIZE (llvm-mirror-lldb-b3ce9c850ed2b0a5c76e0408ac67038bd21bc86a_GH0.tar.gz) = 17235486
-SHA256 (llvm-mirror-openmp-c87f146dfd04c0478c8609b0158d77865a65a588_GH0.tar.gz) = 5b8c5ba9a961847aa57b1244a16cfe700d7c3e2453bb52c7b88307c6318d5a36
-SIZE (llvm-mirror-openmp-c87f146dfd04c0478c8609b0158d77865a65a588_GH0.tar.gz) = 2810835
+SHA256 (llvm-mirror-llvm-3.9.d20160424-028b451b44aefae091f5221f67973587e8715c6b_GH0.tar.gz) = 3efdb96090c55bc133eb34df8baa758f962829a9e8ef68749bb3bd0904a24f2b
+SIZE (llvm-mirror-llvm-3.9.d20160424-028b451b44aefae091f5221f67973587e8715c6b_GH0.tar.gz) = 25185772
+SHA256 (llvm-mirror-clang-102c3e12543ad484452934b22c7805553497da09_GH0.tar.gz) = 2b62bbaf65af0526628f2f91490a32bba500c1308d105098e54f24335745c1b2
+SIZE (llvm-mirror-clang-102c3e12543ad484452934b22c7805553497da09_GH0.tar.gz) = 13795746
+SHA256 (llvm-mirror-compiler-rt-5d4cf0cc374036478e6227110f022fed3fe4df52_GH0.tar.gz) = 60ea92e219bed1a74a4e14190bc5ebe2f31000d8fba05fcf0923a0acc8ed2a6b
+SIZE (llvm-mirror-compiler-rt-5d4cf0cc374036478e6227110f022fed3fe4df52_GH0.tar.gz) = 2283693
+SHA256 (llvm-mirror-clang-tools-extra-46f563960f119f8ff3760f4df35f7f0081b71ad9_GH0.tar.gz) = b906bb093d69fa82f577d33ac32ac275564af846ffb7a059a649eca0ddb338f7
+SIZE (llvm-mirror-clang-tools-extra-46f563960f119f8ff3760f4df35f7f0081b71ad9_GH0.tar.gz) = 532683
+SHA256 (llvm-mirror-lld-5d4a5f79d0a9d205f70eac103e546f04d214dd5a_GH0.tar.gz) = 6640276913b2f25533655c3138af9e5f83fb394d661b72b557515ea327f081a4
+SIZE (llvm-mirror-lld-5d4a5f79d0a9d205f70eac103e546f04d214dd5a_GH0.tar.gz) = 581001
+SHA256 (llvm-mirror-lldb-e7c932b408a4552264477e462ebef0c53cb52cf3_GH0.tar.gz) = 9f5d15d5760a621ff5d6ab994a74028b9e94b2eb39f6b2eb7a109439e378e66b
+SIZE (llvm-mirror-lldb-e7c932b408a4552264477e462ebef0c53cb52cf3_GH0.tar.gz) = 17241829
+SHA256 (llvm-mirror-openmp-43ffd469908d01f0ff94d0d3325384c09de6d3b3_GH0.tar.gz) = b0f9cba4c807e0e58462820ca574b86e045de238fc6a7458a58c38f437f340e3
+SIZE (llvm-mirror-openmp-43ffd469908d01f0ff94d0d3325384c09de6d3b3_GH0.tar.gz) = 2810976
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 3152721abe54..60574809df88 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -54,6 +54,7 @@ bin/sancov-devel
 %%LIT%%llvm-devel/bin/llvm-lit
 %%LIT%%bin/FileCheck-devel
 %%LIT%%llvm-devel/bin/FileCheck
+%%COMPILER_RT%%llvm-devel/asan_blacklist.txt
 llvm-devel/bin/bugpoint
 %%CLANG%%llvm-devel/bin/c-index-test
 %%CLANG%%llvm-devel/bin/clang
@@ -1574,6 +1575,7 @@ llvm-devel/include/llvm/IR/ModuleSummaryIndex.h
 llvm-devel/include/llvm/IR/NoFolder.h
 llvm-devel/include/llvm/IR/OperandTraits.h
 llvm-devel/include/llvm/IR/Operator.h
+llvm-devel/include/llvm/IR/OptBisect.h
 llvm-devel/include/llvm/IR/PassManager.h
 llvm-devel/include/llvm/IR/PassManagerInternal.h
 llvm-devel/include/llvm/IR/PatternMatch.h
@@ -1895,11 +1897,13 @@ llvm-devel/include/llvm/Transforms/Instrumentation.h
 llvm-devel/include/llvm/Transforms/ObjCARC.h
 llvm-devel/include/llvm/Transforms/Scalar.h
 llvm-devel/include/llvm/Transforms/Scalar/ADCE.h
+llvm-devel/include/llvm/Transforms/Scalar/DCE.h
 llvm-devel/include/llvm/Transforms/Scalar/EarlyCSE.h
 llvm-devel/include/llvm/Transforms/Scalar/GVN.h
 llvm-devel/include/llvm/Transforms/Scalar/LowerExpectIntrinsic.h
 llvm-devel/include/llvm/Transforms/Scalar/SROA.h
 llvm-devel/include/llvm/Transforms/Scalar/SimplifyCFG.h
+llvm-devel/include/llvm/Transforms/Scalar/Sink.h
 llvm-devel/include/llvm/Transforms/Utils/ASanStackFrameLayout.h
 llvm-devel/include/llvm/Transforms/Utils/BasicBlockUtils.h
 llvm-devel/include/llvm/Transforms/Utils/BuildLibCalls.h
@@ -1929,6 +1933,15 @@ llvm-devel/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
 llvm-devel/include/llvm/Transforms/Utils/UnrollLoop.h
 llvm-devel/include/llvm/Transforms/Utils/ValueMapper.h
 llvm-devel/include/llvm/Transforms/Vectorize.h
+%%COMPILER_RT%%llvm-devel/include/sanitizer/allocator_interface.h
+%%COMPILER_RT%%llvm-devel/include/sanitizer/asan_interface.h
+%%COMPILER_RT%%llvm-devel/include/sanitizer/common_interface_defs.h
+%%COMPILER_RT%%llvm-devel/include/sanitizer/coverage_interface.h
+%%COMPILER_RT%%llvm-devel/include/sanitizer/dfsan_interface.h
+%%COMPILER_RT%%llvm-devel/include/sanitizer/linux_syscall_hooks.h
+%%COMPILER_RT%%llvm-devel/include/sanitizer/lsan_interface.h
+%%COMPILER_RT%%llvm-devel/include/sanitizer/msan_interface.h
+%%COMPILER_RT%%llvm-devel/include/sanitizer/tsan_interface_atomic.h
 llvm-devel/lib/BugpointPasses.so
 llvm-devel/lib/LLVMHello.so
 %%GOLD%%llvm-devel/lib/LLVMgold.so
@@ -1952,6 +1965,7 @@ llvm-devel/lib/LLVMHello.so
 %%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512fintrin.h
 %%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512ifmaintrin.h
 %%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512ifmavlintrin.h
+%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512pfintrin.h
 %%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512vbmiintrin.h
 %%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512vbmivlintrin.h
 %%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512vlbwintrin.h
@@ -2166,6 +2180,7 @@ llvm-devel/lib/libLTO.so
 %%CLANG%%llvm-devel/lib/libclangFormat.a
 %%CLANG%%llvm-devel/lib/libclangFrontend.a
 %%CLANG%%llvm-devel/lib/libclangFrontendTool.a
+%%CLANG%%llvm-devel/lib/libclangIncludeFixer.a
 %%CLANG%%llvm-devel/lib/libclangIndex.a
 %%CLANG%%llvm-devel/lib/libclangLex.a
 %%CLANG%%llvm-devel/lib/libclangParse.a