pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Dec  9 20:04:40 UTC 2018

Modified Files:
        pkgsrc/devel/lldb: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/devel/polly: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/lang/clang: Makefile Makefile.common PLIST buildlink3.mk
            distinfo
        pkgsrc/lang/clang-static-analyzer: Makefile
        pkgsrc/lang/clang/patches: patch-lib_Basic_Targets_OSTargets.h
            patch-lib_Driver_ToolChains_Solaris.cpp
            patch-lib_Driver_ToolChains_Solaris.h
            patch-lib_Frontend_InitHeaderSearch.cpp
        pkgsrc/lang/compiler-rt: Makefile PLIST distinfo
        pkgsrc/lang/compiler-rt/patches: patch-cmake_config-ix.cmake
        pkgsrc/lang/libcxx: Makefile PLIST distinfo
        pkgsrc/lang/libcxxabi: Makefile distinfo
        pkgsrc/lang/libunwind: Makefile buildlink3.mk distinfo
        pkgsrc/lang/llvm: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/lang/llvm/patches: patch-cmake_modules_AddLLVM.cmake
            patch-tools_llvm-shlib_CMakeLists.txt
Added Files:
        pkgsrc/lang/compiler-rt: PLIST.Darwin PLIST.NetBSD
        pkgsrc/lang/compiler-rt/patches:
            patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
            patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
            patch-lib_tsan_CMakeLists.txt
Removed Files:
        pkgsrc/devel/lldb/patches:
            patch-source_Plugins_ScriptInterpreter_Python_PythonDataObjects.cpp
        pkgsrc/lang/libcxx/patches: patch-src_experimental_memory__resource.cpp
        pkgsrc/lang/llvm/patches: patch-include_llvm_Support_DataTypes.h.cmake

Log Message:
llvm: updated to 7.0.0

LLVM 7.0.0 Release

The release contains the work on trunk up to SVN revision 338536 plus
work on the release branch. It is the result of the community's work
over the past six months, including: function multiversioning in Clang
with the 'target' attribute for ELF-based x86/x86_64 targets, improved
PCH support in clang-cl, preliminary DWARF v5 support, basic support
for OpenMP 4.5 offloading to NVPTX, OpenCL C++ support, MSan, X-Ray
and libFuzzer support for FreeBSD, early UBSan, X-Ray and libFuzzer
support for OpenBSD, UBSan checks for implicit conversions, many
long-tail compatibility issues fixed in lld which is now production
ready for ELF, COFF and MinGW, new tools llvm-exegesis, llvm-mca and
diagtool. And as usual, many optimizations, improved diagnostics, and
bug fixes.

For more details, see the release notes:
https://llvm.org/releases/7.0.0/docs/ReleaseNotes.html
https://llvm.org/releases/7.0.0/tools/clang/docs/ReleaseNotes.html
https://llvm.org/releases/7.0.0/tools/clang/tools/extra/docs/ReleaseNotes.html
https://llvm.org/releases/7.0.0/tools/lld/docs/ReleaseNotes.html


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/lldb/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/lldb/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/lldb/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/lldb/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/lldb/patches/patch-source_Plugins_ScriptInterpreter_Python_PythonDataObjects.cpp
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/polly/Makefile \
    pkgsrc/devel/polly/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/polly/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/polly/buildlink3.mk
cvs rdiff -u -r1.45 -r1.46 pkgsrc/lang/clang/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/clang/Makefile.common
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/clang/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/clang/buildlink3.mk
cvs rdiff -u -r1.54 -r1.55 pkgsrc/lang/clang/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/clang-static-analyzer/Makefile
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp \
    pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.h \
    pkgsrc/lang/clang/patches/patch-lib_Frontend_InitHeaderSearch.cpp
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/compiler-rt/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/compiler-rt/PLIST \
    pkgsrc/lang/compiler-rt/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/compiler-rt/PLIST.Darwin \
    pkgsrc/lang/compiler-rt/PLIST.NetBSD
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/compiler-rt/patches/patch-cmake_config-ix.cmake
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc \
    pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc \
    pkgsrc/lang/compiler-rt/patches/patch-lib_tsan_CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/libcxx/Makefile pkgsrc/lang/libcxx/PLIST \
    pkgsrc/lang/libcxx/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/libcxx/patches/patch-src_experimental_memory__resource.cpp
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/libcxxabi/Makefile \
    pkgsrc/lang/libcxxabi/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/libunwind/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/libunwind/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/libunwind/distinfo
cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/llvm/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/llvm/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/llvm/buildlink3.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/llvm/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake \
    pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/llvm/patches/patch-include_llvm_Support_DataTypes.h.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/lldb/Makefile
diff -u pkgsrc/devel/lldb/Makefile:1.17 pkgsrc/devel/lldb/Makefile:1.18
--- pkgsrc/devel/lldb/Makefile:1.17     Tue Aug  7 10:44:50 2018
+++ pkgsrc/devel/lldb/Makefile  Sun Dec  9 20:04:39 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2018/08/07 10:44:50 adam Exp $
+# $NetBSD: Makefile,v 1.18 2018/12/09 20:04:39 adam Exp $
 
-DISTNAME=      lldb-6.0.1.src
+DISTNAME=      lldb-7.0.0.src
 PKGNAME=       ${DISTNAME:S/.src//}
 CATEGORIES=    lang devel
 MASTER_SITES=  http://llvm.org/releases/${PKGVERSION_NOREV}/
@@ -74,7 +74,7 @@ CMAKE_ARGS+=  -DLLDB_DISABLE_CURSES:BOOL=
 .endif
 
 post-extract:
-       ${RUN} mkdir -p ${WRKDIR}/build
+       ${MKDIR} ${WRKDIR}/build
 
 #.include "../../devel/googletest/buildlink3.mk" # check-lldb-unit
 .include "../../devel/libatomic_ops/buildlink3.mk"
@@ -82,8 +82,8 @@ post-extract:
 .include "../../lang/clang/buildlink3.mk"
 .include "../../lang/llvm/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/python/tool.mk"
 .include "../../lang/python/extension.mk"
+.include "../../lang/python/tool.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"

Index: pkgsrc/devel/lldb/PLIST
diff -u pkgsrc/devel/lldb/PLIST:1.8 pkgsrc/devel/lldb/PLIST:1.9
--- pkgsrc/devel/lldb/PLIST:1.8 Tue Aug  7 10:44:50 2018
+++ pkgsrc/devel/lldb/PLIST     Sun Dec  9 20:04:39 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2018/08/07 10:44:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2018/12/09 20:04:39 adam Exp $
 bin/lldb
 bin/lldb-argdumper
 bin/lldb-mi
@@ -71,7 +71,6 @@ include/lldb/API/SBValue.h
 include/lldb/API/SBValueList.h
 include/lldb/API/SBVariablesOptions.h
 include/lldb/API/SBWatchpoint.h
-include/lldb/API/SystemInitializerFull.h
 include/lldb/Breakpoint/Breakpoint.h
 include/lldb/Breakpoint/BreakpointID.h
 include/lldb/Breakpoint/BreakpointIDList.h
@@ -106,6 +105,7 @@ include/lldb/Core/Communication.h
 include/lldb/Core/Debugger.h
 include/lldb/Core/Disassembler.h
 include/lldb/Core/DumpDataExtractor.h
+include/lldb/Core/DumpRegisterValue.h
 include/lldb/Core/EmulateInstruction.h
 include/lldb/Core/Event.h
 include/lldb/Core/FileLineResolver.h
@@ -278,7 +278,6 @@ include/lldb/Host/windows/windows.h
 include/lldb/Initialization/SystemInitializer.h
 include/lldb/Initialization/SystemInitializerCommon.h
 include/lldb/Initialization/SystemLifetimeManager.h
-include/lldb/Interpreter/Args.h
 include/lldb/Interpreter/CommandAlias.h
 include/lldb/Interpreter/CommandCompletions.h
 include/lldb/Interpreter/CommandHistory.h
@@ -288,6 +287,7 @@ include/lldb/Interpreter/CommandObjectMu
 include/lldb/Interpreter/CommandObjectRegexCommand.h
 include/lldb/Interpreter/CommandOptionValidators.h
 include/lldb/Interpreter/CommandReturnObject.h
+include/lldb/Interpreter/OptionArgParser.h
 include/lldb/Interpreter/OptionGroupArchitecture.h
 include/lldb/Interpreter/OptionGroupBoolean.h
 include/lldb/Interpreter/OptionGroupFile.h
@@ -432,8 +432,10 @@ include/lldb/Target/Unwind.h
 include/lldb/Target/UnwindAssembly.h
 include/lldb/Utility/AnsiTerminal.h
 include/lldb/Utility/ArchSpec.h
+include/lldb/Utility/Args.h
 include/lldb/Utility/Baton.h
 include/lldb/Utility/CleanUp.h
+include/lldb/Utility/CompletionRequest.h
 include/lldb/Utility/Connection.h
 include/lldb/Utility/ConstString.h
 include/lldb/Utility/DataBuffer.h
@@ -443,10 +445,10 @@ include/lldb/Utility/DataEncoder.h
 include/lldb/Utility/DataExtractor.h
 include/lldb/Utility/Either.h
 include/lldb/Utility/Endian.h
+include/lldb/Utility/Environment.h
 include/lldb/Utility/FastDemangle.h
 include/lldb/Utility/FileSpec.h
 include/lldb/Utility/Flags.h
-include/lldb/Utility/History.h
 include/lldb/Utility/IOObject.h
 include/lldb/Utility/Iterable.h
 include/lldb/Utility/JSON.h
@@ -467,6 +469,7 @@ include/lldb/Utility/StreamGDBRemote.h
 include/lldb/Utility/StreamString.h
 include/lldb/Utility/StreamTee.h
 include/lldb/Utility/StringExtractor.h
+include/lldb/Utility/StringExtractorGDBRemote.h
 include/lldb/Utility/StringLexer.h
 include/lldb/Utility/StringList.h
 include/lldb/Utility/StructuredData.h
@@ -493,7 +496,7 @@ include/lldb/lldb-types.h
 include/lldb/lldb-versioning.h
 lib/liblldb.so
 lib/liblldb.so.${PKGVERSION}
-${PLIST.posix}lib/liblldb.so.6
+${PLIST.posix}lib/liblldb.so.7
 lib/liblldbBase.a
 lib/liblldbBreakpoint.a
 lib/liblldbCommands.a
@@ -518,9 +521,11 @@ lib/liblldbPluginABISysV_s390x.a
 lib/liblldbPluginABISysV_x86_64.a
 lib/liblldbPluginAppleObjCRuntime.a
 lib/liblldbPluginArchitectureArm.a
+lib/liblldbPluginArchitecturePPC64.a
 lib/liblldbPluginCPlusPlusLanguage.a
 lib/liblldbPluginCXXItaniumABI.a
 lib/liblldbPluginDisassemblerLLVM.a
+lib/liblldbPluginDynamicLoaderDarwinKernel.a
 lib/liblldbPluginDynamicLoaderHexagonDYLD.a
 lib/liblldbPluginDynamicLoaderMacOSXDYLD.a
 lib/liblldbPluginDynamicLoaderPosixDYLD.a
@@ -533,6 +538,7 @@ lib/liblldbPluginInstructionARM.a
 lib/liblldbPluginInstructionARM64.a
 lib/liblldbPluginInstructionMIPS.a
 lib/liblldbPluginInstructionMIPS64.a
+lib/liblldbPluginInstructionPPC64.a
 lib/liblldbPluginInstrumentationRuntimeASan.a
 lib/liblldbPluginInstrumentationRuntimeMainThreadChecker.a
 lib/liblldbPluginInstrumentationRuntimeTSan.a
@@ -566,6 +572,7 @@ lib/liblldbPluginPlatformWindows.a
 ${PLIST.posix}lib/liblldbPluginProcess${OPSYS}.a
 lib/liblldbPluginProcessElfCore.a
 lib/liblldbPluginProcessGDBRemote.a
+lib/liblldbPluginProcessMachCore.a
 lib/liblldbPluginProcessMinidump.a
 ${PLIST.posix}lib/liblldbPluginProcessPOSIX.a
 lib/liblldbPluginProcessUtility.a

Index: pkgsrc/devel/lldb/buildlink3.mk
diff -u pkgsrc/devel/lldb/buildlink3.mk:1.4 pkgsrc/devel/lldb/buildlink3.mk:1.5
--- pkgsrc/devel/lldb/buildlink3.mk:1.4 Sat Dec 30 10:39:24 2017
+++ pkgsrc/devel/lldb/buildlink3.mk     Sun Dec  9 20:04:39 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/12/30 10:39:24 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/12/09 20:04:39 adam Exp $
 
 BUILDLINK_TREE+=       lldb
 
 .if !defined(LLDB_BUILDLINK3_MK)
 LLDB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.lldb+=   lldb>=4.0.1
+BUILDLINK_API_DEPENDS.lldb+=   lldb>=7.0.0
 BUILDLINK_PKGSRCDIR.lldb?=     ../../devel/lldb
 
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/devel/lldb/distinfo
diff -u pkgsrc/devel/lldb/distinfo:1.12 pkgsrc/devel/lldb/distinfo:1.13
--- pkgsrc/devel/lldb/distinfo:1.12     Tue Aug  7 10:44:50 2018
+++ pkgsrc/devel/lldb/distinfo  Sun Dec  9 20:04:39 2018
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.12 2018/08/07 10:44:50 adam Exp $
+$NetBSD: distinfo,v 1.13 2018/12/09 20:04:39 adam Exp $
 
-SHA1 (lldb-6.0.1.src.tar.xz) = 907a32c7170067f485121a1e8ff793b16d1ff491
-RMD160 (lldb-6.0.1.src.tar.xz) = 60b396b12067b99590c3966578809974a2283b55
-SHA512 (lldb-6.0.1.src.tar.xz) = 93ee2efea07276f8838bc2b3ff039cab8c7a1a6965647aaa4dee99f55c6465d5584ed3be87b144e2e32b5acc7db9cec56d89404de764a2f53643ed154d213721
-Size (lldb-6.0.1.src.tar.xz) = 19292420 bytes
+SHA1 (lldb-7.0.0.src.tar.xz) = 9b9b545bd79e67edcca3dfbbc80c89ca2546ef90
+RMD160 (lldb-7.0.0.src.tar.xz) = de62a57d3a00da2b24774b258eacedf49979a1fe
+SHA512 (lldb-7.0.0.src.tar.xz) = 32d93276a07b5f7ca64fc45e7b51004825d1636ec3dff163c5de9f769046a81921c1d82f0aa6eddf3778e1ecf8d4f87c3d5e6bcd3f9ac8cae36278bf12e9e9c8
+Size (lldb-7.0.0.src.tar.xz) = 19403012 bytes
 SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 8f7d06a4b3a1e996af9af4affd650291c4f01fe5
 SHA1 (patch-scripts_Python_modules_readline_readline.cpp) = 4a030226c47cf7d54ebc727e92e278c163e48bf5
-SHA1 (patch-source_Plugins_ScriptInterpreter_Python_PythonDataObjects.cpp) = 99f038eb8f6c3add00c758db1e554a5298cfe589

Index: pkgsrc/devel/polly/Makefile
diff -u pkgsrc/devel/polly/Makefile:1.10 pkgsrc/devel/polly/Makefile:1.11
--- pkgsrc/devel/polly/Makefile:1.10    Tue Aug  7 10:44:50 2018
+++ pkgsrc/devel/polly/Makefile Sun Dec  9 20:04:39 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2018/08/07 10:44:50 adam Exp $
+# $NetBSD: Makefile,v 1.11 2018/12/09 20:04:39 adam Exp $
 
-DISTNAME=      polly-6.0.1.src
+DISTNAME=      polly-7.0.0.src
 PKGNAME=       ${DISTNAME:S/.src//}
 CATEGORIES=    devel
 MASTER_SITES=  http://llvm.org/releases/${PKGVERSION_NOREV}/
@@ -25,7 +25,7 @@ CMAKE_ARGS+=  -DCMAKE_C_COMPILER=${CC:Q}
 CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=${CXX:Q}
 
 post-extract:
-       ${RUN} mkdir -p ${WRKDIR}/build
+       ${MKDIR} ${WRKDIR}/build
 
 .include "../../lang/llvm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/polly/distinfo
diff -u pkgsrc/devel/polly/distinfo:1.10 pkgsrc/devel/polly/distinfo:1.11
--- pkgsrc/devel/polly/distinfo:1.10    Tue Aug  7 10:44:50 2018
+++ pkgsrc/devel/polly/distinfo Sun Dec  9 20:04:39 2018
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2018/08/07 10:44:50 adam Exp $
+$NetBSD: distinfo,v 1.11 2018/12/09 20:04:39 adam Exp $
 
-SHA1 (polly-6.0.1.src.tar.xz) = ace57e113a26c1244cf28c79012ff5e3f73ff076
-RMD160 (polly-6.0.1.src.tar.xz) = 0f50c00fcd1a1e6b5fcb1e8adce380e7c98fb391
-SHA512 (polly-6.0.1.src.tar.xz) = 1851223653f8c326ddf39f5cf9fc18a2310299769c011795d8e1a5abef2834d2c800fae318e6370547d3b6b35199ce29fe76582b64493ab8fa506aff59272539
-Size (polly-6.0.1.src.tar.xz) = 8684364 bytes
+SHA1 (polly-7.0.0.src.tar.xz) = 9c495f72e7aba6b82027666f6cd8ccdf0ec098a5
+RMD160 (polly-7.0.0.src.tar.xz) = a9e8992485da3cbbd11213c67f672275cbf14c55
+SHA512 (polly-7.0.0.src.tar.xz) = 7779d55db3839420e1d1e0941216b809ef4b436f6857f2ec95902da70c76ede55ffa32e59f36990acceb39c014bdc08fcb9ceb5d0085e9a93c1a493b49f242bc
+Size (polly-7.0.0.src.tar.xz) = 8748660 bytes
 SHA1 (patch-CMakeLists.txt) = 8138e11f858f23e0069c8fa0c07eff2b7aaf8c43
 SHA1 (patch-lib_External_isl_configure) = 97c83ab1d2f83e60ab39b41cf055c18074167e66

Index: pkgsrc/devel/polly/PLIST
diff -u pkgsrc/devel/polly/PLIST:1.5 pkgsrc/devel/polly/PLIST:1.6
--- pkgsrc/devel/polly/PLIST:1.5        Tue Aug  7 10:44:50 2018
+++ pkgsrc/devel/polly/PLIST    Sun Dec  9 20:04:39 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2018/08/07 10:44:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2018/12/09 20:04:39 adam Exp $
 include/polly/Canonicalization.h
 include/polly/CodeGen/BlockGenerators.h
 include/polly/CodeGen/CodeGeneration.h
@@ -35,6 +35,7 @@ include/polly/Simplify.h
 include/polly/Support/DumpModulePass.h
 include/polly/Support/GICHelper.h
 include/polly/Support/ISLOStream.h
+include/polly/Support/ISLOperators.h
 include/polly/Support/ISLTools.h
 include/polly/Support/LinkGPURuntime.h
 include/polly/Support/SCEVAffinator.h
@@ -49,22 +50,12 @@ include/polly/isl/arg.h
 include/polly/isl/ast.h
 include/polly/isl/ast_build.h
 include/polly/isl/ast_type.h
-include/polly/isl/band.h
 include/polly/isl/constraint.h
+include/polly/isl/cpp-checked-conversion.h
+include/polly/isl/cpp-checked.h
+include/polly/isl/cpp.h
 include/polly/isl/ctx.h
-include/polly/isl/deprecated/aff_int.h
-include/polly/isl/deprecated/ast_int.h
-include/polly/isl/deprecated/constraint_int.h
-include/polly/isl/deprecated/ilp_int.h
-include/polly/isl/deprecated/int.h
-include/polly/isl/deprecated/map_int.h
-include/polly/isl/deprecated/mat_int.h
-include/polly/isl/deprecated/point_int.h
-include/polly/isl/deprecated/polynomial_int.h
-include/polly/isl/deprecated/set_int.h
-include/polly/isl/deprecated/union_map_int.h
-include/polly/isl/deprecated/val_int.h
-include/polly/isl/deprecated/vec_int.h
+include/polly/isl/fixed_box.h
 include/polly/isl/flow.h
 include/polly/isl/hash.h
 include/polly/isl/hmap.h
@@ -72,6 +63,7 @@ include/polly/isl/id.h
 include/polly/isl/id_to_ast_expr.h
 include/polly/isl/id_to_id.h
 include/polly/isl/id_to_pw_aff.h
+include/polly/isl/id_type.h
 include/polly/isl/ilp.h
 include/polly/isl/isl-noexceptions.h
 include/polly/isl/list.h
@@ -101,14 +93,17 @@ include/polly/isl/schedule_type.h
 include/polly/isl/set.h
 include/polly/isl/set_type.h
 include/polly/isl/space.h
+include/polly/isl/space_type.h
 include/polly/isl/stdint.h
 include/polly/isl/stream.h
+include/polly/isl/stride_info.h
 include/polly/isl/union_map.h
 include/polly/isl/union_map_type.h
 include/polly/isl/union_set.h
 include/polly/isl/union_set_type.h
 include/polly/isl/val.h
 include/polly/isl/val_gmp.h
+include/polly/isl/val_type.h
 include/polly/isl/vec.h
 include/polly/isl/version.h
 include/polly/isl/vertices.h

Index: pkgsrc/devel/polly/buildlink3.mk
diff -u pkgsrc/devel/polly/buildlink3.mk:1.3 pkgsrc/devel/polly/buildlink3.mk:1.4
--- pkgsrc/devel/polly/buildlink3.mk:1.3        Tue Jul 11 19:47:37 2017
+++ pkgsrc/devel/polly/buildlink3.mk    Sun Dec  9 20:04:39 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 19:47:37 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/12/09 20:04:39 adam Exp $
 
 BUILDLINK_TREE+=       polly
 
 .if !defined(POLLY_BUILDLINK3_MK)
 POLLY_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.polly+=  polly>=4.0.1
+BUILDLINK_API_DEPENDS.polly+=  polly>=7.0.0
 BUILDLINK_PKGSRCDIR.polly?=    ../../devel/polly
 
 .include "../../lang/llvm/buildlink3.mk"

Index: pkgsrc/lang/clang/Makefile
diff -u pkgsrc/lang/clang/Makefile:1.45 pkgsrc/lang/clang/Makefile:1.46
--- pkgsrc/lang/clang/Makefile:1.45     Wed Oct 24 21:12:59 2018
+++ pkgsrc/lang/clang/Makefile  Sun Dec  9 20:04:38 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2018/10/24 21:12:59 maya Exp $
+# $NetBSD: Makefile,v 1.46 2018/12/09 20:04:38 adam Exp $
 
 PKGNAME=               ${DISTNAME:S/.src//:S/cfe/clang/}
-PKGREVISION=           1
 PYTHON_FOR_BUILD_ONLY= yes
 
 CMAKE_ARGS+=   -DCLANG_ENABLE_STATIC_ANALYZER=OFF

Index: pkgsrc/lang/clang/Makefile.common
diff -u pkgsrc/lang/clang/Makefile.common:1.28 pkgsrc/lang/clang/Makefile.common:1.29
--- pkgsrc/lang/clang/Makefile.common:1.28      Thu Aug  9 14:56:41 2018
+++ pkgsrc/lang/clang/Makefile.common   Sun Dec  9 20:04:38 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.28 2018/08/09 14:56:41 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.29 2018/12/09 20:04:38 adam Exp $
 # used by lang/clang/Makefile
 # used by lang/clang-static-analyzer/Makefile
 
-DISTNAME=      cfe-6.0.1.src
+DISTNAME=      cfe-7.0.0.src
 CATEGORIES=    lang devel
 MASTER_SITES=  http://llvm.org/releases/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz
@@ -65,6 +65,7 @@ REPLACE_PYTHON+=      utils/analyzer/ubiviz
 REPLACE_PYTHON+=       utils/check_cfc/check_cfc.py
 REPLACE_PYTHON+=       utils/check_cfc/obj_diff.py
 REPLACE_PYTHON+=       utils/check_cfc/test_check_cfc.py
+REPLACE_PYTHON+=       utils/hmaptool/hmaptool
 REPLACE_PYTHON+=       utils/token-delta.py
 REPLACE_PYTHON+=       www/builtins.py
 
@@ -129,7 +130,7 @@ CMAKE_ARGS+=                -DCLANG_INCLUDE_TESTS=OFF
 .endif
 
 post-extract:
-       ${RUN} mkdir -p ${WRKDIR}/build
+       ${MKDIR} ${WRKDIR}/build
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/lang/clang/PLIST
diff -u pkgsrc/lang/clang/PLIST:1.24 pkgsrc/lang/clang/PLIST:1.25
--- pkgsrc/lang/clang/PLIST:1.24        Tue Aug  7 10:44:50 2018
+++ pkgsrc/lang/clang/PLIST     Sun Dec  9 20:04:38 2018
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.24 2018/08/07 10:44:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2018/12/09 20:04:38 adam Exp $
 bin/c-index-test
 bin/clang
 bin/clang++
-bin/clang-6.0
+bin/clang-7
 bin/clang-cl
 bin/clang-cpp
 bin/clang-format
@@ -10,7 +10,9 @@ bin/clang-import-test
 bin/clang-offload-bundler
 bin/clang-refactor
 bin/clang-rename
+bin/diagtool
 bin/git-clang-format
+bin/hmaptool
 include/clang-c/BuildSystem.h
 include/clang-c/CXCompilationDatabase.h
 include/clang-c/CXErrorCode.h
@@ -60,6 +62,7 @@ include/clang/AST/CommentNodes.inc
 include/clang/AST/CommentParser.h
 include/clang/AST/CommentSema.h
 include/clang/AST/CommentVisitor.h
+include/clang/AST/ComparisonCategories.h
 include/clang/AST/DataCollection.h
 include/clang/AST/Decl.h
 include/clang/AST/DeclAccessPair.h
@@ -91,11 +94,13 @@ include/clang/AST/Mangle.h
 include/clang/AST/MangleNumberingContext.h
 include/clang/AST/NSAPI.h
 include/clang/AST/NestedNameSpecifier.h
+include/clang/AST/NonTrivialTypeVisitor.h
 include/clang/AST/ODRHash.h
 include/clang/AST/OpenMPClause.h
 include/clang/AST/OperationKinds.def
 include/clang/AST/OperationKinds.h
 include/clang/AST/ParentMap.h
+include/clang/AST/PrettyDeclStackTrace.h
 include/clang/AST/PrettyPrinter.h
 include/clang/AST/QualTypeNames.h
 include/clang/AST/RawCommentList.h
@@ -157,6 +162,7 @@ include/clang/Analysis/CFGStmtMap.h
 include/clang/Analysis/CallGraph.h
 include/clang/Analysis/CloneDetection.h
 include/clang/Analysis/CodeInjector.h
+include/clang/Analysis/ConstructionContext.h
 include/clang/Analysis/DomainSpecific/CocoaConventions.h
 include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
 include/clang/Analysis/FlowSensitive/DataflowValues.h
@@ -172,6 +178,7 @@ include/clang/Basic/AttrList.inc
 include/clang/Basic/AttrSubMatchRulesList.inc
 include/clang/Basic/AttrSubjectMatchRules.h
 include/clang/Basic/Attributes.h
+include/clang/Basic/BitmaskEnum.h
 include/clang/Basic/Builtins.def
 include/clang/Basic/Builtins.h
 include/clang/Basic/BuiltinsAArch64.def
@@ -216,6 +223,7 @@ include/clang/Basic/DiagnosticSemaKinds.
 include/clang/Basic/DiagnosticSerializationKinds.inc
 include/clang/Basic/ExceptionSpecificationType.h
 include/clang/Basic/ExpressionTraits.h
+include/clang/Basic/Features.def
 include/clang/Basic/FileManager.h
 include/clang/Basic/FileSystemOptions.h
 include/clang/Basic/FileSystemStatCache.h
@@ -249,6 +257,7 @@ include/clang/Basic/SourceLocation.h
 include/clang/Basic/SourceManager.h
 include/clang/Basic/SourceManagerInternals.h
 include/clang/Basic/Specifiers.h
+include/clang/Basic/Stack.h
 include/clang/Basic/SyncScope.h
 include/clang/Basic/TargetBuiltins.h
 include/clang/Basic/TargetCXXABI.h
@@ -260,11 +269,12 @@ include/clang/Basic/TokenKinds.h
 include/clang/Basic/TypeTraits.h
 include/clang/Basic/Version.h
 include/clang/Basic/Version.inc
-include/clang/Basic/VersionTuple.h
 include/clang/Basic/VirtualFileSystem.h
 include/clang/Basic/Visibility.h
 include/clang/Basic/X86Target.def
+include/clang/Basic/XRayInstr.h
 include/clang/Basic/XRayLists.h
+include/clang/Basic/arm_fp16.inc
 include/clang/Basic/arm_neon.inc
 include/clang/CodeGen/BackendUtil.h
 include/clang/CodeGen/CGFunctionInfo.h
@@ -391,7 +401,6 @@ include/clang/Sema/AttrParsedAttrKinds.i
 include/clang/Sema/AttrParsedAttrList.inc
 include/clang/Sema/AttrSpellingListIndex.inc
 include/clang/Sema/AttrTemplateInstantiate.inc
-include/clang/Sema/AttributeList.h
 include/clang/Sema/CXXFieldCollector.h
 include/clang/Sema/CleanupInfo.h
 include/clang/Sema/CodeCompleteConsumer.h
@@ -408,8 +417,8 @@ include/clang/Sema/MultiplexExternalSema
 include/clang/Sema/ObjCMethodList.h
 include/clang/Sema/Overload.h
 include/clang/Sema/Ownership.h
+include/clang/Sema/ParsedAttr.h
 include/clang/Sema/ParsedTemplate.h
-include/clang/Sema/PrettyDeclStackTrace.h
 include/clang/Sema/Scope.h
 include/clang/Sema/ScopeInfo.h
 include/clang/Sema/Sema.h
@@ -420,6 +429,7 @@ include/clang/Sema/SemaInternal.h
 include/clang/Sema/SemaLambda.h
 include/clang/Sema/Template.h
 include/clang/Sema/TemplateDeduction.h
+include/clang/Sema/TemplateInstCallback.h
 include/clang/Sema/TypoCorrection.h
 include/clang/Sema/Weak.h
 include/clang/Serialization/ASTBitCodes.h
@@ -474,7 +484,13 @@ include/clang/StaticAnalyzer/Core/PathSe
 include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState_Fwd.h
+include/clang/StaticAnalyzer/Core/PathSensitive/RangedConstraintManager.h
 include/clang/StaticAnalyzer/Core/PathSensitive/Regions.def
+include/clang/StaticAnalyzer/Core/PathSensitive/SMTConstraintManager.h
+include/clang/StaticAnalyzer/Core/PathSensitive/SMTContext.h
+include/clang/StaticAnalyzer/Core/PathSensitive/SMTExpr.h
+include/clang/StaticAnalyzer/Core/PathSensitive/SMTSolver.h
+include/clang/StaticAnalyzer/Core/PathSensitive/SMTSort.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SValVisitor.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SVals.def
@@ -496,6 +512,7 @@ include/clang/StaticAnalyzer/Frontend/Fr
 include/clang/StaticAnalyzer/Frontend/ModelConsumer.h
 include/clang/Tooling/ASTDiff/ASTDiff.h
 include/clang/Tooling/ASTDiff/ASTDiffInternal.h
+include/clang/Tooling/AllTUsExecution.h
 include/clang/Tooling/ArgumentsAdjusters.h
 include/clang/Tooling/CommonOptionsParser.h
 include/clang/Tooling/CompilationDatabase.h
@@ -507,6 +524,8 @@ include/clang/Tooling/DiagnosticsYaml.h
 include/clang/Tooling/Execution.h
 include/clang/Tooling/FileMatchTrie.h
 include/clang/Tooling/FixIt.h
+include/clang/Tooling/Inclusions/HeaderIncludes.h
+include/clang/Tooling/Inclusions/IncludeStyle.h
 include/clang/Tooling/JSONCompilationDatabase.h
 include/clang/Tooling/Refactoring.h
 include/clang/Tooling/Refactoring/ASTSelection.h
@@ -538,7 +557,9 @@ include/clang/Tooling/Tooling.h
 lib/clang/${PKGVERSION}/include/__clang_cuda_builtin_vars.h
 lib/clang/${PKGVERSION}/include/__clang_cuda_cmath.h
 lib/clang/${PKGVERSION}/include/__clang_cuda_complex_builtins.h
+lib/clang/${PKGVERSION}/include/__clang_cuda_device_functions.h
 lib/clang/${PKGVERSION}/include/__clang_cuda_intrinsics.h
+lib/clang/${PKGVERSION}/include/__clang_cuda_libdevice_declares.h
 lib/clang/${PKGVERSION}/include/__clang_cuda_math_forward_declares.h
 lib/clang/${PKGVERSION}/include/__clang_cuda_runtime_wrapper.h
 lib/clang/${PKGVERSION}/include/__stddef_max_align_t.h
@@ -549,6 +570,7 @@ lib/clang/${PKGVERSION}/include/altivec.
 lib/clang/${PKGVERSION}/include/ammintrin.h
 lib/clang/${PKGVERSION}/include/arm64intr.h
 lib/clang/${PKGVERSION}/include/arm_acle.h
+lib/clang/${PKGVERSION}/include/arm_fp16.h
 lib/clang/${PKGVERSION}/include/arm_neon.h
 lib/clang/${PKGVERSION}/include/armintr.h
 lib/clang/${PKGVERSION}/include/avx2intrin.h
@@ -578,6 +600,7 @@ lib/clang/${PKGVERSION}/include/avxintri
 lib/clang/${PKGVERSION}/include/bmi2intrin.h
 lib/clang/${PKGVERSION}/include/bmiintrin.h
 lib/clang/${PKGVERSION}/include/cetintrin.h
+lib/clang/${PKGVERSION}/include/cldemoteintrin.h
 lib/clang/${PKGVERSION}/include/clflushoptintrin.h
 lib/clang/${PKGVERSION}/include/clwbintrin.h
 lib/clang/${PKGVERSION}/include/clzerointrin.h
@@ -598,6 +621,7 @@ lib/clang/${PKGVERSION}/include/ia32intr
 lib/clang/${PKGVERSION}/include/immintrin.h
 lib/clang/${PKGVERSION}/include/intrin.h
 lib/clang/${PKGVERSION}/include/inttypes.h
+lib/clang/${PKGVERSION}/include/invpcidintrin.h
 lib/clang/${PKGVERSION}/include/iso646.h
 lib/clang/${PKGVERSION}/include/limits.h
 lib/clang/${PKGVERSION}/include/lwpintrin.h
@@ -606,17 +630,21 @@ lib/clang/${PKGVERSION}/include/mm3dnow.
 lib/clang/${PKGVERSION}/include/mm_malloc.h
 lib/clang/${PKGVERSION}/include/mmintrin.h
 lib/clang/${PKGVERSION}/include/module.modulemap
+lib/clang/${PKGVERSION}/include/movdirintrin.h
 lib/clang/${PKGVERSION}/include/msa.h
 lib/clang/${PKGVERSION}/include/mwaitxintrin.h
 lib/clang/${PKGVERSION}/include/nmmintrin.h
 lib/clang/${PKGVERSION}/include/opencl-c.h
+lib/clang/${PKGVERSION}/include/pconfigintrin.h
 lib/clang/${PKGVERSION}/include/pkuintrin.h
 lib/clang/${PKGVERSION}/include/pmmintrin.h
 lib/clang/${PKGVERSION}/include/popcntintrin.h
 lib/clang/${PKGVERSION}/include/prfchwintrin.h
+lib/clang/${PKGVERSION}/include/ptwriteintrin.h
 lib/clang/${PKGVERSION}/include/rdseedintrin.h
 lib/clang/${PKGVERSION}/include/rtmintrin.h
 lib/clang/${PKGVERSION}/include/s390intrin.h
+lib/clang/${PKGVERSION}/include/sgxintrin.h
 lib/clang/${PKGVERSION}/include/shaintrin.h
 lib/clang/${PKGVERSION}/include/smmintrin.h
 lib/clang/${PKGVERSION}/include/stdalign.h
@@ -635,6 +663,8 @@ lib/clang/${PKGVERSION}/include/vaesintr
 lib/clang/${PKGVERSION}/include/varargs.h
 lib/clang/${PKGVERSION}/include/vecintrin.h
 lib/clang/${PKGVERSION}/include/vpclmulqdqintrin.h
+lib/clang/${PKGVERSION}/include/waitpkgintrin.h
+lib/clang/${PKGVERSION}/include/wbnoinvdintrin.h
 lib/clang/${PKGVERSION}/include/wmmintrin.h
 lib/clang/${PKGVERSION}/include/x86intrin.h
 lib/clang/${PKGVERSION}/include/xmmintrin.h
@@ -648,8 +678,7 @@ lib/cmake/clang/ClangConfig.cmake
 lib/cmake/clang/ClangTargets-release.cmake
 lib/cmake/clang/ClangTargets.cmake
 lib/libclang.${SOEXT}
-${PLIST.notdylib}lib/libclang.${SOEXT}.${LLVM_MAJOR}
-${PLIST.notdylib}lib/libclang.${SOEXT}.6
+${PLIST.notdylib}lib/libclang.${SOEXT}.7
 lib/libclangAST.a
 lib/libclangASTMatchers.a
 lib/libclangAnalysis.a
@@ -663,6 +692,7 @@ lib/libclangFormat.a
 lib/libclangFrontend.a
 lib/libclangFrontendTool.a
 lib/libclangHandleCXX.a
+lib/libclangHandleLLVM.a
 lib/libclangIndex.a
 lib/libclangLex.a
 lib/libclangParse.a
@@ -673,6 +703,7 @@ lib/libclangSerialization.a
 lib/libclangTooling.a
 lib/libclangToolingASTDiff.a
 lib/libclangToolingCore.a
+lib/libclangToolingInclusions.a
 lib/libclangToolingRefactor.a
 share/clang/bash-autocomplete.sh
 share/clang/clang-format-bbedit.applescript

Index: pkgsrc/lang/clang/buildlink3.mk
diff -u pkgsrc/lang/clang/buildlink3.mk:1.8 pkgsrc/lang/clang/buildlink3.mk:1.9
--- pkgsrc/lang/clang/buildlink3.mk:1.8 Wed Feb  7 12:10:21 2018
+++ pkgsrc/lang/clang/buildlink3.mk     Sun Dec  9 20:04:38 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.8 2018/02/07 12:10:21 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/12/09 20:04:38 adam Exp $
 
 BUILDLINK_TREE+=       clang
 
 .if !defined(CLANG_BUILDLINK3_MK)
 CLANG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.clang+=  clang>=5.0
+BUILDLINK_API_DEPENDS.clang+=  clang>=7.0.0
 BUILDLINK_PKGSRCDIR.clang?=    ../../lang/clang
 
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/lang/clang/distinfo
diff -u pkgsrc/lang/clang/distinfo:1.54 pkgsrc/lang/clang/distinfo:1.55
--- pkgsrc/lang/clang/distinfo:1.54     Wed Oct 24 21:12:59 2018
+++ pkgsrc/lang/clang/distinfo  Sun Dec  9 20:04:38 2018
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.54 2018/10/24 21:12:59 maya Exp $
+$NetBSD: distinfo,v 1.55 2018/12/09 20:04:38 adam Exp $
 
-SHA1 (cfe-6.0.1.src.tar.xz) = d93d8f3e3d7eb549ac58507383f7fcbdd78804d7
-RMD160 (cfe-6.0.1.src.tar.xz) = c280cd2037b19f9bd733944b765f9ca23b35e0a4
-SHA512 (cfe-6.0.1.src.tar.xz) = f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
-Size (cfe-6.0.1.src.tar.xz) = 11905772 bytes
-SHA1 (patch-lib_Basic_Targets_OSTargets.h) = a8a710720e67c778cf5d4e30e3bb41d9aaf7c9d4
-SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 7cf1d43b50e7a0bf0842f2265b0449b0fea44007
-SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 13849df72a4b719bbb6109ab1d1abf2e7b97014f
-SHA1 (patch-lib_Frontend_InitHeaderSearch.cpp) = 924cb81bd8e2eb07c3577e25c1b1d4f405e9360f
+SHA1 (cfe-7.0.0.src.tar.xz) = a4eb0b33f6a201e97ac62eb1b519e2476e56c794
+RMD160 (cfe-7.0.0.src.tar.xz) = 10e3071762617f0623ae05500ce6176b625c680c
+SHA512 (cfe-7.0.0.src.tar.xz) = 17a658032a0160c57d4dc23cb45a1516a897e0e2ba4ebff29472e471feca04c5b68cff351cdf231b42aab0cff587b84fe11b921d1ca7194a90e6485913d62cb7
+Size (cfe-7.0.0.src.tar.xz) = 12541904 bytes
+SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 2a00f6de42c67d8c8aca0153339aba1adc455280
+SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 17b6b748135fb051101e926f86910fd3bb55f312
+SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 07dacb5c341360bdce229f512bdfa95e5d6ef81c
+SHA1 (patch-lib_Frontend_InitHeaderSearch.cpp) = 497ddbe1eac8726d736bed58557a795dce207d1a

Index: pkgsrc/lang/clang-static-analyzer/Makefile
diff -u pkgsrc/lang/clang-static-analyzer/Makefile:1.9 pkgsrc/lang/clang-static-analyzer/Makefile:1.10
--- pkgsrc/lang/clang-static-analyzer/Makefile:1.9      Wed Aug 22 09:45:19 2018
+++ pkgsrc/lang/clang-static-analyzer/Makefile  Sun Dec  9 20:04:38 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2018/08/22 09:45:19 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/12/09 20:04:38 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/cfe/clang-static-analyzer/:S/.src//}
-PKGREVISION=   1
 
 DEPENDS+=      clang-${PKGVERSION_NOREV}{,nb*}:../../lang/clang
 

Index: pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h
diff -u pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h:1.2 pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h:1.3
--- pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h:1.2   Wed Oct 24 21:12:59 2018
+++ pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h       Sun Dec  9 20:04:38 2018
@@ -1,12 +1,12 @@
-$NetBSD: patch-lib_Basic_Targets_OSTargets.h,v 1.2 2018/10/24 21:12:59 maya Exp $
+$NetBSD: patch-lib_Basic_Targets_OSTargets.h,v 1.3 2018/12/09 20:04:38 adam Exp $
 
 Sync SunOS default defines with a working reality.
 NetBSD __float128, needed to build anything with base libstdc++
 which assumes __float128.
 
---- lib/Basic/Targets/OSTargets.h.orig 2018-01-04 07:43:41.000000000 +0000
+--- lib/Basic/Targets/OSTargets.h.orig 2018-07-23 17:44:00.000000000 +0000
 +++ lib/Basic/Targets/OSTargets.h
-@@ -358,12 +358,22 @@ protected:
+@@ -364,12 +364,22 @@ protected:
      Builder.defineMacro("__ELF__");
      if (Opts.POSIXThreads)
        Builder.defineMacro("_REENTRANT");
@@ -17,7 +17,7 @@ which assumes __float128.
  public:
    NetBSDTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
        : OSTargetInfo<Target>(Triple, Opts) {
-     this->MCountName = "_mcount";
+     this->MCountName = "__mcount";
 +    switch (Triple.getArch()) {
 +    default:
 +      break;
@@ -29,7 +29,7 @@ which assumes __float128.
    }
  };
  
-@@ -531,20 +541,16 @@ protected:
+@@ -538,19 +548,14 @@ protected:
      Builder.defineMacro("__ELF__");
      Builder.defineMacro("__svr4__");
      Builder.defineMacro("__SVR4");
@@ -49,13 +49,10 @@ which assumes __float128.
 -    Builder.defineMacro("_LARGEFILE_SOURCE");
 -    Builder.defineMacro("_LARGEFILE64_SOURCE");
 -    Builder.defineMacro("__EXTENSIONS__");
--    Builder.defineMacro("_REENTRANT");
 +      Builder.defineMacro("_LARGEFILE_SOURCE");
 +      Builder.defineMacro("_LARGEFILE64_SOURCE");
 +      Builder.defineMacro("__EXTENSIONS__");
 +    }
-+    if (Opts.POSIXThreads)
-+      Builder.defineMacro("_REENTRANT");
-   }
- 
- public:
+     if (Opts.POSIXThreads)
+       Builder.defineMacro("_REENTRANT");
+     if (this->HasFloat128)

Index: pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp
diff -u pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp:1.1 pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp:1.2
--- pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp:1.1       Thu Aug  9 14:56:41 2018
+++ pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp   Sun Dec  9 20:04:38 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_Driver_ToolChains_Solaris.cpp,v 1.1 2018/08/09 14:56:41 jperkin Exp $
+$NetBSD: patch-lib_Driver_ToolChains_Solaris.cpp,v 1.2 2018/12/09 20:04:38 adam Exp $
 
 Use compiler-rt instead of libgcc.
 Pull in libcxx correctly.
@@ -7,7 +7,7 @@ Don't specify --dynamic-linker, makes it
 Ensure we reset to -zdefaultextract prior to adding compiler-rt.
 Test removing -Bdynamic for golang.
 
---- lib/Driver/ToolChains/Solaris.cpp.orig     2018-01-04 07:43:41.000000000 +0000
+--- lib/Driver/ToolChains/Solaris.cpp.orig     2018-02-06 13:21:12.000000000 +0000
 +++ lib/Driver/ToolChains/Solaris.cpp
 @@ -49,8 +49,29 @@ void solaris::Linker::ConstructJob(Compi
                                     const InputInfoList &Inputs,
@@ -39,25 +39,21 @@ Test removing -Bdynamic for golang.
    // Demangle C++ names in errors
    CmdArgs.push_back("-C");
  
-@@ -62,15 +83,8 @@ void solaris::Linker::ConstructJob(Compi
-   if (Args.hasArg(options::OPT_static)) {
+@@ -63,13 +84,8 @@ void solaris::Linker::ConstructJob(Compi
      CmdArgs.push_back("-Bstatic");
      CmdArgs.push_back("-dn");
--  } else {
+   } else {
 -    CmdArgs.push_back("-Bdynamic");
--    if (Args.hasArg(options::OPT_shared)) {
--      CmdArgs.push_back("-shared");
+     if (Args.hasArg(options::OPT_shared)) {
+       CmdArgs.push_back("-shared");
 -    } else {
 -      CmdArgs.push_back("--dynamic-linker");
 -      CmdArgs.push_back(
 -          Args.MakeArgString(getToolChain().GetFilePath("ld.so.1")));
--    }
-+  } else if (Args.hasArg(options::OPT_shared)) {
-+    CmdArgs.push_back("-shared");
-   }
+     }
  
-   if (Output.isFilename()) {
-@@ -83,13 +97,11 @@ void solaris::Linker::ConstructJob(Compi
+     // libpthread has been folded into libc since Solaris 10, no need to do
+@@ -88,13 +104,11 @@ void solaris::Linker::ConstructJob(Compi
    if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
      if (!Args.hasArg(options::OPT_shared))
        CmdArgs.push_back(
@@ -73,13 +69,20 @@ Test removing -Bdynamic for golang.
 +        Args.MakeArgString(SysPath + "values-Xa.o"));
    }
  
-   getToolChain().AddFilePathLibArgs(Args, CmdArgs);
-@@ -100,21 +112,21 @@ void solaris::Linker::ConstructJob(Compi
+   // Provide __start___sancov_guards.  Solaris ld doesn't automatically create
+@@ -113,21 +127,18 @@ void solaris::Linker::ConstructJob(Compi
    AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);
  
    if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
 -    if (getToolChain().ShouldLinkCXXStdlib(Args))
 -      getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
+-    if (Args.hasArg(options::OPT_fstack_protector) ||
+-        Args.hasArg(options::OPT_fstack_protector_strong) ||
+-        Args.hasArg(options::OPT_fstack_protector_all)) {
+-      // Explicitly link ssp libraries, not folded into Solaris libc.
+-      CmdArgs.push_back("-lssp_nonshared");
+-      CmdArgs.push_back("-lssp");
+-    }
 -    CmdArgs.push_back("-lgcc_s");
 -    CmdArgs.push_back("-lc");
 -    if (!Args.hasArg(options::OPT_shared)) {
@@ -96,7 +99,12 @@ Test removing -Bdynamic for golang.
        CmdArgs.push_back("-lm");
      }
 +    CmdArgs.push_back("-lc");
+     if (NeedsSanitizerDeps)
+       linkSanitizerRuntimeDeps(getToolChain(), CmdArgs);
    }
+@@ -139,11 +150,7 @@ void solaris::Linker::ConstructJob(Compi
+       getToolChain().getCompilerRTArgString(Args, "sancov_end", false));
+   CmdArgs.push_back("--no-whole-archive");
  
 -  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
 -    CmdArgs.push_back(
@@ -107,46 +115,37 @@ Test removing -Bdynamic for golang.
  
    getToolChain().addProfileRTLibs(Args, CmdArgs);
  
-@@ -127,35 +139,9 @@ void solaris::Linker::ConstructJob(Compi
- Solaris::Solaris(const Driver &D, const llvm::Triple &Triple,
+@@ -172,26 +179,9 @@ Solaris::Solaris(const Driver &D, const 
                   const ArgList &Args)
      : Generic_ELF(D, Triple, Args) {
--
+ 
 -  GCCInstallation.init(Triple, Args);
 -
+-  StringRef LibSuffix = getSolarisLibSuffix(Triple);
 -  path_list &Paths = getFilePaths();
--  if (GCCInstallation.isValid())
--    addPathIfExists(D, GCCInstallation.getInstallPath(), Paths);
--
--  addPathIfExists(D, getDriver().getInstalledDir(), Paths);
--  if (getDriver().getInstalledDir() != getDriver().Dir)
--    addPathIfExists(D, getDriver().Dir, Paths);
--
--  addPathIfExists(D, getDriver().SysRoot + getDriver().Dir + "/../lib", Paths);
--
--  std::string LibPath = "/usr/lib/";
--  switch (Triple.getArch()) {
--  case llvm::Triple::x86:
--  case llvm::Triple::sparc:
--    break;
--  case llvm::Triple::x86_64:
--    LibPath += "amd64/";
--    break;
--  case llvm::Triple::sparcv9:
--    LibPath += "sparcv9/";
--    break;
--  default:
--    llvm_unreachable("Unsupported architecture");
+-  if (GCCInstallation.isValid()) {
+-    // On Solaris gcc uses both an architecture-specific path with triple in it
+-    // as well as a more generic lib path (+arch suffix).
+-    addPathIfExists(D,
+-                    GCCInstallation.getInstallPath() +
+-                        GCCInstallation.getMultilib().gccSuffix(),
+-                    Paths);
+-    addPathIfExists(D, GCCInstallation.getParentLibPath() + LibSuffix, Paths);
 -  }
 -
--  addPathIfExists(D, getDriver().SysRoot + LibPath, Paths);
+-  // If we are currently running Clang inside of the requested system root,
+-  // add its parent library path to those searched.
+-  if (StringRef(D.Dir).startswith(D.SysRoot))
+-    addPathIfExists(D, D.Dir + "/../lib", Paths);
+-
+-  addPathIfExists(D, D.SysRoot + "/usr/lib" + LibSuffix, Paths);
 +  // No special handling, the C runtime files are found directly above
 +  // and crle handles adding the default system library paths if they
 +  // are necessary.
  }
  
- Tool *Solaris::buildAssembler() const {
-@@ -164,30 +150,41 @@ Tool *Solaris::buildAssembler() const {
+ SanitizerMask Solaris::getSupportedSanitizers() const {
+@@ -211,6 +201,32 @@ Tool *Solaris::buildAssembler() const {
  
  Tool *Solaris::buildLinker() const { return new tools::solaris::Linker(*this); }
  
@@ -176,35 +175,6 @@ Test removing -Bdynamic for golang.
 +  }
 +}
 +
- void Solaris::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
-                                            ArgStringList &CC1Args) const {
-   if (DriverArgs.hasArg(options::OPT_nostdlibinc) ||
-       DriverArgs.hasArg(options::OPT_nostdincxx))
-     return;
- 
--  // Include the support directory for things like xlocale and fudged system
--  // headers.
--  // FIXME: This is a weird mix of libc++ and libstdc++. We should also be
--  // checking the value of -stdlib= here and adding the includes for libc++
--  // rather than libstdc++ if it's requested.
--  addSystemInclude(DriverArgs, CC1Args, "/usr/include/c++/v1/support/solaris");
--
--  if (GCCInstallation.isValid()) {
--    GCCVersion Version = GCCInstallation.getVersion();
--    addSystemInclude(DriverArgs, CC1Args,
--                     getDriver().SysRoot + "/usr/gcc/" +
--                     Version.MajorStr + "." +
--                     Version.MinorStr +
--                     "/include/c++/" + Version.Text);
--    addSystemInclude(DriverArgs, CC1Args,
--                     getDriver().SysRoot + "/usr/gcc/" + Version.MajorStr +
--                     "." + Version.MinorStr + "/include/c++/" +
--                     Version.Text + "/" +
--                     GCCInstallation.getTriple().str());
--  }
-+  // Currently assumes pkgsrc layout.
-+  addSystemInclude(DriverArgs, CC1Args,
-+                   llvm::sys::path::parent_path(getDriver().getInstalledDir())
-+                   + "/include/c++/v1");
-+  return;
- }
+ void Solaris::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
+                                         ArgStringList &CC1Args) const {
+   const Driver &D = getDriver();
Index: pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.h
diff -u pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.h:1.1 pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.h:1.2
--- pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.h:1.1 Thu Aug  9 14:56:41 2018
+++ pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.h     Sun Dec  9 20:04:38 2018
@@ -1,16 +1,16 @@
-$NetBSD: patch-lib_Driver_ToolChains_Solaris.h,v 1.1 2018/08/09 14:56:41 jperkin Exp $
+$NetBSD: patch-lib_Driver_ToolChains_Solaris.h,v 1.2 2018/12/09 20:04:38 adam Exp $
 
 Override AddCXXStdlibLibArgs().
 
---- lib/Driver/ToolChains/Solaris.h.orig       2018-01-04 07:43:41.000000000 +0000
+--- lib/Driver/ToolChains/Solaris.h.orig       2018-02-05 23:59:13.000000000 +0000
 +++ lib/Driver/ToolChains/Solaris.h
-@@ -60,6 +60,9 @@ public:
-   void AddClangCXXStdlibIncludeArgs(
-       const llvm::opt::ArgList &DriverArgs,
-       llvm::opt::ArgStringList &CC1Args) const override;
-+  void AddCXXStdlibLibArgs(
-+      const llvm::opt::ArgList &Args,
-+      llvm::opt::ArgStringList &CmdArgs) const override;
+@@ -67,6 +67,9 @@ public:
  
+   SanitizerMask getSupportedSanitizers() const override;
    unsigned GetDefaultDwarfVersion() const override { return 2; }
++  void AddCXXStdlibLibArgs(
++     const llvm::opt::ArgList &Args,
++     llvm::opt::ArgStringList &CmdArgs) const override;
  
+ protected:
+   Tool *buildAssembler() const override;
Index: pkgsrc/lang/clang/patches/patch-lib_Frontend_InitHeaderSearch.cpp
diff -u pkgsrc/lang/clang/patches/patch-lib_Frontend_InitHeaderSearch.cpp:1.1 pkgsrc/lang/clang/patches/patch-lib_Frontend_InitHeaderSearch.cpp:1.2
--- pkgsrc/lang/clang/patches/patch-lib_Frontend_InitHeaderSearch.cpp:1.1       Thu Aug  9 14:56:41 2018
+++ pkgsrc/lang/clang/patches/patch-lib_Frontend_InitHeaderSearch.cpp   Sun Dec  9 20:04:38 2018
@@ -1,13 +1,13 @@
-$NetBSD: patch-lib_Frontend_InitHeaderSearch.cpp,v 1.1 2018/08/09 14:56:41 jperkin Exp $
+$NetBSD: patch-lib_Frontend_InitHeaderSearch.cpp,v 1.2 2018/12/09 20:04:38 adam Exp $
 
 Don't add /usr/local/include by default on Solaris.
 
---- lib/Frontend/InitHeaderSearch.cpp.orig     2018-01-04 07:43:41.000000000 +0000
+--- lib/Frontend/InitHeaderSearch.cpp.orig     2018-06-28 23:23:45.000000000 +0000
 +++ lib/Frontend/InitHeaderSearch.cpp
-@@ -216,6 +216,7 @@ void InitHeaderSearch::AddDefaultCInclud
-     case llvm::Triple::NaCl:
+@@ -221,6 +221,7 @@ void InitHeaderSearch::AddDefaultCInclud
      case llvm::Triple::PS4:
      case llvm::Triple::ELFIAMCU:
+     case llvm::Triple::Fuchsia:
 +    case llvm::Triple::Solaris:
        break;
      case llvm::Triple::Win32:

Index: pkgsrc/lang/compiler-rt/Makefile
diff -u pkgsrc/lang/compiler-rt/Makefile:1.4 pkgsrc/lang/compiler-rt/Makefile:1.5
--- pkgsrc/lang/compiler-rt/Makefile:1.4        Wed Oct 17 08:39:13 2018
+++ pkgsrc/lang/compiler-rt/Makefile    Sun Dec  9 20:04:40 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/10/17 08:39:13 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2018/12/09 20:04:40 adam Exp $
 
-DISTNAME=      compiler-rt-6.0.1.src
+DISTNAME=      compiler-rt-7.0.0.src
 PKGNAME=       ${DISTNAME:S/.src//}
 CATEGORIES=    lang devel
 MASTER_SITES=  http://llvm.org/releases/${PKGVERSION_NOREV}/
@@ -11,8 +11,10 @@ HOMEPAGE=    http://compiler-rt.llvm.org/
 COMMENT=       LLVM runtime libraries
 LICENSE=       modified-bsd OR mit
 
-USE_LANGUAGES= c99 c++11
+NOT_FOR_PLATFORM=      NetBSD-[0-7].*-*
+
 USE_CMAKE=     yes
+USE_LANGUAGES= c99 c++11
 USE_TOOLS+=    ggrep
 GCC_REQD+=     4.8
 SSP_SUPPORTED= no
@@ -29,8 +31,8 @@ CMAKE_ARGS+=  -DCMAKE_CXX_COMPILER=${CXX:
 CMAKE_ARGS+=   -DCOMPILER_RT_TEST_COMPILER=${PKG_CC:Q}
 CMAKE_ARGS+=   -DCOMPILER_RT_OS_DIR:STRING=${OS_DIR}
 CMAKE_ARGS+=   -DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${PKGVERSION_NOREV}
-CMAKE_ARGS+=   -DCOMPILER_RT_INCLUDE_TESTS:BOOL=ON
 CMAKE_ARGS+=   -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
+CMAKE_ARGS+=   -DCOMPILER_RT_ENABLE_IOS=OFF
 
 PLIST_SUBST+=  COMPILER_RT_OS_DIR=${OS_DIR}
 
@@ -39,7 +41,7 @@ TEST_TARGET=  check-compiler-rt
 PYTHON_FOR_BUILD_ONLY= yes
 
 post-extract:
-       ${RUN} mkdir -p ${WRKDIR}/build
+       ${MKDIR} ${WRKDIR}/build
 
 .include "../../devel/googletest/buildlink3.mk"
 .include "../../lang/llvm/buildlink3.mk"

Index: pkgsrc/lang/compiler-rt/PLIST
diff -u pkgsrc/lang/compiler-rt/PLIST:1.1 pkgsrc/lang/compiler-rt/PLIST:1.2
--- pkgsrc/lang/compiler-rt/PLIST:1.1   Thu Aug  9 13:40:34 2018
+++ pkgsrc/lang/compiler-rt/PLIST       Sun Dec  9 20:04:40 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/09 13:40:34 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/12/09 20:04:40 adam Exp $
 lib/clang/${PKGVERSION}/include/sanitizer/allocator_interface.h
 lib/clang/${PKGVERSION}/include/sanitizer/asan_interface.h
 lib/clang/${PKGVERSION}/include/sanitizer/common_interface_defs.h
@@ -9,10 +9,11 @@ lib/clang/${PKGVERSION}/include/sanitize
 lib/clang/${PKGVERSION}/include/sanitizer/linux_syscall_hooks.h
 lib/clang/${PKGVERSION}/include/sanitizer/lsan_interface.h
 lib/clang/${PKGVERSION}/include/sanitizer/msan_interface.h
+lib/clang/${PKGVERSION}/include/sanitizer/netbsd_syscall_hooks.h
 lib/clang/${PKGVERSION}/include/sanitizer/scudo_interface.h
 lib/clang/${PKGVERSION}/include/sanitizer/tsan_interface.h
 lib/clang/${PKGVERSION}/include/sanitizer/tsan_interface_atomic.h
 lib/clang/${PKGVERSION}/include/xray/xray_interface.h
 lib/clang/${PKGVERSION}/include/xray/xray_log_interface.h
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.builtins-i386.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.builtins-x86_64.a
+lib/clang/${PKGVERSION}/share/asan_blacklist.txt
+lib/clang/${PKGVERSION}/share/cfi_blacklist.txt
Index: pkgsrc/lang/compiler-rt/distinfo
diff -u pkgsrc/lang/compiler-rt/distinfo:1.1 pkgsrc/lang/compiler-rt/distinfo:1.2
--- pkgsrc/lang/compiler-rt/distinfo:1.1        Thu Aug  9 13:40:34 2018
+++ pkgsrc/lang/compiler-rt/distinfo    Sun Dec  9 20:04:40 2018
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.1 2018/08/09 13:40:34 jperkin Exp $
+$NetBSD: distinfo,v 1.2 2018/12/09 20:04:40 adam Exp $
 
-SHA1 (compiler-rt-6.0.1.src.tar.xz) = 4a61bd09f31d3079e921205bb93fb7d05a95946b
-RMD160 (compiler-rt-6.0.1.src.tar.xz) = 1e391941c1e0a7385bb3f22a7a7061d57bd18fe7
-SHA512 (compiler-rt-6.0.1.src.tar.xz) = 69850c1ad92c66977fa217cbfb42a6a3f502fbe3d1a08daa7fc4cfeb617a7736d231f8ad8d93b10b1ae29bd753315d2a2d70f9ff1f4d18a9a7cc81758d91f963
-Size (compiler-rt-6.0.1.src.tar.xz) = 1686820 bytes
-SHA1 (patch-cmake_config-ix.cmake) = f2a871dfe7c2ee2e938e0812aa19b7498b0e71cc
+SHA1 (compiler-rt-7.0.0.src.tar.xz) = 87a721b7ac0b2991a27b4acc9eb2e12dfc9053b2
+RMD160 (compiler-rt-7.0.0.src.tar.xz) = 4ce16f26ccf228d5ac20d8cbc7b231afda899954
+SHA512 (compiler-rt-7.0.0.src.tar.xz) = fb36aab38e7b7e3c23ad8598a54a5d7d36a30bc306c60c95b074029ffad48cb1d74fa5acde34b4affc50827562fd794969ae31067bd64e116281eb65ae4f4346
+Size (compiler-rt-7.0.0.src.tar.xz) = 1815168 bytes
+SHA1 (patch-cmake_config-ix.cmake) = 4d49d83015a2e88d79dfae54eedef400ef28702d
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = 5acf50111dcbd8458c33453d32d597ea57be3880
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 256e2613f222c69cd591c02071482e594af5d066
+SHA1 (patch-lib_tsan_CMakeLists.txt) = 6c05aa7b4adddc28364950b782a365ecebe1886a

Index: pkgsrc/lang/compiler-rt/patches/patch-cmake_config-ix.cmake
diff -u pkgsrc/lang/compiler-rt/patches/patch-cmake_config-ix.cmake:1.1 pkgsrc/lang/compiler-rt/patches/patch-cmake_config-ix.cmake:1.2
--- pkgsrc/lang/compiler-rt/patches/patch-cmake_config-ix.cmake:1.1     Thu Aug  9 13:40:34 2018
+++ pkgsrc/lang/compiler-rt/patches/patch-cmake_config-ix.cmake Sun Dec  9 20:04:40 2018
@@ -1,19 +1,19 @@
-$NetBSD: patch-cmake_config-ix.cmake,v 1.1 2018/08/09 13:40:34 jperkin Exp $
+$NetBSD: patch-cmake_config-ix.cmake,v 1.2 2018/12/09 20:04:40 adam Exp $
 
 Disable components that aren't ready for SunOS yet.
 
---- cmake/config-ix.cmake.orig 2018-01-03 14:54:43.000000000 +0000
+--- cmake/config-ix.cmake.orig 2018-07-25 03:01:35.000000000 +0000
 +++ cmake/config-ix.cmake
-@@ -486,7 +486,7 @@ set(COMPILER_RT_SANITIZERS_TO_BUILD all
+@@ -500,7 +500,7 @@ set(COMPILER_RT_SANITIZERS_TO_BUILD all 
  list_replace(COMPILER_RT_SANITIZERS_TO_BUILD all "${ALL_SANITIZERS}")
  
  if (SANITIZER_COMMON_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
--    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia|SunOS" OR
-+    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia" OR
+-    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|OpenBSD|Fuchsia|SunOS" OR
++    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|OpenBSD|Fuchsia" OR
      (OS_NAME MATCHES "Windows" AND (NOT MINGW AND NOT CYGWIN))))
    set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)
  else()
-@@ -505,7 +505,7 @@ else()
+@@ -520,7 +520,7 @@ else()
    set(COMPILER_RT_HAS_ASAN FALSE)
  endif()
  
@@ -22,21 +22,21 @@ Disable components that aren't ready for
    set(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME TRUE)
  else()
    set(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME FALSE)
-@@ -542,7 +542,7 @@ else()
+@@ -557,7 +557,7 @@ else()
  endif()
  
  if (PROFILE_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
--    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|SunOS")
-+    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android")
+-    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS")
++    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia")
    set(COMPILER_RT_HAS_PROFILE TRUE)
  else()
    set(COMPILER_RT_HAS_PROFILE FALSE)
-@@ -556,7 +556,7 @@ else()
+@@ -571,7 +571,7 @@ else()
  endif()
  
  if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND
--    OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia|SunOS")
-+    OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia")
+-    OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|OpenBSD|Windows|Android|Fuchsia|SunOS")
++    OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|OpenBSD|Windows|Android|Fuchsia")
    set(COMPILER_RT_HAS_UBSAN TRUE)
  else()
    set(COMPILER_RT_HAS_UBSAN FALSE)

Index: pkgsrc/lang/libcxx/Makefile
diff -u pkgsrc/lang/libcxx/Makefile:1.1 pkgsrc/lang/libcxx/Makefile:1.2
--- pkgsrc/lang/libcxx/Makefile:1.1     Thu Aug  9 14:16:08 2018
+++ pkgsrc/lang/libcxx/Makefile Sun Dec  9 20:04:39 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2018/08/09 14:16:08 jperkin Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/09 20:04:39 adam Exp $
 
-DISTNAME=      libcxx-6.0.1.src
+DISTNAME=      libcxx-7.0.0.src
 PKGNAME=       ${DISTNAME:S/.src//}
 CATEGORIES=    lang devel
 MASTER_SITES=  http://llvm.org/releases/${PKGVERSION_NOREV}/
@@ -35,8 +35,11 @@ CMAKE_ARGS+= -DLIBCXX_CXX_ABI=libcxxabi
 CMAKE_ARGS+=   -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKDIR}/${LIBCXXABI}/include
 CMAKE_ARGS+=   -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT:BOOL=OFF
 
+# avoid conflict with stddef.h
+CXXFLAGS.NetBSD+=      -D__DEFINED_max_align_t=1
+
 post-extract:
-       ${RUN} mkdir -p ${WRKDIR}/build
+       ${MKDIR} ${WRKDIR}/build
 
 .include "../../lang/libcxxabi/buildlink3.mk"
 .include "../../lang/llvm/buildlink3.mk"
Index: pkgsrc/lang/libcxx/PLIST
diff -u pkgsrc/lang/libcxx/PLIST:1.1 pkgsrc/lang/libcxx/PLIST:1.2
--- pkgsrc/lang/libcxx/PLIST:1.1        Thu Aug  9 14:16:08 2018
+++ pkgsrc/lang/libcxx/PLIST    Sun Dec  9 20:04:39 2018
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/09 14:16:08 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/12/09 20:04:39 adam Exp $
 include/c++/v1/__bit_reference
 include/c++/v1/__bsd_locale_defaults.h
 include/c++/v1/__bsd_locale_fallbacks.h
 include/c++/v1/__config
 include/c++/v1/__cxxabi_config.h
 include/c++/v1/__debug
+include/c++/v1/__errc
 include/c++/v1/__functional_03
 include/c++/v1/__functional_base
 include/c++/v1/__functional_base_03
@@ -12,6 +13,7 @@ include/c++/v1/__hash_table
 include/c++/v1/__libcpp_version
 include/c++/v1/__locale
 include/c++/v1/__mutex_base
+include/c++/v1/__node_handle
 include/c++/v1/__nullptr
 include/c++/v1/__split_buffer
 include/c++/v1/__sso_allocator
@@ -32,6 +34,7 @@ include/c++/v1/cctype
 include/c++/v1/cerrno
 include/c++/v1/cfenv
 include/c++/v1/cfloat
+include/c++/v1/charconv
 include/c++/v1/chrono
 include/c++/v1/cinttypes
 include/c++/v1/ciso646
@@ -39,6 +42,7 @@ include/c++/v1/climits
 include/c++/v1/clocale
 include/c++/v1/cmath
 include/c++/v1/codecvt
+include/c++/v1/compare
 include/c++/v1/complex
 include/c++/v1/complex.h
 include/c++/v1/condition_variable
@@ -81,6 +85,7 @@ include/c++/v1/experimental/propagate_co
 include/c++/v1/experimental/ratio
 include/c++/v1/experimental/regex
 include/c++/v1/experimental/set
+include/c++/v1/experimental/simd
 include/c++/v1/experimental/string
 include/c++/v1/experimental/string_view
 include/c++/v1/experimental/system_error
@@ -93,6 +98,7 @@ include/c++/v1/experimental/vector
 include/c++/v1/ext/__hash
 include/c++/v1/ext/hash_map
 include/c++/v1/ext/hash_set
+include/c++/v1/filesystem
 include/c++/v1/float.h
 include/c++/v1/forward_list
 include/c++/v1/fstream
@@ -128,6 +134,7 @@ include/c++/v1/scoped_allocator
 include/c++/v1/set
 include/c++/v1/setjmp.h
 include/c++/v1/shared_mutex
+include/c++/v1/span
 include/c++/v1/sstream
 include/c++/v1/stack
 include/c++/v1/stdbool.h
@@ -171,6 +178,7 @@ include/c++/v1/utility
 include/c++/v1/valarray
 include/c++/v1/variant
 include/c++/v1/vector
+include/c++/v1/version
 include/c++/v1/wchar.h
 include/c++/v1/wctype.h
 lib/libc++.a
@@ -178,3 +186,4 @@ lib/libc++.so
 lib/libc++.so.1
 lib/libc++.so.1.0
 lib/libc++experimental.a
+lib/libc++fs.a
Index: pkgsrc/lang/libcxx/distinfo
diff -u pkgsrc/lang/libcxx/distinfo:1.1 pkgsrc/lang/libcxx/distinfo:1.2
--- pkgsrc/lang/libcxx/distinfo:1.1     Thu Aug  9 14:16:08 2018
+++ pkgsrc/lang/libcxx/distinfo Sun Dec  9 20:04:39 2018
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.1 2018/08/09 14:16:08 jperkin Exp $
+$NetBSD: distinfo,v 1.2 2018/12/09 20:04:39 adam Exp $
 
-SHA1 (libcxx-6.0.1.src.tar.xz) = 6506139683ca5319f90c84c8a29b633afda849ce
-RMD160 (libcxx-6.0.1.src.tar.xz) = ead6a4fa9a0b700c96def8cfe5f7945d807da82c
-SHA512 (libcxx-6.0.1.src.tar.xz) = c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875
-Size (libcxx-6.0.1.src.tar.xz) = 1552328 bytes
-SHA1 (libcxxabi-6.0.1.src.tar.xz) = 54bff42750c9c81dba60710d6ee70d1c9e83c5af
-RMD160 (libcxxabi-6.0.1.src.tar.xz) = 37cd93201a0409b8cc75f52622abbd5682067e6e
-SHA512 (libcxxabi-6.0.1.src.tar.xz) = bbb4c7b412e295cb735f637df48a83093eef45ed5444f7766790b4b047f75fd5fd634d8f3a8ac33a5c1407bd16fd450ba113f60a9bcc1d0a911fe0c54e9c81f2
-Size (libcxxabi-6.0.1.src.tar.xz) = 528356 bytes
-SHA1 (patch-src_experimental_memory__resource.cpp) = 64cab51b689ee6e0fc32b4a48981f050f443d81a
+SHA1 (libcxx-7.0.0.src.tar.xz) = 496b865f1011020eb5d6fbac6a0cc08e2c1f0a09
+RMD160 (libcxx-7.0.0.src.tar.xz) = 7dfefd22edb305f68882a5f503f31c881fe5dc05
+SHA512 (libcxx-7.0.0.src.tar.xz) = 5ebf8418bc9d311c1744c257ab7a26cf2436a64a47451905df70ec64b12d25ec33acf99e1b9d552fd54ed850bed8f53dffde2ea20292ecd9976eaa31f144caf5
+Size (libcxx-7.0.0.src.tar.xz) = 1652496 bytes
+SHA1 (libcxxabi-7.0.0.src.tar.xz) = b6ab94ff434b01029d50a2cc683b115af4a8726e
+RMD160 (libcxxabi-7.0.0.src.tar.xz) = d4a932989597e58f7a3f24cd67f8886b93c184d7
+SHA512 (libcxxabi-7.0.0.src.tar.xz) = 95aa8f60477739e6d6eb6ba1e32c98928e1b8104d18d659336cf7f1c5bfd1ed505015077dfbe39329c0c9d2b5b428d853e5652b0106c0cde317d2d013ebd1cf0
+Size (libcxxabi-7.0.0.src.tar.xz) = 535792 bytes

Index: pkgsrc/lang/libcxxabi/Makefile
diff -u pkgsrc/lang/libcxxabi/Makefile:1.1 pkgsrc/lang/libcxxabi/Makefile:1.2
--- pkgsrc/lang/libcxxabi/Makefile:1.1  Thu Aug  9 14:13:25 2018
+++ pkgsrc/lang/libcxxabi/Makefile      Sun Dec  9 20:04:40 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2018/08/09 14:13:25 jperkin Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/09 20:04:40 adam Exp $
 
-DISTNAME=      libcxxabi-6.0.1.src
+DISTNAME=      libcxxabi-7.0.0.src
 PKGNAME=       ${DISTNAME:S/.src//}
 CATEGORIES=    lang devel
 MASTER_SITES=  http://llvm.org/releases/${PKGVERSION_NOREV}/
@@ -33,8 +33,11 @@ CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:
 CMAKE_ARGS+=   -DLIBCXXABI_LIBCXX_INCLUDES=${WRKDIR}/${LIBCXX}/include
 CMAKE_ARGS+=   -DLIBCXXABI_USE_LLVM_UNWINDER=YES
 
+# avoid conflict with stddef.h
+CXXFLAGS.NetBSD+=      -D__DEFINED_max_align_t=1
+
 post-extract:
-       ${RUN} mkdir -p ${WRKDIR}/build
+       ${MKDIR} ${WRKDIR}/build
 
 .include "../../lang/libunwind/buildlink3.mk"
 .include "../../lang/llvm/buildlink3.mk"
Index: pkgsrc/lang/libcxxabi/distinfo
diff -u pkgsrc/lang/libcxxabi/distinfo:1.1 pkgsrc/lang/libcxxabi/distinfo:1.2
--- pkgsrc/lang/libcxxabi/distinfo:1.1  Thu Aug  9 14:13:25 2018
+++ pkgsrc/lang/libcxxabi/distinfo      Sun Dec  9 20:04:40 2018
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1 2018/08/09 14:13:25 jperkin Exp $
+$NetBSD: distinfo,v 1.2 2018/12/09 20:04:40 adam Exp $
 
-SHA1 (libcxx-6.0.1.src.tar.xz) = 6506139683ca5319f90c84c8a29b633afda849ce
-RMD160 (libcxx-6.0.1.src.tar.xz) = ead6a4fa9a0b700c96def8cfe5f7945d807da82c
-SHA512 (libcxx-6.0.1.src.tar.xz) = c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875
-Size (libcxx-6.0.1.src.tar.xz) = 1552328 bytes
-SHA1 (libcxxabi-6.0.1.src.tar.xz) = 54bff42750c9c81dba60710d6ee70d1c9e83c5af
-RMD160 (libcxxabi-6.0.1.src.tar.xz) = 37cd93201a0409b8cc75f52622abbd5682067e6e
-SHA512 (libcxxabi-6.0.1.src.tar.xz) = bbb4c7b412e295cb735f637df48a83093eef45ed5444f7766790b4b047f75fd5fd634d8f3a8ac33a5c1407bd16fd450ba113f60a9bcc1d0a911fe0c54e9c81f2
-Size (libcxxabi-6.0.1.src.tar.xz) = 528356 bytes
+SHA1 (libcxx-7.0.0.src.tar.xz) = 496b865f1011020eb5d6fbac6a0cc08e2c1f0a09
+RMD160 (libcxx-7.0.0.src.tar.xz) = 7dfefd22edb305f68882a5f503f31c881fe5dc05
+SHA512 (libcxx-7.0.0.src.tar.xz) = 5ebf8418bc9d311c1744c257ab7a26cf2436a64a47451905df70ec64b12d25ec33acf99e1b9d552fd54ed850bed8f53dffde2ea20292ecd9976eaa31f144caf5
+Size (libcxx-7.0.0.src.tar.xz) = 1652496 bytes
+SHA1 (libcxxabi-7.0.0.src.tar.xz) = b6ab94ff434b01029d50a2cc683b115af4a8726e
+RMD160 (libcxxabi-7.0.0.src.tar.xz) = d4a932989597e58f7a3f24cd67f8886b93c184d7
+SHA512 (libcxxabi-7.0.0.src.tar.xz) = 95aa8f60477739e6d6eb6ba1e32c98928e1b8104d18d659336cf7f1c5bfd1ed505015077dfbe39329c0c9d2b5b428d853e5652b0106c0cde317d2d013ebd1cf0
+Size (libcxxabi-7.0.0.src.tar.xz) = 535792 bytes

Index: pkgsrc/lang/libunwind/Makefile
diff -u pkgsrc/lang/libunwind/Makefile:1.14 pkgsrc/lang/libunwind/Makefile:1.15
--- pkgsrc/lang/libunwind/Makefile:1.14 Thu Aug  9 13:51:42 2018
+++ pkgsrc/lang/libunwind/Makefile      Sun Dec  9 20:04:39 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2018/08/09 13:51:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2018/12/09 20:04:39 adam Exp $
 
-DISTNAME=      libunwind-6.0.1.src
+DISTNAME=      libunwind-7.0.0.src
 PKGNAME=       ${DISTNAME:S/.src//}
 CATEGORIES=    lang devel
 MASTER_SITES=  http://llvm.org/releases/${PKGVERSION_NOREV}/

Index: pkgsrc/lang/libunwind/buildlink3.mk
diff -u pkgsrc/lang/libunwind/buildlink3.mk:1.4 pkgsrc/lang/libunwind/buildlink3.mk:1.5
--- pkgsrc/lang/libunwind/buildlink3.mk:1.4     Sun Jan  7 13:04:19 2018
+++ pkgsrc/lang/libunwind/buildlink3.mk Sun Dec  9 20:04:39 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:19 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/12/09 20:04:39 adam Exp $
 
 BUILDLINK_TREE+=       libunwind
 
 .if !defined(LIBUNWIND_BUILDLINK3_MK)
 LIBUNWIND_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libunwind+=      libunwind>=4.0.1
+BUILDLINK_API_DEPENDS.libunwind+=      libunwind>=7.0.0
 BUILDLINK_PKGSRCDIR.libunwind?=                ../../lang/libunwind
 
 .include "../../lang/llvm/buildlink3.mk"

Index: pkgsrc/lang/libunwind/distinfo
diff -u pkgsrc/lang/libunwind/distinfo:1.10 pkgsrc/lang/libunwind/distinfo:1.11
--- pkgsrc/lang/libunwind/distinfo:1.10 Tue Aug  7 10:44:50 2018
+++ pkgsrc/lang/libunwind/distinfo      Sun Dec  9 20:04:39 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2018/08/07 10:44:50 adam Exp $
+$NetBSD: distinfo,v 1.11 2018/12/09 20:04:39 adam Exp $
 
-SHA1 (libunwind-6.0.1.src.tar.xz) = 9592003fd0e41a69880318ae6b25ebbbabd59703
-RMD160 (libunwind-6.0.1.src.tar.xz) = f980b76798d06e8a866b90580f85da9b66610fd9
-SHA512 (libunwind-6.0.1.src.tar.xz) = 78568c28720abdd1f8471c462421df9965e05e1db048689d16ac85378716c4080ec1723af78e9f61d133b0ff82ac8c1f0dde7fd42d194485f62c1a17c02db37f
-Size (libunwind-6.0.1.src.tar.xz) = 77036 bytes
+SHA1 (libunwind-7.0.0.src.tar.xz) = b46f818843baf23e71813bac3345b1baa9403926
+RMD160 (libunwind-7.0.0.src.tar.xz) = 647e3a774cdc0b4ee85ea859c85ccc1104819d3a
+SHA512 (libunwind-7.0.0.src.tar.xz) = 9ee573089f4d0bfb57bd9012e3ad3308fe53216a8e6745aa35dfaa16e56c1adbfc419e336e235a8e76f57b01b9e6e6c9ceff624bd99a90f519137e62f141738d
+Size (libunwind-7.0.0.src.tar.xz) = 79316 bytes

Index: pkgsrc/lang/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.34 pkgsrc/lang/llvm/Makefile:1.35
--- pkgsrc/lang/llvm/Makefile:1.34      Thu Aug  9 14:57:30 2018
+++ pkgsrc/lang/llvm/Makefile   Sun Dec  9 20:04:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2018/08/09 14:57:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.35 2018/12/09 20:04:38 adam Exp $
 #
 # when updating this, please also update:
 # devel/include-what-you-use
@@ -19,7 +19,7 @@
 # Always update all */buildlink3.mk to require the latest stable release
 # version in BUILDLINK_API_DEPENDS, as there is no backwards compatibility
 
-DISTNAME=      llvm-6.0.1.src
+DISTNAME=      llvm-7.0.0.src
 PKGNAME=       ${DISTNAME:S/.src//}
 CATEGORIES=    lang devel
 MASTER_SITES=  http://llvm.org/releases/${PKGVERSION_NOREV}/
@@ -98,7 +98,7 @@ CXXFLAGS+=    -march=i586
 # replacing config.guess is required even for cmake.
 # It is used to detect correct LLVM_HOST_TRIPLE, e.g. for NetBSD/evbarm.
 post-extract:
-       ${RUN} mkdir -p ${WRKDIR}/build
+       ${MKDIR} ${WRKDIR}/build
 .for f in config.guess config.sub
        cp ../../mk/gnu-config/${f} ${WRKSRC}/cmake/${f}
 .endfor

Index: pkgsrc/lang/llvm/PLIST
diff -u pkgsrc/lang/llvm/PLIST:1.8 pkgsrc/lang/llvm/PLIST:1.9
--- pkgsrc/lang/llvm/PLIST:1.8  Tue Aug  7 23:39:30 2018
+++ pkgsrc/lang/llvm/PLIST      Sun Dec  9 20:04:38 2018
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2018/08/07 23:39:30 kamil Exp $
+@comment $NetBSD: PLIST,v 1.9 2018/12/09 20:04:38 adam Exp $
 bin/FileCheck
 bin/bugpoint
 bin/count
+bin/dsymutil
 bin/llc
 bin/lli
 bin/lli-child-target
@@ -20,16 +21,16 @@ bin/llvm-cxxfilt
 bin/llvm-diff
 bin/llvm-dis
 bin/llvm-dlltool
-bin/llvm-dsymutil
 bin/llvm-dwarfdump
 bin/llvm-dwp
+bin/llvm-exegesis
 bin/llvm-extract
 bin/llvm-lib
 bin/llvm-link
 bin/llvm-lto
 bin/llvm-lto2
 bin/llvm-mc
-bin/llvm-mcmarkup
+bin/llvm-mca
 bin/llvm-modextract
 bin/llvm-mt
 bin/llvm-nm
@@ -47,8 +48,10 @@ bin/llvm-size
 bin/llvm-split
 bin/llvm-stress
 bin/llvm-strings
+bin/llvm-strip
 bin/llvm-symbolizer
 bin/llvm-tblgen
+bin/llvm-undname
 bin/llvm-xray
 bin/not
 bin/obj2yaml
@@ -61,9 +64,12 @@ bin/yaml2obj
 include/llvm-c/Analysis.h
 include/llvm-c/BitReader.h
 include/llvm-c/BitWriter.h
+include/llvm-c/Comdat.h
 include/llvm-c/Core.h
+include/llvm-c/DataTypes.h
 include/llvm-c/DebugInfo.h
 include/llvm-c/Disassembler.h
+include/llvm-c/DisassemblerTypes.h
 include/llvm-c/ErrorHandling.h
 include/llvm-c/ExecutionEngine.h
 include/llvm-c/IRReader.h
@@ -76,8 +82,10 @@ include/llvm-c/Support.h
 include/llvm-c/Target.h
 include/llvm-c/TargetMachine.h
 include/llvm-c/Transforms/IPO.h
+include/llvm-c/Transforms/InstCombine.h
 include/llvm-c/Transforms/PassManagerBuilder.h
 include/llvm-c/Transforms/Scalar.h
+include/llvm-c/Transforms/Utils.h
 include/llvm-c/Transforms/Vectorize.h
 include/llvm-c/Types.h
 include/llvm-c/lto.h
@@ -85,6 +93,7 @@ include/llvm/ADT/APFloat.h
 include/llvm/ADT/APInt.h
 include/llvm/ADT/APSInt.h
 include/llvm/ADT/AllocatorList.h
+include/llvm/ADT/Any.h
 include/llvm/ADT/ArrayRef.h
 include/llvm/ADT/BitVector.h
 include/llvm/ADT/BitmaskEnum.h
@@ -99,6 +108,7 @@ include/llvm/ADT/DepthFirstIterator.h
 include/llvm/ADT/EpochTracker.h
 include/llvm/ADT/EquivalenceClasses.h
 include/llvm/ADT/FoldingSet.h
+include/llvm/ADT/FunctionExtras.h
 include/llvm/ADT/GraphTraits.h
 include/llvm/ADT/Hashing.h
 include/llvm/ADT/ImmutableList.h
@@ -213,14 +223,15 @@ include/llvm/Analysis/MemoryLocation.h
 include/llvm/Analysis/MemorySSA.h
 include/llvm/Analysis/MemorySSAUpdater.h
 include/llvm/Analysis/ModuleSummaryAnalysis.h
+include/llvm/Analysis/MustExecute.h
 include/llvm/Analysis/ObjCARCAliasAnalysis.h
 include/llvm/Analysis/ObjCARCAnalysisUtils.h
 include/llvm/Analysis/ObjCARCInstKind.h
-include/llvm/Analysis/ObjectUtils.h
 include/llvm/Analysis/OptimizationRemarkEmitter.h
 include/llvm/Analysis/OrderedBasicBlock.h
 include/llvm/Analysis/PHITransAddr.h
 include/llvm/Analysis/Passes.h
+include/llvm/Analysis/PhiValues.h
 include/llvm/Analysis/PostDominators.h
 include/llvm/Analysis/ProfileSummaryInfo.h
 include/llvm/Analysis/PtrUseVisitor.h
@@ -236,6 +247,7 @@ include/llvm/Analysis/ScalarEvolutionExp
 include/llvm/Analysis/ScalarEvolutionNormalization.h
 include/llvm/Analysis/ScopedNoAliasAA.h
 include/llvm/Analysis/SparsePropagation.h
+include/llvm/Analysis/SyntheticCountsUtils.h
 include/llvm/Analysis/TargetFolder.h
 include/llvm/Analysis/TargetLibraryInfo.def
 include/llvm/Analysis/TargetLibraryInfo.h
@@ -244,6 +256,7 @@ include/llvm/Analysis/TargetTransformInf
 include/llvm/Analysis/Trace.h
 include/llvm/Analysis/TypeBasedAliasAnalysis.h
 include/llvm/Analysis/TypeMetadataUtils.h
+include/llvm/Analysis/Utils/Local.h
 include/llvm/Analysis/ValueLattice.h
 include/llvm/Analysis/ValueLatticeUtils.h
 include/llvm/Analysis/ValueTracking.h
@@ -253,6 +266,7 @@ include/llvm/AsmParser/SlotMapping.h
 include/llvm/BinaryFormat/COFF.h
 include/llvm/BinaryFormat/Dwarf.def
 include/llvm/BinaryFormat/Dwarf.h
+include/llvm/BinaryFormat/DynamicTags.def
 include/llvm/BinaryFormat/ELF.h
 include/llvm/BinaryFormat/ELFRelocs/AArch64.def
 include/llvm/BinaryFormat/ELFRelocs/AMDGPU.def
@@ -268,7 +282,6 @@ include/llvm/BinaryFormat/ELFRelocs/Powe
 include/llvm/BinaryFormat/ELFRelocs/RISCV.def
 include/llvm/BinaryFormat/ELFRelocs/Sparc.def
 include/llvm/BinaryFormat/ELFRelocs/SystemZ.def
-include/llvm/BinaryFormat/ELFRelocs/WebAssembly.def
 include/llvm/BinaryFormat/ELFRelocs/i386.def
 include/llvm/BinaryFormat/ELFRelocs/x86_64.def
 include/llvm/BinaryFormat/MachO.def
@@ -283,13 +296,14 @@ include/llvm/Bitcode/BitcodeWriterPass.h
 include/llvm/Bitcode/BitstreamReader.h
 include/llvm/Bitcode/BitstreamWriter.h
 include/llvm/Bitcode/LLVMBitCodes.h
+include/llvm/CodeGen/AccelTable.h
 include/llvm/CodeGen/Analysis.h
 include/llvm/CodeGen/AsmPrinter.h
 include/llvm/CodeGen/AtomicExpandUtils.h
 include/llvm/CodeGen/BasicTTIImpl.h
 include/llvm/CodeGen/CalcSpillWeights.h
 include/llvm/CodeGen/CallingConvLower.h
-include/llvm/CodeGen/CommandFlags.def
+include/llvm/CodeGen/CommandFlags.inc
 include/llvm/CodeGen/CostTable.h
 include/llvm/CodeGen/DAGCombine.h
 include/llvm/CodeGen/DFAPacketizer.h
@@ -297,7 +311,7 @@ include/llvm/CodeGen/DIE.h
 include/llvm/CodeGen/DIEValue.def
 include/llvm/CodeGen/DwarfStringPoolEntry.h
 include/llvm/CodeGen/EdgeBundles.h
-include/llvm/CodeGen/ExecutionDepsFix.h
+include/llvm/CodeGen/ExecutionDomainFix.h
 include/llvm/CodeGen/ExpandReductions.h
 include/llvm/CodeGen/FastISel.h
 include/llvm/CodeGen/FaultMaps.h
@@ -307,6 +321,10 @@ include/llvm/CodeGen/GCMetadataPrinter.h
 include/llvm/CodeGen/GCStrategy.h
 include/llvm/CodeGen/GCs.h
 include/llvm/CodeGen/GlobalISel/CallLowering.h
+include/llvm/CodeGen/GlobalISel/Combiner.h
+include/llvm/CodeGen/GlobalISel/CombinerHelper.h
+include/llvm/CodeGen/GlobalISel/CombinerInfo.h
+include/llvm/CodeGen/GlobalISel/ConstantFoldingMIRBuilder.h
 include/llvm/CodeGen/GlobalISel/GISelWorkList.h
 include/llvm/CodeGen/GlobalISel/IRTranslator.h
 include/llvm/CodeGen/GlobalISel/InstructionSelect.h
@@ -317,6 +335,7 @@ include/llvm/CodeGen/GlobalISel/Legalize
 include/llvm/CodeGen/GlobalISel/LegalizerHelper.h
 include/llvm/CodeGen/GlobalISel/LegalizerInfo.h
 include/llvm/CodeGen/GlobalISel/Localizer.h
+include/llvm/CodeGen/GlobalISel/MIPatternMatch.h
 include/llvm/CodeGen/GlobalISel/MachineIRBuilder.h
 include/llvm/CodeGen/GlobalISel/RegBankSelect.h
 include/llvm/CodeGen/GlobalISel/RegisterBank.h
@@ -339,6 +358,7 @@ include/llvm/CodeGen/LiveRegMatrix.h
 include/llvm/CodeGen/LiveRegUnits.h
 include/llvm/CodeGen/LiveStacks.h
 include/llvm/CodeGen/LiveVariables.h
+include/llvm/CodeGen/LoopTraversal.h
 include/llvm/CodeGen/LowLevelType.h
 include/llvm/CodeGen/MIRParser/MIRParser.h
 include/llvm/CodeGen/MIRPrinter.h
@@ -365,6 +385,7 @@ include/llvm/CodeGen/MachineModuleInfo.h
 include/llvm/CodeGen/MachineModuleInfoImpls.h
 include/llvm/CodeGen/MachineOperand.h
 include/llvm/CodeGen/MachineOptimizationRemarkEmitter.h
+include/llvm/CodeGen/MachineOutliner.h
 include/llvm/CodeGen/MachinePassRegistry.h
 include/llvm/CodeGen/MachinePostDominators.h
 include/llvm/CodeGen/MachineRegionInfo.h
@@ -372,7 +393,6 @@ include/llvm/CodeGen/MachineRegisterInfo
 include/llvm/CodeGen/MachineSSAUpdater.h
 include/llvm/CodeGen/MachineScheduler.h
 include/llvm/CodeGen/MachineTraceMetrics.h
-include/llvm/CodeGen/MachineValueType.h
 include/llvm/CodeGen/MacroFusion.h
 include/llvm/CodeGen/PBQP/CostAllocator.h
 include/llvm/CodeGen/PBQP/Graph.h
@@ -384,6 +404,7 @@ include/llvm/CodeGen/ParallelCG.h
 include/llvm/CodeGen/Passes.h
 include/llvm/CodeGen/PreISelIntrinsicLowering.h
 include/llvm/CodeGen/PseudoSourceValue.h
+include/llvm/CodeGen/ReachingDefAnalysis.h
 include/llvm/CodeGen/RegAllocPBQP.h
 include/llvm/CodeGen/RegAllocRegistry.h
 include/llvm/CodeGen/RegisterClassInfo.h
@@ -391,7 +412,6 @@ include/llvm/CodeGen/RegisterPressure.h
 include/llvm/CodeGen/RegisterScavenging.h
 include/llvm/CodeGen/RegisterUsageInfo.h
 include/llvm/CodeGen/ResourcePriorityQueue.h
-include/llvm/CodeGen/RuntimeLibcalls.def
 include/llvm/CodeGen/RuntimeLibcalls.h
 include/llvm/CodeGen/SDNodeProperties.td
 include/llvm/CodeGen/ScheduleDAG.h
@@ -414,9 +434,7 @@ include/llvm/CodeGen/TargetCallingConv.h
 include/llvm/CodeGen/TargetFrameLowering.h
 include/llvm/CodeGen/TargetInstrInfo.h
 include/llvm/CodeGen/TargetLowering.h
-include/llvm/CodeGen/TargetLoweringObjectFile.h
 include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
-include/llvm/CodeGen/TargetOpcodes.def
 include/llvm/CodeGen/TargetOpcodes.h
 include/llvm/CodeGen/TargetPassConfig.h
 include/llvm/CodeGen/TargetRegisterInfo.h
@@ -426,6 +444,7 @@ include/llvm/CodeGen/UnreachableBlockEli
 include/llvm/CodeGen/ValueTypes.h
 include/llvm/CodeGen/ValueTypes.td
 include/llvm/CodeGen/VirtRegMap.h
+include/llvm/CodeGen/WasmEHFuncInfo.h
 include/llvm/CodeGen/WinEHFuncInfo.h
 include/llvm/Config/AsmParsers.def
 include/llvm/Config/AsmPrinters.def
@@ -434,7 +453,6 @@ include/llvm/Config/Targets.def
 include/llvm/Config/abi-breaking.h
 include/llvm/Config/llvm-config.h
 include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h
-include/llvm/DebugInfo/CodeView/CVDebugRecord.h
 include/llvm/DebugInfo/CodeView/CVRecord.h
 include/llvm/DebugInfo/CodeView/CVSymbolVisitor.h
 include/llvm/DebugInfo/CodeView/CVTypeVisitor.h
@@ -495,11 +513,13 @@ include/llvm/DebugInfo/CodeView/TypeVisi
 include/llvm/DebugInfo/DIContext.h
 include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h
 include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
+include/llvm/DebugInfo/DWARF/DWARFAddressRange.h
 include/llvm/DebugInfo/DWARF/DWARFAttribute.h
 include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h
 include/llvm/DebugInfo/DWARF/DWARFContext.h
 include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h
 include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h
+include/llvm/DebugInfo/DWARF/DWARFDebugAddr.h
 include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h
 include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h
 include/llvm/DebugInfo/DWARF/DWARFDebugFrame.h
@@ -509,10 +529,12 @@ include/llvm/DebugInfo/DWARF/DWARFDebugL
 include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h
 include/llvm/DebugInfo/DWARF/DWARFDebugPubTable.h
 include/llvm/DebugInfo/DWARF/DWARFDebugRangeList.h
+include/llvm/DebugInfo/DWARF/DWARFDebugRnglists.h
 include/llvm/DebugInfo/DWARF/DWARFDie.h
 include/llvm/DebugInfo/DWARF/DWARFExpression.h
 include/llvm/DebugInfo/DWARF/DWARFFormValue.h
 include/llvm/DebugInfo/DWARF/DWARFGdbIndex.h
+include/llvm/DebugInfo/DWARF/DWARFListTable.h
 include/llvm/DebugInfo/DWARF/DWARFObject.h
 include/llvm/DebugInfo/DWARF/DWARFRelocMap.h
 include/llvm/DebugInfo/DWARF/DWARFSection.h
@@ -528,22 +550,29 @@ include/llvm/DebugInfo/MSF/MappedBlockSt
 include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h
 include/llvm/DebugInfo/PDB/DIA/DIADataStream.h
 include/llvm/DebugInfo/PDB/DIA/DIAEnumDebugStreams.h
+include/llvm/DebugInfo/PDB/DIA/DIAEnumInjectedSources.h
 include/llvm/DebugInfo/PDB/DIA/DIAEnumLineNumbers.h
+include/llvm/DebugInfo/PDB/DIA/DIAEnumSectionContribs.h
 include/llvm/DebugInfo/PDB/DIA/DIAEnumSourceFiles.h
 include/llvm/DebugInfo/PDB/DIA/DIAEnumSymbols.h
 include/llvm/DebugInfo/PDB/DIA/DIAEnumTables.h
 include/llvm/DebugInfo/PDB/DIA/DIAError.h
+include/llvm/DebugInfo/PDB/DIA/DIAInjectedSource.h
 include/llvm/DebugInfo/PDB/DIA/DIALineNumber.h
 include/llvm/DebugInfo/PDB/DIA/DIARawSymbol.h
+include/llvm/DebugInfo/PDB/DIA/DIASectionContrib.h
 include/llvm/DebugInfo/PDB/DIA/DIASession.h
 include/llvm/DebugInfo/PDB/DIA/DIASourceFile.h
 include/llvm/DebugInfo/PDB/DIA/DIASupport.h
 include/llvm/DebugInfo/PDB/DIA/DIATable.h
+include/llvm/DebugInfo/PDB/DIA/DIAUtils.h
 include/llvm/DebugInfo/PDB/GenericError.h
 include/llvm/DebugInfo/PDB/IPDBDataStream.h
 include/llvm/DebugInfo/PDB/IPDBEnumChildren.h
+include/llvm/DebugInfo/PDB/IPDBInjectedSource.h
 include/llvm/DebugInfo/PDB/IPDBLineNumber.h
 include/llvm/DebugInfo/PDB/IPDBRawSymbol.h
+include/llvm/DebugInfo/PDB/IPDBSectionContrib.h
 include/llvm/DebugInfo/PDB/IPDBSession.h
 include/llvm/DebugInfo/PDB/IPDBSourceFile.h
 include/llvm/DebugInfo/PDB/IPDBTable.h
@@ -633,16 +662,19 @@ include/llvm/ExecutionEngine/JITSymbol.h
 include/llvm/ExecutionEngine/MCJIT.h
 include/llvm/ExecutionEngine/OProfileWrapper.h
 include/llvm/ExecutionEngine/ObjectCache.h
-include/llvm/ExecutionEngine/ObjectMemoryBuffer.h
 include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
 include/llvm/ExecutionEngine/Orc/CompileUtils.h
+include/llvm/ExecutionEngine/Orc/Core.h
 include/llvm/ExecutionEngine/Orc/ExecutionUtils.h
 include/llvm/ExecutionEngine/Orc/GlobalMappingLayer.h
 include/llvm/ExecutionEngine/Orc/IRCompileLayer.h
 include/llvm/ExecutionEngine/Orc/IRTransformLayer.h
 include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
+include/llvm/ExecutionEngine/Orc/LLJIT.h
 include/llvm/ExecutionEngine/Orc/LambdaResolver.h
+include/llvm/ExecutionEngine/Orc/Layer.h
 include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
+include/llvm/ExecutionEngine/Orc/Legacy.h
 include/llvm/ExecutionEngine/Orc/NullResolver.h
 include/llvm/ExecutionEngine/Orc/ObjectTransformLayer.h
 include/llvm/ExecutionEngine/Orc/OrcABISupport.h
@@ -669,8 +701,8 @@ include/llvm/FuzzMutate/Random.h
 include/llvm/FuzzMutate/RandomIRBuilder.h
 include/llvm/IR/Argument.h
 include/llvm/IR/AssemblyAnnotationWriter.h
-include/llvm/IR/Attributes.gen
 include/llvm/IR/Attributes.h
+include/llvm/IR/Attributes.inc
 include/llvm/IR/Attributes.td
 include/llvm/IR/AutoUpgrade.h
 include/llvm/IR/BasicBlock.h
@@ -693,6 +725,7 @@ include/llvm/IR/DerivedUser.h
 include/llvm/IR/DiagnosticHandler.h
 include/llvm/IR/DiagnosticInfo.h
 include/llvm/IR/DiagnosticPrinter.h
+include/llvm/IR/DomTreeUpdater.h
 include/llvm/IR/Dominators.h
 include/llvm/IR/Function.h
 include/llvm/IR/GVMaterializer.h
@@ -712,8 +745,9 @@ include/llvm/IR/InstrTypes.h
 include/llvm/IR/Instruction.def
 include/llvm/IR/Instruction.h
 include/llvm/IR/Instructions.h
+include/llvm/IR/IntrinsicEnums.inc
+include/llvm/IR/IntrinsicImpl.inc
 include/llvm/IR/IntrinsicInst.h
-include/llvm/IR/Intrinsics.gen
 include/llvm/IR/Intrinsics.h
 include/llvm/IR/Intrinsics.td
 include/llvm/IR/IntrinsicsAArch64.td
@@ -749,6 +783,7 @@ include/llvm/IR/PassManagerInternal.h
 include/llvm/IR/PatternMatch.h
 include/llvm/IR/PredIteratorCache.h
 include/llvm/IR/ProfileSummary.h
+include/llvm/IR/RuntimeLibcalls.def
 include/llvm/IR/SafepointIRVerifier.h
 include/llvm/IR/Statepoint.h
 include/llvm/IR/SymbolTableListTraits.h
@@ -844,7 +879,7 @@ include/llvm/MC/MCSymbolELF.h
 include/llvm/MC/MCSymbolMachO.h
 include/llvm/MC/MCSymbolWasm.h
 include/llvm/MC/MCTargetOptions.h
-include/llvm/MC/MCTargetOptionsCommandFlags.def
+include/llvm/MC/MCTargetOptionsCommandFlags.inc
 include/llvm/MC/MCValue.h
 include/llvm/MC/MCWasmObjectWriter.h
 include/llvm/MC/MCWasmStreamer.h
@@ -862,6 +897,7 @@ include/llvm/Object/Binary.h
 include/llvm/Object/COFF.h
 include/llvm/Object/COFFImportFile.h
 include/llvm/Object/COFFModuleDefinition.h
+include/llvm/Object/CVDebugRecord.h
 include/llvm/Object/Decompressor.h
 include/llvm/Object/ELF.h
 include/llvm/Object/ELFObjectFile.h
@@ -878,6 +914,7 @@ include/llvm/Object/StackMapParser.h
 include/llvm/Object/SymbolSize.h
 include/llvm/Object/SymbolicFile.h
 include/llvm/Object/Wasm.h
+include/llvm/Object/WasmTraits.h
 include/llvm/Object/WindowsResource.h
 include/llvm/ObjectYAML/COFFYAML.h
 include/llvm/ObjectYAML/CodeViewYAMLDebugSections.h
@@ -903,6 +940,7 @@ include/llvm/PassInfo.h
 include/llvm/PassRegistry.h
 include/llvm/PassSupport.h
 include/llvm/Passes/PassBuilder.h
+include/llvm/Passes/PassPlugin.h
 include/llvm/ProfileData/Coverage/CoverageMapping.h
 include/llvm/ProfileData/Coverage/CoverageMappingReader.h
 include/llvm/ProfileData/Coverage/CoverageMappingWriter.h
@@ -916,8 +954,8 @@ include/llvm/ProfileData/SampleProf.h
 include/llvm/ProfileData/SampleProfReader.h
 include/llvm/ProfileData/SampleProfWriter.h
 include/llvm/Support/AArch64TargetParser.def
-include/llvm/Support/AMDGPUKernelDescriptor.h
 include/llvm/Support/AMDGPUMetadata.h
+include/llvm/Support/AMDHSAKernelDescriptor.h
 include/llvm/Support/ARMAttributeParser.h
 include/llvm/Support/ARMBuildAttributes.h
 include/llvm/Support/ARMEHABI.h
@@ -943,15 +981,16 @@ include/llvm/Support/COM.h
 include/llvm/Support/CachePruning.h
 include/llvm/Support/Capacity.h
 include/llvm/Support/Casting.h
+include/llvm/Support/CheckedArithmetic.h
 include/llvm/Support/Chrono.h
 include/llvm/Support/CodeGen.h
-include/llvm/Support/CodeGenCWrappers.h
 include/llvm/Support/CodeGenCoverage.h
 include/llvm/Support/CommandLine.h
 include/llvm/Support/Compiler.h
 include/llvm/Support/Compression.h
 include/llvm/Support/ConvertUTF.h
 include/llvm/Support/CrashRecoveryContext.h
+include/llvm/Support/DJB.h
 include/llvm/Support/DOTGraphTraits.h
 include/llvm/Support/DataExtractor.h
 include/llvm/Support/DataTypes.h
@@ -980,6 +1019,8 @@ include/llvm/Support/GenericDomTreeConst
 include/llvm/Support/GlobPattern.h
 include/llvm/Support/GraphWriter.h
 include/llvm/Support/Host.h
+include/llvm/Support/InitLLVM.h
+include/llvm/Support/JSON.h
 include/llvm/Support/JamCRC.h
 include/llvm/Support/KnownBits.h
 include/llvm/Support/LEB128.h
@@ -989,8 +1030,10 @@ include/llvm/Support/Locale.h
 include/llvm/Support/LockFileManager.h
 include/llvm/Support/LowLevelTypeImpl.h
 include/llvm/Support/MD5.h
+include/llvm/Support/MachineValueType.h
 include/llvm/Support/ManagedStatic.h
 include/llvm/Support/MathExtras.h
+include/llvm/Support/MemAlloc.h
 include/llvm/Support/Memory.h
 include/llvm/Support/MemoryBuffer.h
 include/llvm/Support/MipsABIFlags.h
@@ -1020,6 +1063,7 @@ include/llvm/Support/SaveAndRestore.h
 include/llvm/Support/ScaledNumber.h
 include/llvm/Support/ScopedPrinter.h
 include/llvm/Support/Signals.h
+include/llvm/Support/SmallVectorMemoryBuffer.h
 include/llvm/Support/Solaris/sys/regset.h
 include/llvm/Support/SourceMgr.h
 include/llvm/Support/SpecialCaseList.h
@@ -1028,9 +1072,11 @@ include/llvm/Support/StringSaver.h
 include/llvm/Support/SwapByteOrder.h
 include/llvm/Support/SystemUtils.h
 include/llvm/Support/TarWriter.h
+include/llvm/Support/TargetOpcodes.def
 include/llvm/Support/TargetParser.h
 include/llvm/Support/TargetRegistry.h
 include/llvm/Support/TargetSelect.h
+include/llvm/Support/TaskQueue.h
 include/llvm/Support/ThreadLocal.h
 include/llvm/Support/ThreadPool.h
 include/llvm/Support/Threading.h
@@ -1044,9 +1090,12 @@ include/llvm/Support/UnicodeCharRanges.h
 include/llvm/Support/UniqueLock.h
 include/llvm/Support/VCSRevision.h
 include/llvm/Support/Valgrind.h
+include/llvm/Support/VersionTuple.h
 include/llvm/Support/Watchdog.h
 include/llvm/Support/Win64EH.h
 include/llvm/Support/WindowsError.h
+include/llvm/Support/WithColor.h
+include/llvm/Support/X86DisassemblerDecoderCommon.h
 include/llvm/Support/X86TargetParser.def
 include/llvm/Support/YAMLParser.h
 include/llvm/Support/YAMLTraits.h
@@ -1065,14 +1114,17 @@ include/llvm/TableGen/SetTheory.h
 include/llvm/TableGen/StringMatcher.h
 include/llvm/TableGen/StringToOffsetTable.h
 include/llvm/TableGen/TableGenBackend.h
+include/llvm/Target/CodeGenCWrappers.h
 include/llvm/Target/GenericOpcodes.td
 include/llvm/Target/GlobalISel/RegisterBank.td
 include/llvm/Target/GlobalISel/SelectionDAGCompat.td
 include/llvm/Target/GlobalISel/Target.td
 include/llvm/Target/Target.td
 include/llvm/Target/TargetCallingConv.td
+include/llvm/Target/TargetInstrPredicate.td
 include/llvm/Target/TargetIntrinsicInfo.h
 include/llvm/Target/TargetItinerary.td
+include/llvm/Target/TargetLoweringObjectFile.h
 include/llvm/Target/TargetMachine.h
 include/llvm/Target/TargetOptions.h
 include/llvm/Target/TargetSchedule.td
@@ -1081,8 +1133,8 @@ include/llvm/Testing/Support/Error.h
 include/llvm/Testing/Support/SupportHelpers.h
 include/llvm/ToolDrivers/llvm-dlltool/DlltoolDriver.h
 include/llvm/ToolDrivers/llvm-lib/LibDriver.h
+include/llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h
 include/llvm/Transforms/Coroutines.h
-include/llvm/Transforms/GCOVProfiler.h
 include/llvm/Transforms/IPO.h
 include/llvm/Transforms/IPO/AlwaysInliner.h
 include/llvm/Transforms/IPO/ArgumentPromotion.h
@@ -1104,17 +1156,20 @@ include/llvm/Transforms/IPO/LowerTypeTes
 include/llvm/Transforms/IPO/PartialInlining.h
 include/llvm/Transforms/IPO/PassManagerBuilder.h
 include/llvm/Transforms/IPO/SCCP.h
+include/llvm/Transforms/IPO/SampleProfile.h
 include/llvm/Transforms/IPO/StripDeadPrototypes.h
+include/llvm/Transforms/IPO/SyntheticCountsPropagation.h
 include/llvm/Transforms/IPO/ThinLTOBitcodeWriter.h
 include/llvm/Transforms/IPO/WholeProgramDevirt.h
 include/llvm/Transforms/InstCombine/InstCombine.h
 include/llvm/Transforms/InstCombine/InstCombineWorklist.h
-include/llvm/Transforms/InstrProfiling.h
 include/llvm/Transforms/Instrumentation.h
 include/llvm/Transforms/Instrumentation/BoundsChecking.h
+include/llvm/Transforms/Instrumentation/CGProfile.h
+include/llvm/Transforms/Instrumentation/GCOVProfiler.h
+include/llvm/Transforms/Instrumentation/InstrProfiling.h
+include/llvm/Transforms/Instrumentation/PGOInstrumentation.h
 include/llvm/Transforms/ObjCARC.h
-include/llvm/Transforms/PGOInstrumentation.h
-include/llvm/Transforms/SampleProfile.h
 include/llvm/Transforms/Scalar.h
 include/llvm/Transforms/Scalar/ADCE.h
 include/llvm/Transforms/Scalar/AlignmentFromAssumptions.h
@@ -1132,6 +1187,8 @@ include/llvm/Transforms/Scalar/GVNExpres
 include/llvm/Transforms/Scalar/GuardWidening.h
 include/llvm/Transforms/Scalar/IVUsersPrinter.h
 include/llvm/Transforms/Scalar/IndVarSimplify.h
+include/llvm/Transforms/Scalar/InductiveRangeCheckElimination.h
+include/llvm/Transforms/Scalar/InstSimplifyPass.h
 include/llvm/Transforms/Scalar/JumpThreading.h
 include/llvm/Transforms/Scalar/LICM.h
 include/llvm/Transforms/Scalar/LoopAccessAnalysisPrinter.h
@@ -1147,6 +1204,7 @@ include/llvm/Transforms/Scalar/LoopRotat
 include/llvm/Transforms/Scalar/LoopSimplifyCFG.h
 include/llvm/Transforms/Scalar/LoopSink.h
 include/llvm/Transforms/Scalar/LoopStrengthReduce.h
+include/llvm/Transforms/Scalar/LoopUnrollAndJamPass.h
 include/llvm/Transforms/Scalar/LoopUnrollPass.h
 include/llvm/Transforms/Scalar/LowerAtomic.h
 include/llvm/Transforms/Scalar/LowerExpectIntrinsic.h
@@ -1166,6 +1224,7 @@ include/llvm/Transforms/Scalar/Sink.h
 include/llvm/Transforms/Scalar/SpeculateAroundPHIs.h
 include/llvm/Transforms/Scalar/SpeculativeExecution.h
 include/llvm/Transforms/Scalar/TailRecursionElimination.h
+include/llvm/Transforms/Utils.h
 include/llvm/Transforms/Utils/ASanStackFrameLayout.h
 include/llvm/Transforms/Utils/AddDiscriminators.h
 include/llvm/Transforms/Utils/BasicBlockUtils.h
@@ -1187,6 +1246,7 @@ include/llvm/Transforms/Utils/IntegerDiv
 include/llvm/Transforms/Utils/LCSSA.h
 include/llvm/Transforms/Utils/LibCallsShrinkWrap.h
 include/llvm/Transforms/Utils/Local.h
+include/llvm/Transforms/Utils/LoopRotationUtils.h
 include/llvm/Transforms/Utils/LoopSimplify.h
 include/llvm/Transforms/Utils/LoopUtils.h
 include/llvm/Transforms/Utils/LoopVersioning.h
@@ -1199,10 +1259,10 @@ include/llvm/Transforms/Utils/OrderedIns
 include/llvm/Transforms/Utils/PredicateInfo.h
 include/llvm/Transforms/Utils/PromoteMemToReg.h
 include/llvm/Transforms/Utils/SSAUpdater.h
+include/llvm/Transforms/Utils/SSAUpdaterBulk.h
 include/llvm/Transforms/Utils/SSAUpdaterImpl.h
 include/llvm/Transforms/Utils/SanitizerStats.h
 include/llvm/Transforms/Utils/SimplifyIndVar.h
-include/llvm/Transforms/Utils/SimplifyInstructions.h
 include/llvm/Transforms/Utils/SimplifyLibCalls.h
 include/llvm/Transforms/Utils/SplitModule.h
 include/llvm/Transforms/Utils/SymbolRewriter.h
@@ -1211,6 +1271,7 @@ include/llvm/Transforms/Utils/UnrollLoop
 include/llvm/Transforms/Utils/VNCoercion.h
 include/llvm/Transforms/Utils/ValueMapper.h
 include/llvm/Transforms/Vectorize.h
+include/llvm/Transforms/Vectorize/LoopVectorizationLegality.h
 include/llvm/Transforms/Vectorize/LoopVectorize.h
 include/llvm/Transforms/Vectorize/SLPVectorizer.h
 include/llvm/WindowsManifest/WindowsManifestMerger.h
@@ -1224,6 +1285,7 @@ include/llvm/XRay/XRayRecord.h
 include/llvm/XRay/YAMLXRayRecord.h
 lib/BugpointPasses.${SOEXT}
 lib/LLVMHello.${SOEXT}
+lib/TestPlugin.${SOEXT}
 lib/cmake/llvm/AddLLVM.cmake
 lib/cmake/llvm/AddLLVMDefinitions.cmake
 lib/cmake/llvm/AddOCaml.cmake
@@ -1234,6 +1296,7 @@ lib/cmake/llvm/CheckLinkerFlag.cmake
 lib/cmake/llvm/ChooseMSVCCRT.cmake
 lib/cmake/llvm/CrossCompile.cmake
 lib/cmake/llvm/DetermineGCCCompatible.cmake
+lib/cmake/llvm/FindLibpfm.cmake
 lib/cmake/llvm/FindOCaml.cmake
 lib/cmake/llvm/FindSphinx.cmake
 lib/cmake/llvm/GenerateVersionFromCVS.cmake
@@ -1250,8 +1313,8 @@ lib/cmake/llvm/LLVMInstallSymlink.cmake
 lib/cmake/llvm/LLVMProcessSources.cmake
 lib/cmake/llvm/TableGen.cmake
 lib/cmake/llvm/VersionFromVCS.cmake
-${PLIST.notdylib}lib/libLLVM-${PKGVERSION}.${SOEXT}
-${PLIST.notdylib}lib/libLLVM-6.0.${SOEXT}
+lib/libLLVM-${PKGVERSION}.${SOEXT}
+lib/libLLVM-7.${SOEXT}
 lib/libLLVM.${SOEXT}
 ${PLIST.AArch64}lib/libLLVMAArch64AsmParser.a
 ${PLIST.AArch64}lib/libLLVMAArch64AsmPrinter.a
@@ -1274,6 +1337,7 @@ ${PLIST.ARM}lib/libLLVMARMDesc.a
 ${PLIST.ARM}lib/libLLVMARMDisassembler.a
 ${PLIST.ARM}lib/libLLVMARMInfo.a
 ${PLIST.ARM}lib/libLLVMARMUtils.a
+lib/libLLVMAggressiveInstCombine.a
 lib/libLLVMAnalysis.a
 lib/libLLVMAsmParser.a
 lib/libLLVMAsmPrinter.a
@@ -1381,8 +1445,7 @@ ${PLIST.XCore}lib/libLLVMXCoreInfo.a
 lib/libLLVMXRay.a
 lib/libLLVMipo.a
 lib/libLTO.${SOEXT}
-${PLIST.notdylib}lib/libLTO.${SOEXT}.${PKGVERSION}
-${PLIST.notdylib}lib/libLTO.${SOEXT}.6
+${PLIST.notdylib}lib/libLTO.${SOEXT}.7
 share/opt-viewer/opt-diff.py
 share/opt-viewer/opt-stats.py
 share/opt-viewer/opt-viewer.py

Index: pkgsrc/lang/llvm/buildlink3.mk
diff -u pkgsrc/lang/llvm/buildlink3.mk:1.6 pkgsrc/lang/llvm/buildlink3.mk:1.7
--- pkgsrc/lang/llvm/buildlink3.mk:1.6  Sun Jan  7 13:04:19 2018
+++ pkgsrc/lang/llvm/buildlink3.mk      Sun Dec  9 20:04:38 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:19 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/12/09 20:04:38 adam Exp $
 
 BUILDLINK_TREE+=       llvm
 
 .if !defined(LLVM_BUILDLINK3_MK)
 LLVM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.llvm+=   llvm>=4.0.1
+BUILDLINK_API_DEPENDS.llvm+=   llvm>=7.0.0
 BUILDLINK_PKGSRCDIR.llvm?=     ../../lang/llvm
 
 LLVM_CONFIG_PATH?=             ${BUILDLINK_PREFIX.llvm}/bin/llvm-config

Index: pkgsrc/lang/llvm/distinfo
diff -u pkgsrc/lang/llvm/distinfo:1.16 pkgsrc/lang/llvm/distinfo:1.17
--- pkgsrc/lang/llvm/distinfo:1.16      Tue Aug  7 10:44:50 2018
+++ pkgsrc/lang/llvm/distinfo   Sun Dec  9 20:04:38 2018
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.16 2018/08/07 10:44:50 adam Exp $
+$NetBSD: distinfo,v 1.17 2018/12/09 20:04:38 adam Exp $
 
-SHA1 (llvm-6.0.1.src.tar.xz) = 09a6316c5225cab255ba12391e7abe5ff4d28935
-RMD160 (llvm-6.0.1.src.tar.xz) = 6bfc568d0cab4d82ac948f54b18017d8e8ead934
-SHA512 (llvm-6.0.1.src.tar.xz) = cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
-Size (llvm-6.0.1.src.tar.xz) = 25306628 bytes
+SHA1 (llvm-7.0.0.src.tar.xz) = 27503a22614626e935a05b609ab4211be72cd78b
+RMD160 (llvm-7.0.0.src.tar.xz) = af7af75c7fb15a004f887f81d71eae58c24c11e6
+SHA512 (llvm-7.0.0.src.tar.xz) = bdc9b851c158b17e1bbeb7ac5ae49821bfb1251a3826fe8a3932cd1a43f9fb0d620c3de67150c1d9297bf0b86fa917e75978da29c3f751b277866dc90395abec
+Size (llvm-7.0.0.src.tar.xz) = 28324368 bytes
 SHA1 (patch-CMakeLists.txt) = 78e2dab2bf73f7e466ca2788fe6444e39b4ebd80
 SHA1 (patch-cmake_config-ix.cmake) = a345420169e4066e22d28ca6ad10840e83ccfa76
-SHA1 (patch-cmake_modules_AddLLVM.cmake) = 4bfb98c5d99797155d0fb13a43352d31f6cfe783
+SHA1 (patch-cmake_modules_AddLLVM.cmake) = 31d4f47f03bef021a24d53147c1b66abd64e1d87
 SHA1 (patch-cmake_modules_CheckAtomic.cmake) = 51e4fdf3bc24b50fc4d4bfa1ec5ba6c82ef946b4
 SHA1 (patch-cmake_modules_HandleLLVMOptions.cmake) = 271e6f5a8cebf8162c4e3b758e96f451b434269b
-SHA1 (patch-include_llvm_Support_DataTypes.h.cmake) = 18ebb1fcd2499d1216d5c3afe0bbb55fe63fe3ef
-SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = bf6db476781a5670032bc5476a02d9db73ca6d59
+SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 45278d8acc6daa3d36a1a7b15e2e3b9a75a218e6

Index: pkgsrc/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake
diff -u pkgsrc/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake:1.3 pkgsrc/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake:1.4
--- pkgsrc/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake:1.3      Sun Mar 19 19:01:48 2017
+++ pkgsrc/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake  Sun Dec  9 20:04:38 2018
@@ -1,21 +1,31 @@
-$NetBSD: patch-cmake_modules_AddLLVM.cmake,v 1.3 2017/03/19 19:01:48 adam Exp $
+$NetBSD: patch-cmake_modules_AddLLVM.cmake,v 1.4 2018/12/09 20:04:38 adam Exp $
 
 Don't use non-portable -z discard-unused on SunOS.
+On Darwin, create symbolic links to shared libraries.
 On Darwin, use correct install-name for shared libraries.
 
---- cmake/modules/AddLLVM.cmake.orig   2017-01-17 21:47:58.000000000 +0000
+--- cmake/modules/AddLLVM.cmake.orig   2018-08-01 07:51:55.000000000 +0000
 +++ cmake/modules/AddLLVM.cmake
-@@ -182,9 +182,6 @@ function(add_link_opts target_name)
+@@ -218,9 +218,6 @@ function(add_link_opts target_name)
          # ld64's implementation of -dead_strip breaks tools that use plugins.
          set_property(TARGET ${target_name} APPEND_STRING PROPERTY
                       LINK_FLAGS " -Wl,-dead_strip")
 -      elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
 -        set_property(TARGET ${target_name} APPEND_STRING PROPERTY
 -                     LINK_FLAGS " -Wl,-z -Wl,discard-unused=sections")
-       elseif(NOT WIN32 AND NOT LLVM_LINKER_IS_GOLD)
+       elseif(NOT WIN32 AND NOT LLVM_LINKER_IS_GOLD AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
          # Object files are compiled with -ffunction-data-sections.
          # Versions of bfd ld < 2.23.1 have a bug in --gc-sections that breaks
-@@ -1419,7 +1416,7 @@ function(llvm_setup_rpath name)
+@@ -517,7 +514,7 @@ function(llvm_add_library name)
+   endif()
+ 
+   if(ARG_SHARED AND UNIX)
+-    if(NOT APPLE AND ARG_SONAME)
++    if(ARG_SONAME)
+       get_target_property(output_name ${name} OUTPUT_NAME)
+       if(${output_name} STREQUAL "output_name-NOTFOUND")
+         set(output_name ${name})
+@@ -1632,7 +1629,7 @@ function(llvm_setup_rpath name)
    endif()
  
    if (APPLE)
Index: pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
diff -u pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt:1.3 pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt:1.4
--- pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt:1.3  Tue Aug  7 10:44:50 2018
+++ pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt      Sun Dec  9 20:04:38 2018
@@ -1,15 +1,17 @@
-$NetBSD: patch-tools_llvm-shlib_CMakeLists.txt,v 1.3 2018/08/07 10:44:50 adam Exp $
+$NetBSD: patch-tools_llvm-shlib_CMakeLists.txt,v 1.4 2018/12/09 20:04:38 adam Exp $
 
 Use the Linux style linking everywhere except Darwin and SunOS.
 
---- tools/llvm-shlib/CMakeLists.txt.orig       2017-07-19 16:07:51.000000000 +0000
+--- tools/llvm-shlib/CMakeLists.txt.orig       2018-08-03 10:15:36.000000000 +0000
 +++ tools/llvm-shlib/CMakeLists.txt
-@@ -37,10 +37,11 @@ endif()
+@@ -37,12 +37,11 @@ endif()
  add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
  
  list(REMOVE_DUPLICATES LIB_NAMES)
 -if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
 -   OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
+-   OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
+-   OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
 -   OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")
 -   OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")) # FIXME: It should be "GNU ld for elf"
 +if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
@@ -20,7 +22,7 @@ Use the Linux style linking everywhere e
    configure_file(
    ${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map.in
    ${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map)
-@@ -51,8 +52,6 @@ if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Lin
+@@ -53,8 +52,6 @@ if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Lin
      # Solaris ld does not accept global: *; so there is no way to version *all* global symbols
      set(LIB_NAMES -Wl,--version-script,${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map ${LIB_NAMES})
    endif()

Added files:

Index: pkgsrc/lang/compiler-rt/PLIST.Darwin
diff -u /dev/null pkgsrc/lang/compiler-rt/PLIST.Darwin:1.1
--- /dev/null   Sun Dec  9 20:04:41 2018
+++ pkgsrc/lang/compiler-rt/PLIST.Darwin        Sun Dec  9 20:04:40 2018
@@ -0,0 +1,21 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2018/12/09 20:04:40 adam Exp $
+lib/clang/${PKGVERSION}/lib/libclang_rt.10.4.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.asan_osx_dynamic.dylib
+lib/clang/${PKGVERSION}/lib/libclang_rt.cc_kext.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.fuzzer_no_main_osx.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.fuzzer_osx.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.lsan_osx_dynamic.dylib
+lib/clang/${PKGVERSION}/lib/libclang_rt.osx.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.profile_osx.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.safestack_osx.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.stats_client_osx.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.stats_osx_dynamic.dylib
+lib/clang/${PKGVERSION}/lib/libclang_rt.tsan_osx_dynamic.dylib
+lib/clang/${PKGVERSION}/lib/libclang_rt.ubsan_minimal_osx.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.ubsan_minimal_osx_dynamic.dylib
+lib/clang/${PKGVERSION}/lib/libclang_rt.ubsan_osx.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.ubsan_osx_dynamic.dylib
+lib/clang/${PKGVERSION}/lib/libclang_rt.xray-basic_osx.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.xray-fdr_osx.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.xray-profiling_osx.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.xray_osx.a
Index: pkgsrc/lang/compiler-rt/PLIST.NetBSD
diff -u /dev/null pkgsrc/lang/compiler-rt/PLIST.NetBSD:1.1
--- /dev/null   Sun Dec  9 20:04:41 2018
+++ pkgsrc/lang/compiler-rt/PLIST.NetBSD        Sun Dec  9 20:04:40 2018
@@ -0,0 +1,36 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.1 2018/12/09 20:04:40 adam Exp $
+lib/clang/${PKGVERSION}/lib/libclang_rt.asan-preinit-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.asan-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.asan-${MACHINE_ARCH}.a.syms
+lib/clang/${PKGVERSION}/lib/libclang_rt.asan-${MACHINE_ARCH}.so
+lib/clang/${PKGVERSION}/lib/libclang_rt.asan_cxx-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.asan_cxx-${MACHINE_ARCH}.a.syms
+lib/clang/${PKGVERSION}/lib/libclang_rt.builtins-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.dd-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.dyndd-${MACHINE_ARCH}.so
+lib/clang/${PKGVERSION}/lib/libclang_rt.fuzzer-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.fuzzer_no_main-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.lsan-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.msan-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.msan-${MACHINE_ARCH}.a.syms
+lib/clang/${PKGVERSION}/lib/libclang_rt.msan_cxx-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.msan_cxx-${MACHINE_ARCH}.a.syms
+lib/clang/${PKGVERSION}/lib/libclang_rt.safestack-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.stats-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.stats_client-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.tsan-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.tsan-${MACHINE_ARCH}.a.syms
+lib/clang/${PKGVERSION}/lib/libclang_rt.tsan_cxx-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.tsan_cxx-${MACHINE_ARCH}.a.syms
+lib/clang/${PKGVERSION}/lib/libclang_rt.ubsan_minimal-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.ubsan_minimal-${MACHINE_ARCH}.a.syms
+lib/clang/${PKGVERSION}/lib/libclang_rt.ubsan_minimal-${MACHINE_ARCH}.so
+lib/clang/${PKGVERSION}/lib/libclang_rt.ubsan_standalone-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.ubsan_standalone-${MACHINE_ARCH}.a.syms
+lib/clang/${PKGVERSION}/lib/libclang_rt.ubsan_standalone-${MACHINE_ARCH}.so
+lib/clang/${PKGVERSION}/lib/libclang_rt.ubsan_standalone_cxx-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.ubsan_standalone_cxx-${MACHINE_ARCH}.a.syms
+lib/clang/${PKGVERSION}/lib/libclang_rt.xray-basic-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.xray-fdr-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.xray-profiling-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/libclang_rt.xray-${MACHINE_ARCH}.a

Index: pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
diff -u /dev/null pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc:1.1
--- /dev/null   Sun Dec  9 20:04:41 2018
+++ pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc    Sun Dec  9 20:04:40 2018
@@ -0,0 +1,22 @@
+$NetBSD: patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc,v 1.1 2018/12/09 20:04:40 adam Exp $
+
+Fix building on NetBSD.
+
+--- lib/sanitizer_common/sanitizer_linux_libcdep.cc.orig       2018-10-07 10:50:07.000000000 +0000
++++ lib/sanitizer_common/sanitizer_linux_libcdep.cc
+@@ -523,13 +523,13 @@ void GetThreadStackAndTls(bool main, upt
+ #endif
+ }
+ 
+-#if !SANITIZER_FREEBSD && !SANITIZER_OPENBSD
++#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
+ typedef ElfW(Phdr) Elf_Phdr;
+ #elif SANITIZER_WORDSIZE == 32 && __FreeBSD_version <= 902001 // v9.2
+ #define Elf_Phdr XElf32_Phdr
+ #define dl_phdr_info xdl_phdr_info
+ #define dl_iterate_phdr(c, b) xdl_iterate_phdr((c), (b))
+-#endif // !SANITIZER_FREEBSD && !SANITIZER_OPENBSD
++#endif // !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
+ 
+ struct DlIteratePhdrData {
+   InternalMmapVectorNoCtor<LoadedModule> *modules;
Index: pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
diff -u /dev/null pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc:1.1
--- /dev/null   Sun Dec  9 20:04:41 2018
+++ pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc  Sun Dec  9 20:04:40 2018
@@ -0,0 +1,74 @@
+$NetBSD: patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc,v 1.1 2018/12/09 20:04:40 adam Exp $
+
+Network ATM has been removed from NetBSD.
+
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig      2018-10-07 11:20:49.808236967 +0000
++++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
+@@ -116,7 +116,9 @@
+ #include <dev/wscons/wsconsio.h>
+ #include <dev/wscons/wsdisplay_usl_io.h>
+ #include <net/bpf.h>
++#if __NetBSD_Version__ < 899000000
+ #include <net/if_atm.h>
++#endif
+ #include <net/if_gre.h>
+ #include <net/if_ppp.h>
+ #include <net/if_pppoe.h>
+@@ -132,7 +134,9 @@
+ #include <netinet/ip_proxy.h>
+ #include <netinet6/in6_var.h>
+ #include <netinet6/nd6.h>
++#if __NetBSD_Version__ < 899000000
+ #include <netnatm/natm.h>
++#endif
+ #include <netsmb/smb_dev.h>
+ #include <soundcard.h>
+ #include <sys/agpio.h>
+@@ -349,8 +353,10 @@ unsigned struct_apm_power_info_sz = size
+ unsigned struct_atabusiodetach_args_sz = sizeof(atabusiodetach_args);
+ unsigned struct_atabusioscan_args_sz = sizeof(atabusioscan_args);
+ unsigned struct_ath_diag_sz = sizeof(ath_diag);
++#if __NetBSD_Version__ < 899000000
+ unsigned struct_atm_flowmap_sz = sizeof(atm_flowmap);
+ unsigned struct_atm_pseudoioctl_sz = sizeof(atm_pseudoioctl);
++#endif
+ unsigned struct_audio_buf_info_sz = sizeof(audio_buf_info);
+ unsigned struct_audio_device_sz = sizeof(audio_device);
+ unsigned struct_audio_encoding_sz = sizeof(audio_encoding);
+@@ -596,7 +602,9 @@ unsigned struct_priq_delete_filter_sz = 
+ unsigned struct_priq_interface_sz = sizeof(priq_interface);
+ unsigned struct_priq_modify_class_sz = sizeof(priq_modify_class);
+ unsigned struct_ptmget_sz = sizeof(ptmget);
++#if __NetBSD_Version__ < 899000000
+ unsigned struct_pvctxreq_sz = sizeof(pvctxreq);
++#endif
+ unsigned struct_radio_info_sz = sizeof(radio_info);
+ unsigned struct_red_conf_sz = sizeof(red_conf);
+ unsigned struct_red_interface_sz = sizeof(red_interface);
+@@ -1414,6 +1422,7 @@ unsigned IOCTL_BIOCSRTIMEOUT = BIOCSRTIM
+ unsigned IOCTL_BIOCGRTIMEOUT = BIOCGRTIMEOUT;
+ unsigned IOCTL_BIOCGFEEDBACK = BIOCGFEEDBACK;
+ unsigned IOCTL_BIOCSFEEDBACK = BIOCSFEEDBACK;
++#if __NetBSD_Version__ < 899000000
+ unsigned IOCTL_SIOCRAWATM = SIOCRAWATM;
+ unsigned IOCTL_SIOCATMENA = SIOCATMENA;
+ unsigned IOCTL_SIOCATMDIS = SIOCATMDIS;
+@@ -1421,6 +1430,7 @@ unsigned IOCTL_SIOCSPVCTX = SIOCSPVCTX;
+ unsigned IOCTL_SIOCGPVCTX = SIOCGPVCTX;
+ unsigned IOCTL_SIOCSPVCSIF = SIOCSPVCSIF;
+ unsigned IOCTL_SIOCGPVCSIF = SIOCGPVCSIF;
++#endif
+ unsigned IOCTL_GRESADDRS = GRESADDRS;
+ unsigned IOCTL_GRESADDRD = GRESADDRD;
+ unsigned IOCTL_GREGADDRS = GREGADDRS;
+@@ -1804,8 +1814,10 @@ unsigned IOCTL_MTIOCSLOCATE = MTIOCSLOCA
+ unsigned IOCTL_MTIOCHLOCATE = MTIOCHLOCATE;
+ unsigned IOCTL_POWER_EVENT_RECVDICT = POWER_EVENT_RECVDICT;
+ unsigned IOCTL_POWER_IOC_GET_TYPE = POWER_IOC_GET_TYPE;
++#if __NetBSD_Version__ < 899000000
+ unsigned IOCTL_POWER_IOC_GET_TYPE_WITH_LOSSAGE =
+     POWER_IOC_GET_TYPE_WITH_LOSSAGE;
++#endif
+ unsigned IOCTL_RIOCGINFO = RIOCGINFO;
+ unsigned IOCTL_RIOCSINFO = RIOCSINFO;
+ unsigned IOCTL_RIOCSSRCH = RIOCSSRCH;
Index: pkgsrc/lang/compiler-rt/patches/patch-lib_tsan_CMakeLists.txt
diff -u /dev/null pkgsrc/lang/compiler-rt/patches/patch-lib_tsan_CMakeLists.txt:1.1
--- /dev/null   Sun Dec  9 20:04:41 2018
+++ pkgsrc/lang/compiler-rt/patches/patch-lib_tsan_CMakeLists.txt       Sun Dec  9 20:04:40 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_tsan_CMakeLists.txt,v 1.1 2018/12/09 20:04:40 adam Exp $
+
+https://bugs.llvm.org/show_bug.cgi?id=26651
+
+--- lib/tsan/CMakeLists.txt.orig       2018-10-07 11:42:29.392328489 +0000
++++ lib/tsan/CMakeLists.txt
+@@ -215,7 +215,7 @@ endif()
+ # in the base system due to incompatibilities between FreeBSD's and Clang's
+ # versions. As a workaround do not use --sysroot=. on FreeBSD until this is
+ # addressed.
+-if(COMPILER_RT_HAS_SYSROOT_FLAG AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
++if(COMPILER_RT_HAS_SYSROOT_FLAG AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND NOT CMAKE_SYSTEM_NAME MATCHES "NetBSD")
+   file(GLOB _tsan_generic_sources rtl/tsan*)
+   file(GLOB _tsan_platform_sources rtl/tsan*posix* rtl/tsan*mac*
+                                    rtl/tsan*linux*)



Home | Main Index | Thread Index | Old Index