svn commit: r414565 - in head/devel/llvm-devel: . files

Brooks Davis brooks at FreeBSD.org
Tue May 3 22:53:40 UTC 2016 

Author: brooks
Date: Tue May  3 22:53:39 2016
New Revision: 414565
URL: https://svnweb.freebsd.org/changeset/ports/414565

Log:
  Update to a new snapshot.
  
  Fix amd64 build when ${CC} -m32 doesn't work.
  
  Assorted cleanups.

Added:
  head/devel/llvm-devel/files/compiler-rt-patch-no-m32
     - copied unchanged from r414485, head/devel/llvm38/files/compiler-rt-patch-no-m32
Deleted:
  head/devel/llvm-devel/files/compiler-rt-patch-tools_compiler-rt_cmake_config-ix.cmake
Modified:
  head/devel/llvm-devel/Makefile
  head/devel/llvm-devel/Makefile.snapshot
  head/devel/llvm-devel/distinfo
  head/devel/llvm-devel/pkg-plist

Modified: head/devel/llvm-devel/Makefile
==============================================================================
--- head/devel/llvm-devel/Makefile	Tue May  3 22:09:21 2016	(r414564)
+++ head/devel/llvm-devel/Makefile	Tue May  3 22:53:39 2016	(r414565)
@@ -218,7 +218,7 @@ _COMPILER_RT_LIBS= \
 	libclang_rt.ubsan_standalone_cxx-x86_64.a \
 	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
 .endif
-.if ${ARCH} == "i386" || ${ARCH} == "amd64"
+.if ${ARCH} == "i386"
 _COMPILER_RT_LIBS+= \
 	libclang_rt.asan-i386.a \
 	libclang_rt.asan-i386.so \
@@ -274,9 +274,15 @@ post-patch:
 	    -e 's|lit\.|lit${LLVM_SUFFIX}.|' \
 	    ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py
 
+post-patch-COMPILER_RT-on:
+.if ${ARCH} == "amd64"
+	cd ${WRKSRC_compiler_rt} && \
+	    patch < ${PATCHDIR}/compiler-rt-patch-no-m32
+.endif
+
 post-build-COMPILER_RT-on:
-	${MKDIR} ${WRKSRC}/compiler-rt-build
-	cd ${WRKSRC}/compiler-rt-build && \
+	${MKDIR} ${WRKDIR}/compiler-rt-build
+	cd ${WRKDIR}/compiler-rt-build && \
 	${CMAKE_BIN} ${CMAKE_ARGS} \
 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
 	    ${WRKSRC_compiler_rt} && \
@@ -303,12 +309,19 @@ post-install-DOCS-on:
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
 
+.if ${PORT_OPTIONS:MCLANG}
+post-install-DOCS-off:
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
+.endif
+
 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 && \
+	cd ${WRKDIR}/compiler-rt-build && \
 	${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
 
 post-install-LIT-on:
@@ -366,8 +379,7 @@ build-plist:
 	    if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \
 	    if ($$0 !~ /libclang_rt/) {print} \
 	}' ${PLIST}.tmp >> ${PLIST}
-	${RM} -f ${PLIST}.tmp
-
+	${RM} ${PLIST}.tmp
 
 check-commands:
 .for command in ${COMMANDS}

Modified: head/devel/llvm-devel/Makefile.snapshot
==============================================================================
--- head/devel/llvm-devel/Makefile.snapshot	Tue May  3 22:09:21 2016	(r414564)
+++ head/devel/llvm-devel/Makefile.snapshot	Tue May  3 22:53:39 2016	(r414565)
@@ -6,12 +6,12 @@
 #
 LLVM_MAJOR=	3.9
 LLVM_RELEASE=	${LLVM_MAJOR}.0
-SNAPDATE=	20160424
+SNAPDATE=	20160502
 
-LLVM_COMMIT=		028b451b44aefae091f5221f67973587e8715c6b
-CLANG_COMMIT=		102c3e12543ad484452934b22c7805553497da09
-COMPILER_RT_COMMIT=	5d4cf0cc374036478e6227110f022fed3fe4df52
-EXTRAS_COMMIT=		46f563960f119f8ff3760f4df35f7f0081b71ad9
-LLD_COMMIT=		5d4a5f79d0a9d205f70eac103e546f04d214dd5a
-LLDB_COMMIT=		e7c932b408a4552264477e462ebef0c53cb52cf3
-OPENMP_COMMIT=		43ffd469908d01f0ff94d0d3325384c09de6d3b3
+LLVM_COMMIT=		be15f60fee97685728b20f82df0bb061761cbc30
+CLANG_COMMIT=		adeb741e4ef2208282d408214f045b0ce284645a
+COMPILER_RT_COMMIT=	3b2ce46b398f7c0656a1e01d7b1cc603c5f22713
+EXTRAS_COMMIT=		c80718012edd63e5b2adf344f7f4750e03c0b1ba
+LLD_COMMIT=		db1cb5191fcedc1849b917dd53a93de6d4398d39
+LLDB_COMMIT=		287a5027f3bc6fc7170e2b5c5736cffc912aac7a
+OPENMP_COMMIT=		843428ce2ada131537bfcd7be78cd1484b1d2254

Modified: head/devel/llvm-devel/distinfo
==============================================================================
--- head/devel/llvm-devel/distinfo	Tue May  3 22:09:21 2016	(r414564)
+++ head/devel/llvm-devel/distinfo	Tue May  3 22:53:39 2016	(r414565)
@@ -1,14 +1,14 @@
-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
+SHA256 (llvm-mirror-llvm-3.9.d20160502-be15f60fee97685728b20f82df0bb061761cbc30_GH0.tar.gz) = 890fcf33e7d242b49cdb7940e1905e9ca7b6304c4a64f8128c59b23337dade59
+SIZE (llvm-mirror-llvm-3.9.d20160502-be15f60fee97685728b20f82df0bb061761cbc30_GH0.tar.gz) = 24992784
+SHA256 (llvm-mirror-clang-adeb741e4ef2208282d408214f045b0ce284645a_GH0.tar.gz) = 5e0e3e31eb42a4d8a328acbe6484e8be349b908fd607e1840ccea2b48af1f366
+SIZE (llvm-mirror-clang-adeb741e4ef2208282d408214f045b0ce284645a_GH0.tar.gz) = 13865011
+SHA256 (llvm-mirror-compiler-rt-3b2ce46b398f7c0656a1e01d7b1cc603c5f22713_GH0.tar.gz) = 9828b930b3d1168b379c67545b917115a72dd0e3341eef87bfb7c0ccf0b44e47
+SIZE (llvm-mirror-compiler-rt-3b2ce46b398f7c0656a1e01d7b1cc603c5f22713_GH0.tar.gz) = 2290060
+SHA256 (llvm-mirror-clang-tools-extra-c80718012edd63e5b2adf344f7f4750e03c0b1ba_GH0.tar.gz) = 9e792b600f2b3683824e3f959b013d1c9825d98c08d054add05aea13d8035d4a
+SIZE (llvm-mirror-clang-tools-extra-c80718012edd63e5b2adf344f7f4750e03c0b1ba_GH0.tar.gz) = 556585
+SHA256 (llvm-mirror-lld-db1cb5191fcedc1849b917dd53a93de6d4398d39_GH0.tar.gz) = b589e39019d53558bee5f94771965d9035cc99d2a4ae657620def5bb280a35fa
+SIZE (llvm-mirror-lld-db1cb5191fcedc1849b917dd53a93de6d4398d39_GH0.tar.gz) = 593189
+SHA256 (llvm-mirror-lldb-287a5027f3bc6fc7170e2b5c5736cffc912aac7a_GH0.tar.gz) = c7ff29137b29d487fca5a90c293e4dc56a1bcd14c6eca6f18b7778551da0c0ee
+SIZE (llvm-mirror-lldb-287a5027f3bc6fc7170e2b5c5736cffc912aac7a_GH0.tar.gz) = 17251429
+SHA256 (llvm-mirror-openmp-843428ce2ada131537bfcd7be78cd1484b1d2254_GH0.tar.gz) = 76861728fb40556d173a18032e36db37fd982ff5e73133fd50abefc182e56284
+SIZE (llvm-mirror-openmp-843428ce2ada131537bfcd7be78cd1484b1d2254_GH0.tar.gz) = 2810794

Copied: head/devel/llvm-devel/files/compiler-rt-patch-no-m32 (from r414485, head/devel/llvm38/files/compiler-rt-patch-no-m32)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/llvm-devel/files/compiler-rt-patch-no-m32	Tue May  3 22:53:39 2016	(r414565, copy of r414485, head/devel/llvm38/files/compiler-rt-patch-no-m32)
@@ -0,0 +1,14 @@
+--- cmake/config-ix.cmake.orig	2016-05-02 20:51:53.598525522 +0000
++++ cmake/config-ix.cmake	2016-05-02 20:53:24.573519349 +0000
+@@ -189,11 +189,6 @@
+   if("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "i[2-6]86|x86|amd64")
+     if(NOT MSVC)
+       test_target_arch(x86_64 "" "-m64")
+-      # FIXME: We build runtimes for both i686 and i386, as "clang -m32" may
+-      # target different variant than "$CMAKE_C_COMPILER -m32". This part should
+-      # be gone after we resolve PR14109.
+-      test_target_arch(i686 __i686__ "-m32")
+-      test_target_arch(i386 __i386__ "-m32")
+     else()
+       if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+         test_target_arch(i386 "" "")

Modified: head/devel/llvm-devel/pkg-plist
==============================================================================
--- head/devel/llvm-devel/pkg-plist	Tue May  3 22:09:21 2016	(r414564)
+++ head/devel/llvm-devel/pkg-plist	Tue May  3 22:53:39 2016	(r414565)
@@ -505,6 +505,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Serialization/ModuleFileExtension.h
 %%CLANG%%llvm-devel/include/clang/Serialization/ModuleManager.h
 %%CLANG%%llvm-devel/include/clang/Serialization/SerializationDiagnostic.h
+%%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Checkers/Checkers.inc
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Checkers/ClangCheckers.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Checkers/ObjCRetainCount.h
@@ -1464,6 +1465,18 @@ llvm-devel/include/llvm/DebugInfo/PDB/PD
 llvm-devel/include/llvm/DebugInfo/PDB/PDBSymbolUnknown.h
 llvm-devel/include/llvm/DebugInfo/PDB/PDBSymbolUsingNamespace.h
 llvm-devel/include/llvm/DebugInfo/PDB/PDBTypes.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/ByteStream.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/DbiStream.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/InfoStream.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/MappedBlockStream.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/ModInfo.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/NameHashTable.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/NameMap.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/PDBFile.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/RawConstants.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/RawSession.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/StreamInterface.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/StreamReader.h
 llvm-devel/include/llvm/DebugInfo/Symbolize/DIPrinter.h
 llvm-devel/include/llvm/DebugInfo/Symbolize/SymbolizableModule.h
 llvm-devel/include/llvm/DebugInfo/Symbolize/Symbolize.h
@@ -1708,9 +1721,9 @@ llvm-devel/include/llvm/PassInfo.h
 llvm-devel/include/llvm/PassRegistry.h
 llvm-devel/include/llvm/PassSupport.h
 llvm-devel/include/llvm/Passes/PassBuilder.h
-llvm-devel/include/llvm/ProfileData/CoverageMapping.h
-llvm-devel/include/llvm/ProfileData/CoverageMappingReader.h
-llvm-devel/include/llvm/ProfileData/CoverageMappingWriter.h
+llvm-devel/include/llvm/ProfileData/Coverage/CoverageMapping.h
+llvm-devel/include/llvm/ProfileData/Coverage/CoverageMappingReader.h
+llvm-devel/include/llvm/ProfileData/Coverage/CoverageMappingWriter.h
 llvm-devel/include/llvm/ProfileData/InstrProf.h
 llvm-devel/include/llvm/ProfileData/InstrProfData.inc
 llvm-devel/include/llvm/ProfileData/InstrProfReader.h
@@ -1883,6 +1896,7 @@ llvm-devel/include/llvm/Transforms/IPO.h
 llvm-devel/include/llvm/Transforms/IPO/ForceFunctionAttrs.h
 llvm-devel/include/llvm/Transforms/IPO/FunctionAttrs.h
 llvm-devel/include/llvm/Transforms/IPO/FunctionImport.h
+llvm-devel/include/llvm/Transforms/IPO/GlobalOpt.h
 llvm-devel/include/llvm/Transforms/IPO/InferFunctionAttrs.h
 llvm-devel/include/llvm/Transforms/IPO/InlinerPass.h
 llvm-devel/include/llvm/Transforms/IPO/Internalize.h
@@ -1901,6 +1915,7 @@ llvm-devel/include/llvm/Transforms/Scala
 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/Reassociate.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
@@ -1969,6 +1984,7 @@ llvm-devel/lib/LLVMHello.so
 %%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
+%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512vlcdintrin.h
 %%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512vldqintrin.h
 %%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512vlintrin.h
 %%CLANG%%llvm-devel/lib/clang/3.9.0/include/avxintrin.h
@@ -2019,7 +2035,6 @@ llvm-devel/lib/LLVMHello.so
 %%CLANG%%llvm-devel/lib/clang/3.9.0/include/xsaveoptintrin.h
 %%CLANG%%llvm-devel/lib/clang/3.9.0/include/xsavesintrin.h
 %%CLANG%%llvm-devel/lib/clang/3.9.0/include/xtestintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/vtables_blacklist.txt
 %%CLANG%%llvm-devel/lib/cmake/clang/ClangConfig.cmake
 %%CLANG%%llvm-devel/lib/cmake/clang/ClangTargets-%%CMAKE_BUILD_TYPE%%.cmake
 %%CLANG%%llvm-devel/lib/cmake/clang/ClangTargets.cmake
@@ -2078,6 +2093,7 @@ llvm-devel/lib/libLLVMBitReader.a
 llvm-devel/lib/libLLVMBitWriter.a
 llvm-devel/lib/libLLVMCodeGen.a
 llvm-devel/lib/libLLVMCore.a
+llvm-devel/lib/libLLVMCoverage.a
 llvm-devel/lib/libLLVMCppBackendCodeGen.a
 llvm-devel/lib/libLLVMCppBackendInfo.a
 llvm-devel/lib/libLLVMDebugInfoCodeView.a
@@ -2194,6 +2210,7 @@ llvm-devel/lib/libLTO.so
 %%CLANG%%llvm-devel/lib/libclangStaticAnalyzerCore.a
 %%CLANG%%llvm-devel/lib/libclangStaticAnalyzerFrontend.a
 %%EXTRAS%%llvm-devel/lib/libclangTidy.a
+%%EXTRAS%%llvm-devel/lib/libclangTidyBoostModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyCERTModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyCppCoreGuidelinesModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyGoogleModule.a
@@ -2206,6 +2223,7 @@ llvm-devel/lib/libLTO.so
 %%EXTRAS%%llvm-devel/lib/libclangTidyUtils.a
 %%CLANG%%llvm-devel/lib/libclangTooling.a
 %%CLANG%%llvm-devel/lib/libclangToolingCore.a
+llvm-devel/lib/libfindAllSymbols.a
 %%OPENMP%%llvm-devel/lib/libgomp.so
 %%OPENMP%%llvm-devel/lib/libiomp5.so
 %%LLD%%llvm-devel/lib/liblldCOFF.a

More information about the svn-ports-head mailing list