Date: Tue, 28 Jul 2020 18:52:12 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543629 - in head/devel/llvm10: . files/compiler-rt Message-ID: <202007281852.06SIqC6x033552@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Tue Jul 28 18:52:11 2020 New Revision: 543629 URL: https://svnweb.freebsd.org/changeset/ports/543629 Log: Upgrade to 10.0.1 release. Fix sanitizer runtime install location. [0] PR: 245542 [0] Reported by: jbeich [0] Sponsored by: DARPA Added: head/devel/llvm10/files/compiler-rt/patch-.._compiler-rt-10.0.1.src_lib_sanitizer__common_sanitizer__platform__interceptors.h - copied, changed from r543628, head/devel/llvm10/files/compiler-rt/patch-.._compiler-rt-10.0.0.src_lib_sanitizer__common_sanitizer__platform__interceptors.h Deleted: head/devel/llvm10/files/compiler-rt/patch-.._compiler-rt-10.0.0.src_lib_sanitizer__common_sanitizer__platform__interceptors.h Modified: head/devel/llvm10/Makefile head/devel/llvm10/distinfo head/devel/llvm10/pkg-plist Modified: head/devel/llvm10/Makefile ============================================================================== --- head/devel/llvm10/Makefile Tue Jul 28 18:49:40 2020 (r543628) +++ head/devel/llvm10/Makefile Tue Jul 28 18:52:11 2020 (r543629) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= llvm -DISTVERSION= 10.0.0 -PORTREVISION= 2 +DISTVERSION= 10.0.1 +PORTREVISION= 0 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} @@ -104,6 +104,7 @@ CLANG_USE= GNOME=libxml2 COMPILER_RT_DESC= Sanitizer libraries COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX} COMPILER_RT_EXTRA_PATCHES= ${PATCHDIR}/compiler-rt +COMPILER_RT_CMAKE_ON= -DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ @@ -346,7 +347,7 @@ _BE_LIBS_${BE}+= ${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \ BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|} _CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd -_CRTBLDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/share +_CRTBLDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/share _COMPILER_RT_BLACKLISTS= cfi_blacklist.txt .if ${ARCH} == "amd64" _COMPILER_RT_BLACKLISTS+= asan_blacklist.txt @@ -534,12 +535,9 @@ post-install-COMPILER_RT-on: cd ${WRKDIR}/compiler-rt-build && \ ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET} .if ${ARCH} == "amd64" - ${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/libclang_rt*i386* + ${RM} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}/libclang_rt*i386* .endif ${MKDIR} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR} - ${MV} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/* \ - ${STAGEDIR}${PREFIX}/${_CRTLIBDIR} - ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd post-install-LIT-on: ${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \ Modified: head/devel/llvm10/distinfo ============================================================================== --- head/devel/llvm10/distinfo Tue Jul 28 18:49:40 2020 (r543628) +++ head/devel/llvm10/distinfo Tue Jul 28 18:52:11 2020 (r543629) @@ -1,15 +1,15 @@ -TIMESTAMP = 1585093600 -SHA256 (llvm-10.0.0.src.tar.xz) = df83a44b3a9a71029049ec101fb0077ecbbdf5fe41e395215025779099a98fdf -SIZE (llvm-10.0.0.src.tar.xz) = 35733192 -SHA256 (clang-10.0.0.src.tar.xz) = 885b062b00e903df72631c5f98b9579ed1ed2790f74e5646b4234fa084eacb21 -SIZE (clang-10.0.0.src.tar.xz) = 14190012 -SHA256 (compiler-rt-10.0.0.src.tar.xz) = 6a7da64d3a0a7320577b68b9ca4933bdcab676e898b759850e827333c3282c75 -SIZE (compiler-rt-10.0.0.src.tar.xz) = 2093908 -SHA256 (clang-tools-extra-10.0.0.src.tar.xz) = acdf8cf6574b40e6b1dabc93e76debb84a9feb6f22970126b04d4ba18b92911c -SIZE (clang-tools-extra-10.0.0.src.tar.xz) = 2604944 -SHA256 (lld-10.0.0.src.tar.xz) = b9a0d7c576eeef05bc06d6e954938a01c5396cee1d1e985891e0b1cf16e3d708 -SIZE (lld-10.0.0.src.tar.xz) = 1143340 -SHA256 (lldb-10.0.0.src.tar.xz) = dd1ffcb42ed033f5167089ec4c6ebe84fbca1db4a9eaebf5c614af09d89eb135 -SIZE (lldb-10.0.0.src.tar.xz) = 9637552 -SHA256 (openmp-10.0.0.src.tar.xz) = 3b9ff29a45d0509a1e9667a0feb43538ef402ea8cfc7df3758a01f20df08adfa -SIZE (openmp-10.0.0.src.tar.xz) = 959016 +TIMESTAMP = 1595444491 +SHA256 (llvm-10.0.1.src.tar.xz) = c5d8e30b57cbded7128d78e5e8dad811bff97a8d471896812f57fa99ee82cdf3 +SIZE (llvm-10.0.1.src.tar.xz) = 35270168 +SHA256 (clang-10.0.1.src.tar.xz) = f99afc382b88e622c689b6d96cadfa6241ef55dca90e87fc170352e12ddb2b24 +SIZE (clang-10.0.1.src.tar.xz) = 14046188 +SHA256 (compiler-rt-10.0.1.src.tar.xz) = d90dc8e121ca0271f0fd3d639d135bfaa4b6ed41e67bd6eb77808f72629658fa +SIZE (compiler-rt-10.0.1.src.tar.xz) = 2085712 +SHA256 (clang-tools-extra-10.0.1.src.tar.xz) = d093782bcfcd0c3f496b67a5c2c997ab4b85816b62a7dd5b27026634ccf5c11a +SIZE (clang-tools-extra-10.0.1.src.tar.xz) = 2599404 +SHA256 (lld-10.0.1.src.tar.xz) = 591449e0aa623a6318d5ce2371860401653c48bb540982ccdd933992cb88df7a +SIZE (lld-10.0.1.src.tar.xz) = 1134580 +SHA256 (lldb-10.0.1.src.tar.xz) = 07abe87c25876aa306e73127330f5f37d270b6b082d50cc679e31b4fc02a3714 +SIZE (lldb-10.0.1.src.tar.xz) = 9632124 +SHA256 (openmp-10.0.1.src.tar.xz) = d19f728c8e04fb1e94566c8d76aef50ec926cd2f95ef3bf1e0a5de4909b28b44 +SIZE (openmp-10.0.1.src.tar.xz) = 955492 Copied and modified: head/devel/llvm10/files/compiler-rt/patch-.._compiler-rt-10.0.1.src_lib_sanitizer__common_sanitizer__platform__interceptors.h (from r543628, head/devel/llvm10/files/compiler-rt/patch-.._compiler-rt-10.0.0.src_lib_sanitizer__common_sanitizer__platform__interceptors.h) ============================================================================== --- head/devel/llvm10/files/compiler-rt/patch-.._compiler-rt-10.0.0.src_lib_sanitizer__common_sanitizer__platform__interceptors.h Tue Jul 28 18:49:40 2020 (r543628, copy source) +++ head/devel/llvm10/files/compiler-rt/patch-.._compiler-rt-10.0.1.src_lib_sanitizer__common_sanitizer__platform__interceptors.h Tue Jul 28 18:52:11 2020 (r543629) @@ -1,5 +1,5 @@ ---- ../compiler-rt-10.0.0.src/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig -+++ ../compiler-rt-10.0.0.src/lib/sanitizer_common/sanitizer_platform_interceptors.h +--- ../compiler-rt-10.0.1.src/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig ++++ ../compiler-rt-10.0.1.src/lib/sanitizer_common/sanitizer_platform_interceptors.h @@ -594,7 +594,7 @@ #define SANITIZER_INTERCEPT_PTHREAD_ATFORK SI_NETBSD #define SANITIZER_INTERCEPT_GETENTROPY SI_FREEBSD Modified: head/devel/llvm10/pkg-plist ============================================================================== --- head/devel/llvm10/pkg-plist Tue Jul 28 18:49:40 2020 (r543628) +++ head/devel/llvm10/pkg-plist Tue Jul 28 18:52:11 2020 (r543629) @@ -837,7 +837,6 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Transformer/SourceCodeBuilders.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Transformer/Stencil.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Transformer/Transformer.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/fuzzer/FuzzedDataProvider.h %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Args.h %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/DWARF.h %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Driver.h @@ -1755,6 +1754,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ParallelCG.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/Passes.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PreISelIntrinsicLowering.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PseudoSourceValue.h +llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RDFGraph.h +llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RDFLiveness.h +llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RDFRegisters.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ReachingDefAnalysis.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegAllocPBQP.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegAllocRegistry.h @@ -2829,24 +2831,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/RecordPrinter.h llvm%%LLVM_SUFFIX%%/include/llvm/XRay/Trace.h llvm%%LLVM_SUFFIX%%/include/llvm/XRay/XRayRecord.h llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/profile/InstrProfData.inc -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/allocator_interface.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/asan_interface.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/common_interface_defs.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/coverage_interface.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/dfsan_interface.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/hwasan_interface.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/linux_syscall_hooks.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/lsan_interface.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/msan_interface.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/netbsd_syscall_hooks.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/scudo_interface.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/tsan_interface.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/tsan_interface_atomic.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/ubsan_interface.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/xray/xray_interface.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/xray/xray_log_interface.h -%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/xray/xray_records.h %%GOLD%%llvm%%LLVM_SUFFIX%%/lib/LLVMgold.so %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_builtin_vars.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_cmath.h @@ -2914,6 +2898,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/float.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fma4intrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fmaintrin.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fuzzer/FuzzedDataProvider.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fxsrintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/gfniintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/htmintrin.h @@ -2955,10 +2940,25 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/tmmintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/xmmintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/prfchwintrin.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/profile/InstrProfData.inc %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ptwriteintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/s390intrin.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/allocator_interface.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/asan_interface.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/common_interface_defs.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/coverage_interface.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/dfsan_interface.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/hwasan_interface.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/linux_syscall_hooks.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/lsan_interface.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/msan_interface.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/netbsd_syscall_hooks.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/scudo_interface.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/tsan_interface.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/tsan_interface_atomic.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/ubsan_interface.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sgxintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/shaintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/smmintrin.h @@ -2976,6 +2976,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/x86intrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xmmintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xopintrin.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xray/xray_interface.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xray/xray_log_interface.h +%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xray/xray_records.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xsavecintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xsaveintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xsaveoptintrin.h @@ -3003,6 +3006,7 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/HandleLLVMOptions.c llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/HandleLLVMStdlib.cmake llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVM-Config.cmake llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMConfig.cmake +llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMConfigExtensions.cmake llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMConfigVersion.cmake llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMDistributionSupport.cmake llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMExports-%%CMAKE_BUILD_TYPE%%.cmake @@ -3038,6 +3042,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoPDB.a llvm%%LLVM_SUFFIX%%/lib/libLLVMDemangle.a llvm%%LLVM_SUFFIX%%/lib/libLLVMDlltoolDriver.a llvm%%LLVM_SUFFIX%%/lib/libLLVMExecutionEngine.a +llvm%%LLVM_SUFFIX%%/lib/libLLVMExtensions.a llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenMP.a llvm%%LLVM_SUFFIX%%/lib/libLLVMFuzzMutate.a llvm%%LLVM_SUFFIX%%/lib/libLLVMGlobalISel.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007281852.06SIqC6x033552>