CVS commit: src

Joerg Sonnenberger Tue, 17 Jul 2018 12:31:40 -0700

Module Name:    src
Committed By:   joerg
Date:           Tue Jul 17 18:55:31 UTC 2018


Modified Files:
        src/distrib/sets/lists/base: mi
        src/distrib/sets/lists/comp: ad.aarch64 ad.arm ad.mips ad.powerpc
            md.amd64 md.i386 mi
        src/etc/mtree: NetBSD.dist.base
        src/external/bsd/llvm: Makefile.inc
        src/external/bsd/llvm/bin/bugpoint: Makefile
        src/external/bsd/llvm/bin/clang: Makefile
        src/external/bsd/llvm/bin/clang-format: Makefile
        src/external/bsd/llvm/bin/clang-tblgen: Makefile
        src/external/bsd/llvm/bin/llc: Makefile
        src/external/bsd/llvm/bin/lldb: Makefile
        src/external/bsd/llvm/bin/lli: Makefile
        src/external/bsd/llvm/bin/llvm-ar: Makefile
        src/external/bsd/llvm/bin/llvm-as: Makefile
        src/external/bsd/llvm/bin/llvm-dwarfdump: Makefile
        src/external/bsd/llvm/bin/llvm-dwp: Makefile
        src/external/bsd/llvm/bin/llvm-mc: Makefile
        src/external/bsd/llvm/bin/llvm-nm: Makefile
        src/external/bsd/llvm/bin/llvm-objdump: Makefile
        src/external/bsd/llvm/bin/llvm-readobj: Makefile
        src/external/bsd/llvm/bin/llvm-xray: Makefile
        src/external/bsd/llvm/bin/opt: Makefile
        src/external/bsd/llvm/bin/sancov: Makefile
        src/external/bsd/llvm/bin/tblgen: Makefile
        src/external/bsd/llvm/config/clang/Config: config.h
        src/external/bsd/llvm/config/llvm/Config: config.h.in
        src/external/bsd/llvm/include: Makefile
        src/external/bsd/llvm/lib: Makefile
        src/external/bsd/llvm/lib/libLLVMAArch64CodeGen: Makefile
        src/external/bsd/llvm/lib/libLLVMARMCodeGen: Makefile
        src/external/bsd/llvm/lib/libLLVMAnalysis: Makefile
        src/external/bsd/llvm/lib/libLLVMAsmPrinter: Makefile
        src/external/bsd/llvm/lib/libLLVMBinaryFormat: Makefile
        src/external/bsd/llvm/lib/libLLVMCodeGen: Makefile
        src/external/bsd/llvm/lib/libLLVMDebugInfoCodeView: Makefile
        src/external/bsd/llvm/lib/libLLVMDebugInfoDWARF: Makefile
        src/external/bsd/llvm/lib/libLLVMDebugInfoPDBNative: Makefile
        src/external/bsd/llvm/lib/libLLVMGlobalISel: Makefile
        src/external/bsd/llvm/lib/libLLVMIR: Makefile
        src/external/bsd/llvm/lib/libLLVMInstCombine: Makefile
        src/external/bsd/llvm/lib/libLLVMInstrumentation: Makefile
        src/external/bsd/llvm/lib/libLLVMMC: Makefile
        src/external/bsd/llvm/lib/libLLVMMipsCodeGen: Makefile
        src/external/bsd/llvm/lib/libLLVMObjectYAML: Makefile
        src/external/bsd/llvm/lib/libLLVMOrc: Makefile
        src/external/bsd/llvm/lib/libLLVMPasses: Makefile
        src/external/bsd/llvm/lib/libLLVMPowerPCCodeGen: Makefile
        src/external/bsd/llvm/lib/libLLVMProfileData: Makefile
        src/external/bsd/llvm/lib/libLLVMScalarOpts: Makefile
        src/external/bsd/llvm/lib/libLLVMSupport: Makefile
        src/external/bsd/llvm/lib/libLLVMTableGen: Makefile
        src/external/bsd/llvm/lib/libLLVMTransformsUtils: Makefile
        src/external/bsd/llvm/lib/libLLVMVectorize: Makefile
        src/external/bsd/llvm/lib/libLLVMX86AsmPrinter: Makefile
        src/external/bsd/llvm/lib/libLLVMX86CodeGen: Makefile
        src/external/bsd/llvm/lib/libLLVMX86MCTargetDesc: Makefile
        src/external/bsd/llvm/lib/libLLVMipo: Makefile
        src/external/bsd/llvm/lib/libclangAST: Makefile
        src/external/bsd/llvm/lib/libclangAnalysis: Makefile
        src/external/bsd/llvm/lib/libclangBasic: Makefile
        src/external/bsd/llvm/lib/libclangCodeGen: Makefile
        src/external/bsd/llvm/lib/libclangDriver: Makefile
        src/external/bsd/llvm/lib/libclangFrontend: Makefile
        src/external/bsd/llvm/lib/libclangSema: Makefile
        src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers: Makefile
        src/external/bsd/llvm/lib/libclangStaticAnalyzerCore: Makefile
        src/external/bsd/llvm/lib/libclangTooling: Makefile
        src/external/bsd/llvm/lib/libclangToolingCore: Makefile
        src/external/bsd/llvm/lib/libclangToolingRefactoring: Makefile
Added Files:
        src/external/bsd/llvm/bin/llvm-objcopy: Makefile
        src/external/bsd/llvm/lib/libLLVMARMUtils: Makefile
        src/external/bsd/llvm/lib/libLLVMDebugInfoPDBDIA: Makefile
        src/external/bsd/llvm/lib/libLLVMTransformsAggressiveInstCombine:
            Makefile
        src/external/bsd/llvm/lib/libclangCrossTU: Makefile
        src/external/bsd/llvm/lib/libclangToolingASTDiff: Makefile
        src/external/bsd/llvm/lib/libclangToolingInclusions: Makefile
        src/tools/llvm-lib/libLLVMARMUtils: Makefile
        src/tools/llvm-lib/libLLVMTransformsAggressiveInstCombine: Makefile
        src/tools/llvm-lib/libclangCrossTU: Makefile

Log Message:
Update LLVM/Clang build system to r337282.


To generate a diff of this commit:
cvs rdiff -u -r1.1179 -r1.1180 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/comp/ad.aarch64
cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/comp/ad.arm
cvs rdiff -u -r1.74 -r1.75 src/distrib/sets/lists/comp/ad.mips
cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/comp/ad.powerpc
cvs rdiff -u -r1.258 -r1.259 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.181 -r1.182 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.2211 -r1.2212 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.170 -r1.171 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.85 -r1.86 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/llvm/bin/bugpoint/Makefile
cvs rdiff -u -r1.36 -r1.37 src/external/bsd/llvm/bin/clang/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/llvm/bin/clang-format/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/bin/clang-tblgen/Makefile
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/llvm/bin/llc/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/bin/lldb/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/llvm/bin/lli/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/llvm/bin/llvm-ar/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/llvm/bin/llvm-as/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/llvm/bin/llvm-dwarfdump/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/bin/llvm-dwp/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/llvm/bin/llvm-mc/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/llvm/bin/llvm-nm/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/bin/llvm-objcopy/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/llvm/bin/llvm-objdump/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/llvm/bin/llvm-readobj/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/bin/llvm-xray/Makefile
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/llvm/bin/opt/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/bin/sancov/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/llvm/bin/tblgen/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/llvm/config/clang/Config/config.h
cvs rdiff -u -r1.20 -r1.21 \
    src/external/bsd/llvm/config/llvm/Config/config.h.in
cvs rdiff -u -r1.42 -r1.43 src/external/bsd/llvm/include/Makefile
cvs rdiff -u -r1.46 -r1.47 src/external/bsd/llvm/lib/Makefile
cvs rdiff -u -r1.8 -r1.9 \
    src/external/bsd/llvm/lib/libLLVMAArch64CodeGen/Makefile
cvs rdiff -u -r1.17 -r1.18 \
    src/external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libLLVMARMUtils/Makefile
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile
cvs rdiff -u -r1.15 -r1.16 \
    src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/llvm/lib/libLLVMBinaryFormat/Makefile
cvs rdiff -u -r1.33 -r1.34 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
cvs rdiff -u -r1.4 -r1.5 \
    src/external/bsd/llvm/lib/libLLVMDebugInfoCodeView/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/llvm/lib/libLLVMDebugInfoDWARF/Makefile
cvs rdiff -u -r0 -r1.1 \
    src/external/bsd/llvm/lib/libLLVMDebugInfoPDBDIA/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/llvm/lib/libLLVMDebugInfoPDBNative/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/lib/libLLVMGlobalISel/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/llvm/lib/libLLVMIR/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/llvm/lib/libLLVMInstCombine/Makefile
cvs rdiff -u -r1.16 -r1.17 \
    src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/llvm/lib/libLLVMMC/Makefile
cvs rdiff -u -r1.28 -r1.29 \
    src/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/lib/libLLVMObjectYAML/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/lib/libLLVMOrc/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/lib/libLLVMPasses/Makefile
cvs rdiff -u -r1.13 -r1.14 \
    src/external/bsd/llvm/lib/libLLVMPowerPCCodeGen/Makefile
cvs rdiff -u -r1.4 -r1.5 \
    src/external/bsd/llvm/lib/libLLVMProfileData/Makefile
cvs rdiff -u -r1.23 -r1.24 \
    src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile
cvs rdiff -u -r1.34 -r1.35 src/external/bsd/llvm/lib/libLLVMSupport/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/llvm/lib/libLLVMTableGen/Makefile
cvs rdiff -u -r0 -r1.1 \
    src/external/bsd/llvm/lib/libLLVMTransformsAggressiveInstCombine/Makefile
cvs rdiff -u -r1.20 -r1.21 \
    src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/llvm/lib/libLLVMVectorize/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/llvm/lib/libLLVMX86AsmPrinter/Makefile
cvs rdiff -u -r1.16 -r1.17 \
    src/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile
cvs rdiff -u -r1.8 -r1.9 \
    src/external/bsd/llvm/lib/libLLVMX86MCTargetDesc/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/llvm/lib/libLLVMipo/Makefile
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/llvm/lib/libclangAST/Makefile
cvs rdiff -u -r1.14 -r1.15 \
    src/external/bsd/llvm/lib/libclangAnalysis/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/llvm/lib/libclangBasic/Makefile
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/llvm/lib/libclangCodeGen/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libclangCrossTU/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/llvm/lib/libclangDriver/Makefile
cvs rdiff -u -r1.16 -r1.17 \
    src/external/bsd/llvm/lib/libclangFrontend/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/llvm/lib/libclangSema/Makefile
cvs rdiff -u -r1.27 -r1.28 \
    src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile
cvs rdiff -u -r1.16 -r1.17 \
    src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/llvm/lib/libclangTooling/Makefile
cvs rdiff -u -r0 -r1.1 \
    src/external/bsd/llvm/lib/libclangToolingASTDiff/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/llvm/lib/libclangToolingCore/Makefile
cvs rdiff -u -r0 -r1.1 \
    src/external/bsd/llvm/lib/libclangToolingInclusions/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/llvm/lib/libclangToolingRefactoring/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libLLVMARMUtils/Makefile
cvs rdiff -u -r0 -r1.1 \
    src/tools/llvm-lib/libLLVMTransformsAggressiveInstCombine/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libclangCrossTU/Makefile

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1179 src/distrib/sets/lists/base/mi:1.1180
--- src/distrib/sets/lists/base/mi:1.1179	Fri Jul 13 11:14:14 2018
+++ src/distrib/sets/lists/base/mi	Tue Jul 17 18:55:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1179 2018/07/13 11:14:14 maxv Exp $
+# $NetBSD: mi,v 1.1180 2018/07/17 18:55:24 joerg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1067,7 +1067,8 @@
 ./usr/include/clang-3.6				base-obsolete		obsolete
 ./usr/include/clang-3.8				base-obsolete		obsolete
 ./usr/include/clang-4.0				base-obsolete		obsolete
-./usr/include/clang-5.0				base-c-usr
+./usr/include/clang-5.0				base-obsolete		obsolete
+./usr/include/clang-7.0				base-c-usr
 ./usr/include/compat				base-obsolete		obsolete
 ./usr/include/crypto				base-c-usr
 ./usr/include/dev				base-c-usr

Index: src/distrib/sets/lists/comp/ad.aarch64
diff -u src/distrib/sets/lists/comp/ad.aarch64:1.22 src/distrib/sets/lists/comp/ad.aarch64:1.23
--- src/distrib/sets/lists/comp/ad.aarch64:1.22	Tue Jul 17 18:27:31 2018
+++ src/distrib/sets/lists/comp/ad.aarch64	Tue Jul 17 18:55:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.22 2018/07/17 18:27:31 christos Exp $
+# $NetBSD: ad.aarch64,v 1.23 2018/07/17 18:55:24 joerg Exp $
 ./usr/include/aarch64				comp-c-include
 ./usr/include/aarch64/ansi.h			comp-c-include
 ./usr/include/aarch64/aout_machdep.h		comp-c-include
@@ -114,8 +114,11 @@
 ./usr/include/arm/vfpreg.h			comp-c-include
 ./usr/include/arm/vmparam.h			comp-c-include
 ./usr/include/arm/wchar_limits.h		comp-c-include
-./usr/include/clang-5.0/arm_acle.h		comp-c-include		llvm
-./usr/include/clang-5.0/arm_neon.h		comp-c-include		llvm
+./usr/include/clang-5.0/arm_acle.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/arm_neon.h		comp-obsolete		obsolete
+./usr/include/clang-7.0/arm64intr.h		comp-c-include		llvm
+./usr/include/clang-7.0/arm_acle.h		comp-c-include		llvm
+./usr/include/clang-7.0/arm_neon.h		comp-c-include		llvm
 ./usr/include/evbarm				comp-c-include
 ./usr/include/evbarm/disklabel.h		comp-c-include
 ./usr/include/evbarm/intr.h			comp-c-include

Index: src/distrib/sets/lists/comp/ad.arm
diff -u src/distrib/sets/lists/comp/ad.arm:1.86 src/distrib/sets/lists/comp/ad.arm:1.87
--- src/distrib/sets/lists/comp/ad.arm:1.86	Thu Jul 12 10:46:40 2018
+++ src/distrib/sets/lists/comp/ad.arm	Tue Jul 17 18:55:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.86 2018/07/12 10:46:40 maxv Exp $
+# $NetBSD: ad.arm,v 1.87 2018/07/17 18:55:24 joerg Exp $
 ./usr/include/acorn26				comp-obsolete		obsolete
 ./usr/include/acorn26/ansi.h			comp-obsolete		obsolete
 ./usr/include/acorn26/aout_machdep.h		comp-obsolete		obsolete
@@ -301,8 +301,10 @@
 ./usr/include/clang-3.8/arm_neon.h		comp-obsolete		obsolete
 ./usr/include/clang-4.0/arm_acle.h		comp-obsolete		obsolete
 ./usr/include/clang-4.0/arm_neon.h		comp-obsolete		obsolete
-./usr/include/clang-5.0/arm_acle.h		comp-c-include		llvm
-./usr/include/clang-5.0/arm_neon.h		comp-c-include		llvm
+./usr/include/clang-5.0/arm_acle.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/arm_neon.h		comp-obsolete		obsolete
+./usr/include/clang-7.0/arm_acle.h		comp-c-include		llvm
+./usr/include/clang-7.0/arm_neon.h		comp-c-include		llvm
 ./usr/include/epoc32				comp-c-include
 ./usr/include/epoc32/ansi.h			comp-obsolete		obsolete
 ./usr/include/epoc32/aout_machdep.h		comp-obsolete		obsolete

Index: src/distrib/sets/lists/comp/ad.mips
diff -u src/distrib/sets/lists/comp/ad.mips:1.74 src/distrib/sets/lists/comp/ad.mips:1.75
--- src/distrib/sets/lists/comp/ad.mips:1.74	Thu Jul 12 10:46:40 2018
+++ src/distrib/sets/lists/comp/ad.mips	Tue Jul 17 18:55:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.74 2018/07/12 10:46:40 maxv Exp $
+# $NetBSD: ad.mips,v 1.75 2018/07/17 18:55:24 joerg Exp $
 -./usr/lib/64/libgomp.a
 -./usr/lib/64/libgomp.so
 -./usr/lib/64/libgomp.so.1
@@ -8,7 +8,8 @@
 ./usr/bin/elf2aout				comp-obsolete		obsolete
 ./usr/bin/elf2ecoff				comp-sysutil-bin
 ./usr/include/clang-4.0/msa.h			comp-obsolete		obsolete
-./usr/include/clang-5.0/msa.h			comp-c-include		llvm
+./usr/include/clang-5.0/msa.h			comp-obsolete		obsolete
+./usr/include/clang-7.0/msa.h			comp-c-include		llvm
 ./usr/include/g++/bits/mips32			comp-c-include		compat,arch64
 ./usr/include/g++/bits/mips32/c++config.h	comp-c-include		compat,arch64,gcc
 ./usr/include/g++/bits/mips64			comp-c-include		compat,arch64

Index: src/distrib/sets/lists/comp/ad.powerpc
diff -u src/distrib/sets/lists/comp/ad.powerpc:1.91 src/distrib/sets/lists/comp/ad.powerpc:1.92
--- src/distrib/sets/lists/comp/ad.powerpc:1.91	Thu Jul 12 10:46:40 2018
+++ src/distrib/sets/lists/comp/ad.powerpc	Tue Jul 17 18:55:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc,v 1.91 2018/07/12 10:46:40 maxv Exp $
+# $NetBSD: ad.powerpc,v 1.92 2018/07/17 18:55:24 joerg Exp $
 ./usr/bin/elf2aout				comp-sysutil-bin
 ./usr/bin/psim					comp-debug-bin		gdb
 ./usr/include/altivec.h				comp-obsolete		obsolete
@@ -11,9 +11,12 @@
 ./usr/include/clang-4.0/altivec.h		comp-obsolete		obsolete
 ./usr/include/clang-4.0/htmintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-4.0/htmxlintrin.h		comp-obsolete		obsolete
-./usr/include/clang-5.0/altivec.h		comp-c-include		llvm
-./usr/include/clang-5.0/htmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/htmxlintrin.h		comp-c-include		llvm
+./usr/include/clang-5.0/altivec.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/htmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/htmxlintrin.h		comp-obsolete		obsolete
+./usr/include/clang-7.0/altivec.h		comp-c-include		llvm
+./usr/include/clang-7.0/htmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/htmxlintrin.h		comp-c-include		llvm
 ./usr/include/g++/bits/powerpc			comp-c-include		compat
 ./usr/include/g++/bits/powerpc/c++config.h	comp-c-include		compat,gcc
 ./usr/include/g++/bits/powerpc64		comp-c-include		compat

Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.258 src/distrib/sets/lists/comp/md.amd64:1.259
--- src/distrib/sets/lists/comp/md.amd64:1.258	Thu Jul 12 10:46:40 2018
+++ src/distrib/sets/lists/comp/md.amd64	Tue Jul 17 18:55:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.258 2018/07/12 10:46:40 maxv Exp $
+# $NetBSD: md.amd64,v 1.259 2018/07/17 18:55:24 joerg Exp $
 
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
@@ -274,65 +274,144 @@
 ./usr/include/clang-4.0/xsaveoptintrin.h	comp-obsolete		obsolete
 ./usr/include/clang-4.0/xsavesintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-4.0/xtestintrin.h		comp-obsolete		obsolete
-./usr/include/clang-5.0/__wmmintrin_aes.h	comp-c-include		llvm
-./usr/include/clang-5.0/__wmmintrin_pclmul.h	comp-c-include		llvm
-./usr/include/clang-5.0/adxintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/ammintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/avx2intrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/avx512bwintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512cdintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512dqintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512erintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512fintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/avx512ifmaintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512ifmavlintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512pfintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512vbmiintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512vbmivlintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512vlbwintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512vlcdintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512vldqintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512vlintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512vpopcntdqintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avxintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/bmi2intrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/bmiintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/clflushoptintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/clzerointrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/cpuid.h			comp-c-include		llvm
-./usr/include/clang-5.0/emmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/f16cintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/fma4intrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/fmaintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/fxsrintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/ia32intrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/immintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/lzcntintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/lwpintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/mm3dnow.h		comp-c-include		llvm
-./usr/include/clang-5.0/mm_malloc.h		comp-c-include		llvm
-./usr/include/clang-5.0/mmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/mwaitxintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/nmmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/pkuintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/pmmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/popcntintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/prfchwintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/rdseedintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/rtmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/shaintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/smmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/tbmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/tmmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/wmmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/x86intrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/xmmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/xopintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/xsavecintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/xsaveintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/xsaveoptintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/xsavesintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/xtestintrin.h		comp-c-include		llvm
+./usr/include/clang-5.0/__wmmintrin_aes.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/__wmmintrin_pclmul.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/adxintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/ammintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/avx2intrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512bwintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512cdintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512dqintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512erintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512fintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512ifmaintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512ifmavlintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512pfintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512vbmiintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512vbmivlintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512vlbwintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512vlcdintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512vldqintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512vlintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512vpopcntdqintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avxintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/bmi2intrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/bmiintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/clflushoptintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/clzerointrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/cpuid.h			comp-obsolete		obsolete
+./usr/include/clang-5.0/emmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/f16cintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/fma4intrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/fmaintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/fxsrintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/ia32intrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/immintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/lwpintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/lzcntintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/mm3dnow.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/mm_malloc.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/mmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/mwaitxintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/nmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/pkuintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/pmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/popcntintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/prfchwintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/rdseedintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/rtmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/shaintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/smmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/tbmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/tmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/wmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/x86intrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/xmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/xopintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/xsavecintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/xsaveintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/xsaveoptintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/xsavesintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/xtestintrin.h		comp-obsolete		obsolete
+./usr/include/clang-7.0/adxintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/ammintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/avx2intrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/avx512bitalgintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512bwintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512cdintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512dqintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512erintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512fintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/avx512ifmaintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512ifmavlintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512pfintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vbmi2intrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vbmiintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vbmivlintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vlbitalgintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vlbwintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vlcdintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vldqintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vlintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vlvbmi2intrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vlvnniintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vnniintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vpopcntdqintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vpopcntdqvlintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avxintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/bmi2intrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/bmiintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/cetintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/cldemoteintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/clflushoptintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/clwbintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/clzerointrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/cpuid.h			comp-c-include		llvm
+./usr/include/clang-7.0/emmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/f16cintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/fma4intrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/fmaintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/fxsrintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/gfniintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/ia32intrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/immintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/invpcidintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/lwpintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/lzcntintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/mm3dnow.h		comp-c-include		llvm
+./usr/include/clang-7.0/mmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/mm_malloc.h		comp-c-include		llvm
+./usr/include/clang-7.0/movdirintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/mwaitxintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/nmmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/pconfigintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/pkuintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/pmmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/popcntintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/prfchwintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/ptwriteintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/rdseedintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/rtmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/sgxintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/shaintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/smmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/tbmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/tmmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/vaesintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/vpclmulqdqintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/waitpkgintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/wbnoinvdintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/__wmmintrin_aes.h	comp-c-include		llvm
+./usr/include/clang-7.0/wmmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/__wmmintrin_pclmul.h	comp-c-include		llvm
+./usr/include/clang-7.0/x86intrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/xmmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/xopintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/xsavecintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/xsaveintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/xsaveoptintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/xsavesintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/xtestintrin.h		comp-c-include		llvm
 ./usr/include/emmintrin.h			comp-obsolete		obsolete
 ./usr/include/g++/bits/i386			comp-c-include		compat
 ./usr/include/g++/bits/i386/c++config.h		comp-c-include		gcccmds,gcc,compat

Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.181 src/distrib/sets/lists/comp/md.i386:1.182
--- src/distrib/sets/lists/comp/md.i386:1.181	Thu Jul 12 10:46:40 2018
+++ src/distrib/sets/lists/comp/md.i386	Tue Jul 17 18:55:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.181 2018/07/12 10:46:40 maxv Exp $
+# $NetBSD: md.i386,v 1.182 2018/07/17 18:55:24 joerg Exp $
 ./usr/include/clang-3.4/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/ammintrin.h		comp-obsolete		obsolete
@@ -202,65 +202,144 @@
 ./usr/include/clang-4.0/xsaveoptintrin.h	comp-obsolete		obsolete
 ./usr/include/clang-4.0/xsavesintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-4.0/xtestintrin.h		comp-obsolete		obsolete
-./usr/include/clang-5.0/__wmmintrin_aes.h	comp-c-include		llvm
-./usr/include/clang-5.0/__wmmintrin_pclmul.h	comp-c-include		llvm
-./usr/include/clang-5.0/adxintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/ammintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/avx2intrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/avx512bwintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512cdintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512dqintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512erintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512fintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/avx512ifmaintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512ifmavlintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512pfintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512vbmiintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512vbmivlintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512vlbwintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512vlcdintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512vldqintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512vlintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avx512vpopcntdqintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/avxintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/bmi2intrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/bmiintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/clflushoptintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/clzerointrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/cpuid.h			comp-c-include		llvm
-./usr/include/clang-5.0/emmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/f16cintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/fma4intrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/fmaintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/fxsrintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/ia32intrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/immintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/lwpintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/lzcntintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/mm3dnow.h		comp-c-include		llvm
-./usr/include/clang-5.0/mm_malloc.h		comp-c-include		llvm
-./usr/include/clang-5.0/mmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/mwaitxintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/nmmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/pkuintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/pmmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/popcntintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/prfchwintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/rdseedintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/rtmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/shaintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/smmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/tbmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/tmmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/wmmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/x86intrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/xmmintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/xopintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/xsavecintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/xsaveintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/xsaveoptintrin.h	comp-c-include		llvm
-./usr/include/clang-5.0/xsavesintrin.h		comp-c-include		llvm
-./usr/include/clang-5.0/xtestintrin.h		comp-c-include		llvm
+./usr/include/clang-5.0/__wmmintrin_aes.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/__wmmintrin_pclmul.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/adxintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/ammintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/avx2intrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512bwintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512cdintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512dqintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512erintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512fintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512ifmaintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512ifmavlintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512pfintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512vbmiintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512vbmivlintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512vlbwintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512vlcdintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512vldqintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512vlintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avx512vpopcntdqintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/avxintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/bmi2intrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/bmiintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/clflushoptintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/clzerointrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/cpuid.h			comp-obsolete		obsolete
+./usr/include/clang-5.0/emmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/f16cintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/fma4intrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/fmaintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/fxsrintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/ia32intrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/immintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/lwpintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/lzcntintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/mm3dnow.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/mm_malloc.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/mmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/mwaitxintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/nmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/pkuintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/pmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/popcntintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/prfchwintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/rdseedintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/rtmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/shaintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/smmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/tbmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/tmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/wmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/x86intrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/xmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/xopintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/xsavecintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/xsaveintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/xsaveoptintrin.h	comp-obsolete		obsolete
+./usr/include/clang-5.0/xsavesintrin.h		comp-obsolete		obsolete
+./usr/include/clang-5.0/xtestintrin.h		comp-obsolete		obsolete
+./usr/include/clang-7.0/adxintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/ammintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/avx2intrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/avx512bitalgintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512bwintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512cdintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512dqintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512erintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512fintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/avx512ifmaintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512ifmavlintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512pfintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vbmi2intrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vbmiintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vbmivlintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vlbitalgintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vlbwintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vlcdintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vldqintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vlintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vlvbmi2intrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vlvnniintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vnniintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vpopcntdqintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avx512vpopcntdqvlintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/avxintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/bmi2intrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/bmiintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/cetintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/cldemoteintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/clflushoptintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/clwbintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/clzerointrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/cpuid.h			comp-c-include		llvm
+./usr/include/clang-7.0/emmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/f16cintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/fma4intrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/fmaintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/fxsrintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/gfniintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/ia32intrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/immintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/invpcidintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/lwpintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/lzcntintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/mm3dnow.h		comp-c-include		llvm
+./usr/include/clang-7.0/mmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/mm_malloc.h		comp-c-include		llvm
+./usr/include/clang-7.0/movdirintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/mwaitxintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/nmmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/pconfigintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/pkuintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/pmmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/popcntintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/prfchwintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/ptwriteintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/rdseedintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/rtmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/sgxintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/shaintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/smmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/tbmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/tmmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/vaesintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/vpclmulqdqintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/waitpkgintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/wbnoinvdintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/__wmmintrin_aes.h	comp-c-include		llvm
+./usr/include/clang-7.0/wmmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/__wmmintrin_pclmul.h	comp-c-include		llvm
+./usr/include/clang-7.0/x86intrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/xmmintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/xopintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/xsavecintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/xsaveintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/xsaveoptintrin.h	comp-c-include		llvm
+./usr/include/clang-7.0/xsavesintrin.h		comp-c-include		llvm
+./usr/include/clang-7.0/xtestintrin.h		comp-c-include		llvm
 ./usr/include/emmintrin.h			comp-obsolete		obsolete
 ./usr/include/gcc-4.1/emmintrin.h		comp-obsolete		obsolete
 ./usr/include/gcc-4.1/mm_malloc.h		comp-obsolete		obsolete

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2211 src/distrib/sets/lists/comp/mi:1.2212
--- src/distrib/sets/lists/comp/mi:1.2211	Sun Jul 15 05:16:40 2018
+++ src/distrib/sets/lists/comp/mi	Tue Jul 17 18:55:24 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2211 2018/07/15 05:16:40 maxv Exp $
+#	$NetBSD: mi,v 1.2212 2018/07/17 18:55:24 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -363,7 +363,8 @@
 ./usr/include/clang-4.0/stdalign.h		comp-obsolete		obsolete
 ./usr/include/clang-4.0/stdatomic.h		comp-obsolete		obsolete
 ./usr/include/clang-4.0/stdnoreturn.h		comp-obsolete		obsolete
-./usr/include/clang-5.0/stdatomic.h		comp-c-include		llvm
+./usr/include/clang-5.0/stdatomic.h		comp-obsolete		obsolete
+./usr/include/clang-7.0/stdatomic.h		comp-c-include		llvm
 ./usr/include/complex.h				comp-c-include
 ./usr/include/cpio.h				comp-c-include
 ./usr/include/crypto/cryptodev.h		comp-c-include

Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.170 src/etc/mtree/NetBSD.dist.base:1.171
--- src/etc/mtree/NetBSD.dist.base:1.170	Thu Mar 29 04:19:55 2018
+++ src/etc/mtree/NetBSD.dist.base	Tue Jul 17 18:55:24 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.170 2018/03/29 04:19:55 snj Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.171 2018/07/17 18:55:24 joerg Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -107,7 +107,7 @@
 ./usr/include/c++
 ./usr/include/c++/experimental
 ./usr/include/c++/ext
-./usr/include/clang-5.0
+./usr/include/clang-7.0
 ./usr/include/crypto
 ./usr/include/dev
 ./usr/include/dev/apm

Index: src/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.85 src/external/bsd/llvm/Makefile.inc:1.86
--- src/external/bsd/llvm/Makefile.inc:1.85	Sun Dec 17 21:16:33 2017
+++ src/external/bsd/llvm/Makefile.inc	Tue Jul 17 18:55:24 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.85 2017/12/17 21:16:33 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.86 2018/07/17 18:55:24 joerg Exp $
 
 .if !defined(LLVM_TOPLEVEL_MK)
 LLVM_TOPLEVEL_MK=
@@ -6,9 +6,9 @@ LLVM_TOPLEVEL_MK=
 .include <bsd.own.mk>
 
 SVN_ROOT=		http://llvm.org/svn/llvm-project
-SVN_BRANCH=		branches/release_50
+SVN_BRANCH=		trunk
 
-COMMON_REVISION=	r319952
+COMMON_REVISION=	r337282
 CLANG_REVISION=		${COMMON_REVISION}
 LLD_REVISION=		${COMMON_REVISION}
 LLDB_REVISION=		${COMMON_REVISION}
@@ -17,9 +17,9 @@ LLVM_REVISION=		${COMMON_REVISION}
 MCLINKER_REVISION=	deeb2a77b4165827316f88e0a7ba4ba6b743a080
 MCLINKER_ROOT=		https://code.google.com/p/mclinker/
 
-LLVM_VERSION=		5.0.1
-CLANG_VERSION=		5.0.1
-LLD_VERSION=		5.0.1
+LLVM_VERSION=		7.0.0
+CLANG_VERSION=		7.0.0
+LLD_VERSION=		7.0.0
 
 CLANG_SRCDIR:=	${.PARSEDIR}/dist/clang
 LLD_SRCDIR:=	${.PARSEDIR}/dist/lld
@@ -34,7 +34,9 @@ CPPFLAGS+=	-I. -I${CLANG_SRCDIR}/include
 		-I${LLDB_SRCDIR}/include \
 		-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS \
 		-D__STDC_FORMAT_MACROS -DCLANG_ENABLE_STATIC_ANALYZER \
-		-DLLVM_BUILD_GLOBAL_ISEL
+		-DENABLE_EXPERIMENTAL_NEW_PASS_MANAGER=false \
+		-DCLANG_OPENMP_NVPTX_DEFAULT_ARCH=\"sm_35\" \
+		-DCLANG_DEFAULT_OBJCOPY=\"objcopy\"
 
 .if defined(HOSTLIB) || defined(HOSTPROG)
 LLVM_INCLUDE_CONFIG=	${LLVM_TOOLCONF_OBJDIR}/config/include

Index: src/external/bsd/llvm/bin/bugpoint/Makefile
diff -u src/external/bsd/llvm/bin/bugpoint/Makefile:1.11 src/external/bsd/llvm/bin/bugpoint/Makefile:1.12
--- src/external/bsd/llvm/bin/bugpoint/Makefile:1.11	Tue Aug  1 20:07:37 2017
+++ src/external/bsd/llvm/bin/bugpoint/Makefile	Tue Jul 17 18:55:25 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2017/08/01 20:07:37 joerg Exp $
+#	$NetBSD: Makefile,v 1.12 2018/07/17 18:55:25 joerg Exp $
 
 PROG_CXX=	bugpoint
 NOMAN=		yes
@@ -18,6 +18,7 @@ SRCS=	BugDriver.cpp \
 	bugpoint.cpp
 
 LLVM_LIBS+= \
+	TransformsAggressiveInstCombine \
 	ObjCARC \
 	ipo \
 	IRReader \
@@ -35,6 +36,7 @@ LLVM_LIBS+= \
 	ARMMCTargetDesc \
 	ARMAsmParser \
 	ARMAsmPrinter \
+	ARMUtils \
 	MipsCodeGen \
 	MipsTargetInfo \
 	MipsAsmPrinter \

Index: src/external/bsd/llvm/bin/clang/Makefile
diff -u src/external/bsd/llvm/bin/clang/Makefile:1.36 src/external/bsd/llvm/bin/clang/Makefile:1.37
--- src/external/bsd/llvm/bin/clang/Makefile:1.36	Tue Aug  1 20:07:37 2017
+++ src/external/bsd/llvm/bin/clang/Makefile	Tue Jul 17 18:55:25 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.36 2017/08/01 20:07:37 joerg Exp $
+#	$NetBSD: Makefile,v 1.37 2018/07/17 18:55:25 joerg Exp $
 
 PROG_CXX=	clang
 NOMAN=		yes
@@ -14,7 +14,8 @@ SYMLINKS+=	clang ${BINDIR}/clang-cpp
 
 SRCS=	driver.cpp \
 	cc1_main.cpp \
-	cc1as_main.cpp
+	cc1as_main.cpp \
+	cc1gen_reproducer_main.cpp
 
 CLANG_LIBS+= \
 	clangFrontendTool \
@@ -23,25 +24,30 @@ CLANG_LIBS+= \
 	clangStaticAnalyzerFrontend \
 	clangStaticAnalyzerCheckers \
 	clangStaticAnalyzerCore \
+	clangCrossTU \
+	clangIndex \
 	clangASTMatchers \
-	clangDriver \
-	clangSerialization \
 	clangCodeGen \
+	clangFrontendRewrite \
+	clangFrontend \
+	clangSerialization \
 	clangParse \
 	clangSema \
-	clangEdit \
 	clangAnalysis \
-	clangFrontendRewrite \
+	clangEdit \
+	clangDriver \
 	clangRewrite \
 	clangAST \
 	clangLex \
 	clangBasic
 
 LLVM_LIBS+= \
+	TransformsAggressiveInstCombine \
 	TransformsCoroutines \
 	ProfileDataCoverage \
 	LTO \
 	ObjCARC \
+	Passes \
 	ipo \
 	IRReader \
 	AsmParser \
@@ -58,6 +64,7 @@ LLVM_LIBS+= \
 	ARMMCTargetDesc \
 	ARMAsmParser \
 	ARMAsmPrinter \
+	ARMUtils \
 	MipsCodeGen \
 	MipsTargetInfo \
 	MipsAsmPrinter \
@@ -84,7 +91,6 @@ LLVM_LIBS+= \
 	AsmPrinter \
 	DebugInfoCodeView \
 	DebugInfoMSF \
-	Passes \
 	CodeGen \
 	Vectorize \
 	Target \

Index: src/external/bsd/llvm/bin/clang-format/Makefile
diff -u src/external/bsd/llvm/bin/clang-format/Makefile:1.5 src/external/bsd/llvm/bin/clang-format/Makefile:1.6
--- src/external/bsd/llvm/bin/clang-format/Makefile:1.5	Wed Jan 11 12:02:25 2017
+++ src/external/bsd/llvm/bin/clang-format/Makefile	Tue Jul 17 18:55:25 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2017/01/11 12:02:25 joerg Exp $
+#	$NetBSD: Makefile,v 1.6 2018/07/17 18:55:25 joerg Exp $
 
 PROG_CXX=	clang-format
 NOMAN=		yes
@@ -12,6 +12,7 @@ SRCS=	ClangFormat.cpp
 CLANG_LIBS+= \
 	clangFormat \
 	clangToolingCore \
+	clangToolingInclusions \
 	clangTooling \
 	clangFrontend \
 	clangSerialization \

Index: src/external/bsd/llvm/bin/clang-tblgen/Makefile
diff -u src/external/bsd/llvm/bin/clang-tblgen/Makefile:1.6 src/external/bsd/llvm/bin/clang-tblgen/Makefile:1.7
--- src/external/bsd/llvm/bin/clang-tblgen/Makefile:1.6	Tue Aug  1 20:07:37 2017
+++ src/external/bsd/llvm/bin/clang-tblgen/Makefile	Tue Jul 17 18:55:25 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2017/08/01 20:07:37 joerg Exp $
+#	$NetBSD: Makefile,v 1.7 2018/07/17 18:55:25 joerg Exp $
 
 PROG_CXX=	clang-tblgen
 NOMAN=		yes
@@ -12,6 +12,7 @@ SRCS=	ClangASTNodesEmitter.cpp \
 	ClangCommentCommandInfoEmitter.cpp \
 	ClangCommentHTMLNamedCharacterReferenceEmitter.cpp \
 	ClangCommentHTMLTagsEmitter.cpp \
+	ClangDataCollectorsEmitter.cpp \
 	ClangDiagnosticsEmitter.cpp \
 	ClangOptionDocEmitter.cpp \
 	ClangSACheckersEmitter.cpp \

Index: src/external/bsd/llvm/bin/llc/Makefile
diff -u src/external/bsd/llvm/bin/llc/Makefile:1.24 src/external/bsd/llvm/bin/llc/Makefile:1.25
--- src/external/bsd/llvm/bin/llc/Makefile:1.24	Tue Aug  1 20:07:37 2017
+++ src/external/bsd/llvm/bin/llc/Makefile	Tue Jul 17 18:55:25 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2017/08/01 20:07:37 joerg Exp $
+#	$NetBSD: Makefile,v 1.25 2018/07/17 18:55:25 joerg Exp $
 
 PROG_CXX=	llc
 NOMAN=		yes
@@ -29,6 +29,7 @@ LLVM_LIBS+= \
 	ARMMCTargetDesc \
 	ARMAsmParser \
 	ARMAsmPrinter \
+	ARMUtils \
 	MipsCodeGen \
 	MipsTargetInfo \
 	MipsAsmParser \

Index: src/external/bsd/llvm/bin/lldb/Makefile
diff -u src/external/bsd/llvm/bin/lldb/Makefile:1.6 src/external/bsd/llvm/bin/lldb/Makefile:1.7
--- src/external/bsd/llvm/bin/lldb/Makefile:1.6	Wed Jan 11 12:02:25 2017
+++ src/external/bsd/llvm/bin/lldb/Makefile	Tue Jul 17 18:55:25 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2017/01/11 12:02:25 joerg Exp $
+#	$NetBSD: Makefile,v 1.7 2018/07/17 18:55:25 joerg Exp $
 
 PROG_CXX=	lldb
 NOMAN=		yes
@@ -105,6 +105,7 @@ LLVM_LIBS+= \
 	ARMMCTargetDesc \
 	ARMAsmPrinter \
 	ARMDisassembler \
+	ARMUtils \
 	MipsCodeGen \
 	MipsTargetInfo \
 	MipsAsmParser \

Index: src/external/bsd/llvm/bin/lli/Makefile
diff -u src/external/bsd/llvm/bin/lli/Makefile:1.16 src/external/bsd/llvm/bin/lli/Makefile:1.17
--- src/external/bsd/llvm/bin/lli/Makefile:1.16	Tue Aug  1 20:07:37 2017
+++ src/external/bsd/llvm/bin/lli/Makefile	Tue Jul 17 18:55:25 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2017/08/01 20:07:37 joerg Exp $
+#	$NetBSD: Makefile,v 1.17 2018/07/17 18:55:25 joerg Exp $
 
 PROG_CXX=	lli
 NOMAN=		yes
@@ -7,8 +7,7 @@ NOMAN=		yes
 
 .PATH: ${LLVM_SRCDIR}/tools/lli
 
-SRCS=	lli.cpp \
-	OrcLazyJIT.cpp
+SRCS=	lli.cpp
 
 LLVM_LIBS+= \
 	Orc \
@@ -22,6 +21,7 @@ LLVM_LIBS+= \
 	AsmParser \
 	Object \
 	MCParser \
+	BitWriter \
 	BitReader \
 	MCJIT \
 	RuntimeDyld \

Index: src/external/bsd/llvm/bin/llvm-ar/Makefile
diff -u src/external/bsd/llvm/bin/llvm-ar/Makefile:1.10 src/external/bsd/llvm/bin/llvm-ar/Makefile:1.11
--- src/external/bsd/llvm/bin/llvm-ar/Makefile:1.10	Tue Aug  1 21:40:03 2017
+++ src/external/bsd/llvm/bin/llvm-ar/Makefile	Tue Jul 17 18:55:25 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2017/08/01 21:40:03 joerg Exp $
+#	$NetBSD: Makefile,v 1.11 2018/07/17 18:55:25 joerg Exp $
 
 PROG_CXX=	llvm-ar
 NOMAN=		yes
@@ -21,6 +21,7 @@ LLVM_LIBS+= \
 	ARMMCTargetDesc \
 	ARMAsmPrinter \
 	ARMTargetInfo \
+	ARMUtils \
 	MipsAsmParser \
 	MipsMCTargetDesc \
 	MipsAsmPrinter \

Index: src/external/bsd/llvm/bin/llvm-as/Makefile
diff -u src/external/bsd/llvm/bin/llvm-as/Makefile:1.4 src/external/bsd/llvm/bin/llvm-as/Makefile:1.5
--- src/external/bsd/llvm/bin/llvm-as/Makefile:1.4	Tue Aug  1 20:07:38 2017
+++ src/external/bsd/llvm/bin/llvm-as/Makefile	Tue Jul 17 18:55:25 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2017/08/01 20:07:38 joerg Exp $
+#	$NetBSD: Makefile,v 1.5 2018/07/17 18:55:25 joerg Exp $
 
 PROG_CXX=	llvm-as
 NOMAN=		yes
@@ -12,6 +12,7 @@ SRCS=	llvm-as.cpp
 LLVM_LIBS+= \
 	AsmParser \
 	BitWriter \
+	Analysis \
 	Object \
 	MCParser \
 	MC \

Index: src/external/bsd/llvm/bin/llvm-dwarfdump/Makefile
diff -u src/external/bsd/llvm/bin/llvm-dwarfdump/Makefile:1.5 src/external/bsd/llvm/bin/llvm-dwarfdump/Makefile:1.6
--- src/external/bsd/llvm/bin/llvm-dwarfdump/Makefile:1.5	Tue Aug  1 20:07:38 2017
+++ src/external/bsd/llvm/bin/llvm-dwarfdump/Makefile	Tue Jul 17 18:55:25 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2017/08/01 20:07:38 joerg Exp $
+#	$NetBSD: Makefile,v 1.6 2018/07/17 18:55:25 joerg Exp $
 
 PROG_CXX=	llvm-dwarfdump
 NOMAN=		yes
@@ -7,16 +7,39 @@ NOMAN=		yes
 
 .PATH: ${LLVM_SRCDIR}/tools/llvm-dwarfdump
 
-SRCS=	llvm-dwarfdump.cpp
+SRCS=	Statistics.cpp \
+	llvm-dwarfdump.cpp
 
 LLVM_LIBS+= \
+	AArch64TargetInfo \
+	AArch64MCTargetDesc \
+	AArch64AsmPrinter \
+	AArch64Utils \
+	ARMTargetInfo \
+	ARMMCTargetDesc \
+	ARMAsmPrinter \
+	ARMUtils \
+	MipsTargetInfo \
+	MipsMCTargetDesc \
+	MipsAsmPrinter \
+	PowerPCTargetInfo \
+	PowerPCMCTargetDesc \
+	PowerPCAsmPrinter \
+	SparcTargetInfo \
+	SparcMCTargetDesc \
+	SparcAsmPrinter \
+	X86TargetInfo \
+	X86MCTargetDesc \
+	X86AsmPrinter \
+	X86Utils \
 	DebugInfoDWARF \
 	Object \
 	BitReader \
 	IR \
 	BinaryFormat \
-	MC \
+	MCDisassembler \
 	MCParser \
+	MC \
 	Support \
 	Demangle
 

Index: src/external/bsd/llvm/bin/llvm-dwp/Makefile
diff -u src/external/bsd/llvm/bin/llvm-dwp/Makefile:1.3 src/external/bsd/llvm/bin/llvm-dwp/Makefile:1.4
--- src/external/bsd/llvm/bin/llvm-dwp/Makefile:1.3	Tue Aug  1 20:07:38 2017
+++ src/external/bsd/llvm/bin/llvm-dwp/Makefile	Tue Jul 17 18:55:25 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2017/08/01 20:07:38 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2018/07/17 18:55:25 joerg Exp $
 
 PROG_CXX=	llvm-dwp
 NOMAN=		yes
@@ -21,6 +21,7 @@ LLVM_LIBS+= \
 	ARMTargetInfo \
 	ARMMCTargetDesc \
 	ARMAsmPrinter \
+	ARMUtils \
 	MipsCodeGen \
 	MipsTargetInfo \
 	MipsMCTargetDesc \

Index: src/external/bsd/llvm/bin/llvm-mc/Makefile
diff -u src/external/bsd/llvm/bin/llvm-mc/Makefile:1.22 src/external/bsd/llvm/bin/llvm-mc/Makefile:1.23
--- src/external/bsd/llvm/bin/llvm-mc/Makefile:1.22	Wed Jan 11 12:02:26 2017
+++ src/external/bsd/llvm/bin/llvm-mc/Makefile	Tue Jul 17 18:55:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 2017/01/11 12:02:26 joerg Exp $
+#	$NetBSD: Makefile,v 1.23 2018/07/17 18:55:26 joerg Exp $
 
 PROG_CXX=	llvm-mc
 NOMAN=		yes
@@ -25,6 +25,7 @@ LLVM_LIBS+= \
 	ARMMCTargetDesc \
 	ARMAsmPrinter \
 	ARMDisassembler \
+	ARMUtils \
 	MipsCodeGen \
 	MipsTargetInfo \
 	MipsAsmParser \
@@ -61,6 +62,7 @@ LLVM_LIBS+= \
 	AsmPrinter \
 	MCParser \
 	MC \
+	BinaryFormat \
 	IR \
 	Support \
 	Demangle

Index: src/external/bsd/llvm/bin/llvm-nm/Makefile
diff -u src/external/bsd/llvm/bin/llvm-nm/Makefile:1.7 src/external/bsd/llvm/bin/llvm-nm/Makefile:1.8
--- src/external/bsd/llvm/bin/llvm-nm/Makefile:1.7	Tue Aug  1 20:07:38 2017
+++ src/external/bsd/llvm/bin/llvm-nm/Makefile	Tue Jul 17 18:55:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2017/08/01 20:07:38 joerg Exp $
+#	$NetBSD: Makefile,v 1.8 2018/07/17 18:55:26 joerg Exp $
 
 PROG_CXX=	llvm-nm
 NOMAN=		yes
@@ -19,6 +19,7 @@ LLVM_LIBS+= \
 	ARMMCTargetDesc \
 	ARMAsmPrinter \
 	ARMTargetInfo \
+	ARMUtils \
 	MipsAsmParser \
 	MipsMCTargetDesc \
 	MipsAsmPrinter \

Index: src/external/bsd/llvm/bin/llvm-objdump/Makefile
diff -u src/external/bsd/llvm/bin/llvm-objdump/Makefile:1.14 src/external/bsd/llvm/bin/llvm-objdump/Makefile:1.15
--- src/external/bsd/llvm/bin/llvm-objdump/Makefile:1.14	Tue Aug  1 20:07:38 2017
+++ src/external/bsd/llvm/bin/llvm-objdump/Makefile	Tue Jul 17 18:55:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2017/08/01 20:07:38 joerg Exp $
+#	$NetBSD: Makefile,v 1.15 2018/07/17 18:55:26 joerg Exp $
 
 PROG_CXX=	llvm-objdump
 NOMAN=		yes
@@ -25,6 +25,7 @@ LLVM_LIBS+= \
 	ARMMCTargetDesc \
 	ARMAsmPrinter \
 	ARMTargetInfo \
+	ARMUtils \
 	MipsDisassembler \
 	MipsAsmParser \
 	MipsMCTargetDesc \

Index: src/external/bsd/llvm/bin/llvm-readobj/Makefile
diff -u src/external/bsd/llvm/bin/llvm-readobj/Makefile:1.11 src/external/bsd/llvm/bin/llvm-readobj/Makefile:1.12
--- src/external/bsd/llvm/bin/llvm-readobj/Makefile:1.11	Tue Aug  1 20:07:39 2017
+++ src/external/bsd/llvm/bin/llvm-readobj/Makefile	Tue Jul 17 18:55:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2017/08/01 20:07:39 joerg Exp $
+#	$NetBSD: Makefile,v 1.12 2018/07/17 18:55:26 joerg Exp $
 
 PROG_CXX=	llvm-readobj
 NOMAN=		yes
@@ -16,9 +16,11 @@ SRCS=	llvm-readobj.cpp \
 	MachODumper.cpp \
 	ObjDumper.cpp \
 	WasmDumper.cpp \
-	Win64EHDumper.cpp
+	Win64EHDumper.cpp \
+	WindowsResourceDumper.cpp
 
 LLVM_LIBS+= \
+	DebugInfoDWARF \
 	AArch64TargetInfo \
 	ARMTargetInfo \
 	MipsTargetInfo \
@@ -28,8 +30,8 @@ LLVM_LIBS+= \
 	DebugInfoCodeView \
 	DebugInfoMSF \
 	Object \
-	MC \
 	MCParser \
+	MC \
 	BitReader \
 	IR \
 	BinaryFormat \

Index: src/external/bsd/llvm/bin/llvm-xray/Makefile
diff -u src/external/bsd/llvm/bin/llvm-xray/Makefile:1.2 src/external/bsd/llvm/bin/llvm-xray/Makefile:1.3
--- src/external/bsd/llvm/bin/llvm-xray/Makefile:1.2	Tue Aug  1 20:07:39 2017
+++ src/external/bsd/llvm/bin/llvm-xray/Makefile	Tue Jul 17 18:55:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2017/08/01 20:07:39 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2018/07/17 18:55:26 joerg Exp $
 
 PROG_CXX=	llvm-xray
 NOMAN=		yes
@@ -7,15 +7,16 @@ NOMAN=		yes
 
 .PATH: ${LLVM_SRCDIR}/tools/llvm-xray
 
-SRCS=	func-id-helper.cc \
-	llvm-xray.cc \
-	xray-account.cc \
-	xray-color-helper.cc \
-	xray-converter.cc \
-	xray-extract.cc \
-	xray-graph.cc \
-	xray-graph-diff.cc \
-	xray-registry.cc
+SRCS=	func-id-helper.cpp \
+	llvm-xray.cpp \
+	xray-account.cpp \
+	xray-color-helper.cpp \
+	xray-converter.cpp \
+	xray-extract.cpp \
+	xray-graph-diff.cpp \
+	xray-graph.cpp \
+	xray-registry.cpp \
+	xray-stacks.cpp
 
 LLVM_LIBS+= \
 	XRay \

Index: src/external/bsd/llvm/bin/opt/Makefile
diff -u src/external/bsd/llvm/bin/opt/Makefile:1.18 src/external/bsd/llvm/bin/opt/Makefile:1.19
--- src/external/bsd/llvm/bin/opt/Makefile:1.18	Tue Aug  1 20:07:39 2017
+++ src/external/bsd/llvm/bin/opt/Makefile	Tue Jul 17 18:55:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2017/08/01 20:07:39 joerg Exp $
+#	$NetBSD: Makefile,v 1.19 2018/07/17 18:55:26 joerg Exp $
 
 PROG_CXX=	opt
 NOMAN=		yes
@@ -9,6 +9,7 @@ NOMAN=		yes
 
 SRCS=	AnalysisWrappers.cpp \
 	BreakpointPrinter.cpp \
+	Debugify.cpp \
 	GraphPrinters.cpp \
 	NewPMDriver.cpp \
 	PassPrinters.cpp \
@@ -16,6 +17,7 @@ SRCS=	AnalysisWrappers.cpp \
 	opt.cpp
 
 LLVM_LIBS+= \
+	TransformsAggressiveInstCombine \
 	Passes \
 	ObjCARC \
 	ipo \
@@ -36,6 +38,7 @@ LLVM_LIBS+= \
 	ARMAsmParser \
 	ARMMCTargetDesc \
 	ARMAsmPrinter \
+	ARMUtils \
 	MipsCodeGen \
 	MipsTargetInfo \
 	MipsAsmParser \

Index: src/external/bsd/llvm/bin/sancov/Makefile
diff -u src/external/bsd/llvm/bin/sancov/Makefile:1.3 src/external/bsd/llvm/bin/sancov/Makefile:1.4
--- src/external/bsd/llvm/bin/sancov/Makefile:1.3	Tue Aug  1 20:07:39 2017
+++ src/external/bsd/llvm/bin/sancov/Makefile	Tue Jul 17 18:55:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2017/08/01 20:07:39 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2018/07/17 18:55:26 joerg Exp $
 
 PROG_CXX=	sancov
 NOMAN=		yes
@@ -19,6 +19,7 @@ LLVM_LIBS+= \
 	ARMMCTargetDesc \
 	ARMAsmPrinter \
 	ARMTargetInfo \
+	ARMUtils \
 	MipsDisassembler \
 	MipsMCTargetDesc \
 	MipsAsmPrinter \

Index: src/external/bsd/llvm/bin/tblgen/Makefile
diff -u src/external/bsd/llvm/bin/tblgen/Makefile:1.22 src/external/bsd/llvm/bin/tblgen/Makefile:1.23
--- src/external/bsd/llvm/bin/tblgen/Makefile:1.22	Tue Aug  1 20:07:39 2017
+++ src/external/bsd/llvm/bin/tblgen/Makefile	Tue Jul 17 18:55:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 2017/08/01 20:07:39 joerg Exp $
+#	$NetBSD: Makefile,v 1.23 2018/07/17 18:55:26 joerg Exp $
 
 PROG_CXX=	llvm-tblgen
 NOMAN=		yes
@@ -15,6 +15,7 @@ SRCS=	AsmMatcherEmitter.cpp \
 	CallingConvEmitter.cpp \
 	CodeEmitterGen.cpp \
 	CodeGenDAGPatterns.cpp \
+	CodeGenHwModes.cpp \
 	CodeGenInstruction.cpp \
 	CodeGenMapTable.cpp \
 	CodeGenRegisters.cpp \
@@ -30,19 +31,26 @@ SRCS=	AsmMatcherEmitter.cpp \
 	FastISelEmitter.cpp \
 	FixedLenDecoderEmitter.cpp \
 	GlobalISelEmitter.cpp \
+	InfoByHwMode.cpp \
 	InstrInfoEmitter.cpp \
+	InstrDocsEmitter.cpp \
 	IntrinsicEmitter.cpp \
 	OptParserEmitter.cpp \
+	PredicateExpander.cpp \
 	PseudoLoweringEmitter.cpp \
+	RISCVCompressInstEmitter.cpp \
 	RegisterBankEmitter.cpp \
 	RegisterInfoEmitter.cpp \
+	SDNodeProperties.cpp \
 	SearchableTableEmitter.cpp \
 	SubtargetEmitter.cpp \
 	SubtargetFeatureInfo.cpp \
 	TableGen.cpp \
 	Types.cpp \
+	WebAssemblyDisassemblerEmitter.cpp \
 	X86DisassemblerTables.cpp \
 	X86EVEX2VEXTablesEmitter.cpp \
+	X86FoldTablesEmitter.cpp \
 	X86ModRMFilters.cpp \
 	X86RecognizableInstr.cpp
 

Index: src/external/bsd/llvm/config/clang/Config/config.h
diff -u src/external/bsd/llvm/config/clang/Config/config.h:1.16 src/external/bsd/llvm/config/clang/Config/config.h:1.17
--- src/external/bsd/llvm/config/clang/Config/config.h:1.16	Tue Aug  1 20:07:39 2017
+++ src/external/bsd/llvm/config/clang/Config/config.h	Tue Jul 17 18:55:26 2018
@@ -29,7 +29,7 @@
 #define CLANG_RESOURCE_DIR ""
 
 /* Directories clang will search for headers */
-#define C_INCLUDE_DIRS "/usr/include/clang-5.0:/usr/include"
+#define C_INCLUDE_DIRS "/usr/include/clang-7.0:/usr/include"
 
 /* Default <path> to all compiler invocations for --sysroot=<path>. */
 #define DEFAULT_SYSROOT ""

Index: src/external/bsd/llvm/config/llvm/Config/config.h.in
diff -u src/external/bsd/llvm/config/llvm/Config/config.h.in:1.20 src/external/bsd/llvm/config/llvm/Config/config.h.in:1.21
--- src/external/bsd/llvm/config/llvm/Config/config.h.in:1.20	Tue Aug  1 20:07:39 2017
+++ src/external/bsd/llvm/config/llvm/Config/config.h.in	Tue Jul 17 18:55:26 2018
@@ -33,7 +33,7 @@
 #define CLANG_RESOURCE_DIR ""
 
 /* Directories clang will search for headers */
-#define C_INCLUDE_DIRS "/usr/include/clang-5.0:/usr/include"
+#define C_INCLUDE_DIRS "/usr/include/clang-7.0:/usr/include"
 
 /* Default <path> to all compiler invocations for --sysroot=<path>. */
 #define DEFAULT_SYSROOT ""

Index: src/external/bsd/llvm/include/Makefile
diff -u src/external/bsd/llvm/include/Makefile:1.42 src/external/bsd/llvm/include/Makefile:1.43
--- src/external/bsd/llvm/include/Makefile:1.42	Sun Apr 29 18:29:29 2018
+++ src/external/bsd/llvm/include/Makefile	Tue Jul 17 18:55:27 2018
@@ -1,68 +1,89 @@
-#	$NetBSD: Makefile,v 1.42 2018/04/29 18:29:29 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.43 2018/07/17 18:55:27 joerg Exp $
 
 .include <bsd.init.mk>
 
 .PATH:	${CLANG_SRCDIR}/lib/Headers
 
+
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-INCS=	__wmmintrin_aes.h \
-	__wmmintrin_pclmul.h \
-	adxintrin.h \
+INCS=	adxintrin.h \
 	ammintrin.h \
 	avx2intrin.h \
+	avx512bitalgintrin.h \
 	avx512bwintrin.h \
 	avx512cdintrin.h \
 	avx512dqintrin.h \
-	avx512fintrin.h \
 	avx512erintrin.h \
+	avx512fintrin.h \
 	avx512ifmaintrin.h \
 	avx512ifmavlintrin.h \
 	avx512pfintrin.h \
+	avx512vbmi2intrin.h \
 	avx512vbmiintrin.h \
 	avx512vbmivlintrin.h \
+	avx512vlbitalgintrin.h \
 	avx512vlbwintrin.h \
 	avx512vlcdintrin.h \
 	avx512vldqintrin.h \
 	avx512vlintrin.h \
+	avx512vlvbmi2intrin.h \
+	avx512vlvnniintrin.h \
+	avx512vnniintrin.h \
 	avx512vpopcntdqintrin.h \
+	avx512vpopcntdqvlintrin.h \
 	avxintrin.h \
 	bmi2intrin.h \
 	bmiintrin.h \
+	cetintrin.h \
+	cldemoteintrin.h \
 	clflushoptintrin.h \
+	clwbintrin.h \
 	clzerointrin.h \
 	cpuid.h \
 	emmintrin.h \
 	f16cintrin.h \
-	fmaintrin.h \
 	fma4intrin.h \
+	fmaintrin.h \
 	fxsrintrin.h \
+	gfniintrin.h \
 	ia32intrin.h \
 	immintrin.h \
+	invpcidintrin.h \
 	lwpintrin.h \
 	lzcntintrin.h \
 	mm3dnow.h \
 	mmintrin.h \
 	mm_malloc.h \
+	movdirintrin.h \
 	mwaitxintrin.h \
 	nmmintrin.h \
+	pconfigintrin.h \
 	pkuintrin.h \
 	pmmintrin.h \
 	popcntintrin.h \
 	prfchwintrin.h \
+	ptwriteintrin.h \
 	rdseedintrin.h \
 	rtmintrin.h \
+	sgxintrin.h \
 	shaintrin.h \
 	smmintrin.h \
 	tbmintrin.h \
 	tmmintrin.h \
+	vaesintrin.h \
+	vpclmulqdqintrin.h \
+	waitpkgintrin.h \
+	wbnoinvdintrin.h \
 	wmmintrin.h \
+	__wmmintrin_aes.h \
+	__wmmintrin_pclmul.h \
 	x86intrin.h \
 	xmmintrin.h \
 	xopintrin.h \
-	xsavesintrin.h \
+	xsavecintrin.h \
 	xsaveintrin.h \
 	xsaveoptintrin.h \
-	xsavecintrin.h \
+	xsavesintrin.h \
 	xtestintrin.h
 
 .elif ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
@@ -72,6 +93,9 @@ INCS=	altivec.h \
 .elif ${MACHINE_CPU} == "arm" || ${MACHINE_CPU} == "aarch64"
 INCS=	arm_acle.h \
 	arm_neon.h
+.  if ${MACHINE_CPU} == "aarch64"
+INCS+=	arm64intr.h
+.  endif
 .elif ${MACHINE_CPU} == "mips" || ${MACHINE_CPU} == "mips64"
 INCS=	msa.h
 .endif
@@ -87,14 +111,25 @@ INCSDIR=	/usr/include/clang-${CLANG_VERS
 TABLEGEN_SRC=	Attributes.td Intrinsics.td Options.td
 
 TABLEGEN_OUTPUT.Attributes.td= \
-	llvm/IR/Attributes.gen|-gen-attrs
+	llvm/IR/Attributes.inc|-gen-attrs
 
 TABLEGEN_OUTPUT.Intrinsics.td= \
-	llvm/IR/Intrinsics.gen|-gen-intrinsic
+	llvm/IR/IntrinsicEnums.inc|-gen-intrinsic-enums \
+	llvm/IR/IntrinsicImpl.inc|-gen-intrinsic-impl
 
-CLANG_TABLEGEN_SRC=	Attr.td CommentCommands.td CommentHTMLTags.td \
-	CommentNodes.td CommentHTMLNamedCharacterReferences.td DeclNodes.td \
-	StmtNodes.td Diagnostic.td arm_neon.td Checkers.td
+CLANG_TABLEGEN_SRC=	\
+	arm_fp16.td \
+	arm_neon.td \
+	Attr.td \
+	Checkers.td \
+	CommentCommands.td \
+	CommentHTMLNamedCharacterReferences.td \
+	CommentHTMLTags.td \
+	CommentNodes.td \
+	DeclNodes.td \
+	Diagnostic.td \
+	StmtDataCollectors.td \
+	StmtNodes.td
 
 CLANG_TABLEGEN_INCLUDES.Attr.td=	-I${CLANG_SRCDIR}/include
 CLANG_TABLEGEN_OUTPUT.Attr.td= \
@@ -118,6 +153,9 @@ CLANG_TABLEGEN_OUTPUT.Attr.td= \
 CLANG_TABLEGEN_OUTPUT.StmtNodes.td= \
 	clang/AST/StmtNodes.inc|-gen-clang-stmt-nodes
 
+CLANG_TABLEGEN_OUTPUT.StmtDataCollectors.td= \
+	clang/AST/StmtDataCollectors.inc|-gen-clang-data-collectors
+
 CLANG_TABLEGEN_OUTPUT.DeclNodes.td= \
 	clang/AST/DeclNodes.inc|-gen-clang-decl-nodes
 
@@ -141,20 +179,30 @@ CLANG_TABLEGEN_OUTPUT.Diagnostic.td= \
 	clang/Basic/DiagnosticASTKinds.inc|-gen-clang-diags-defs^-clang-component=AST \
 	clang/Basic/DiagnosticCommentKinds.inc|-gen-clang-diags-defs^-clang-component=Comment \
 	clang/Basic/DiagnosticCommonKinds.inc|-gen-clang-diags-defs^-clang-component=Common \
+	clang/Basic/DiagnosticCrossTUKinds.inc|-gen-clang-diags-defs^-clang-component=CrossTU \
 	clang/Basic/DiagnosticDriverKinds.inc|-gen-clang-diags-defs^-clang-component=Driver \
 	clang/Basic/DiagnosticFrontendKinds.inc|-gen-clang-diags-defs^-clang-component=Frontend \
+	clang/Basic/DiagnosticGroups.inc|-gen-clang-diag-groups \
+	clang/Basic/DiagnosticIndexName.inc|-gen-clang-diags-index-name \
 	clang/Basic/DiagnosticLexKinds.inc|-gen-clang-diags-defs^-clang-component=Lex \
 	clang/Basic/DiagnosticParseKinds.inc|-gen-clang-diags-defs^-clang-component=Parse \
+	clang/Basic/DiagnosticRefactoringKinds.inc|-gen-clang-diags-defs^-clang-component=Refactoring \
 	clang/Basic/DiagnosticSemaKinds.inc|-gen-clang-diags-defs^-clang-component=Sema \
-	clang/Basic/DiagnosticSerializationKinds.inc|-gen-clang-diags-defs^-clang-component=Serialization \
-	clang/Basic/DiagnosticGroups.inc|-gen-clang-diag-groups \
-	clang/Basic/DiagnosticIndexName.inc|-gen-clang-diags-index-name
+	clang/Basic/DiagnosticSerializationKinds.inc|-gen-clang-diags-defs^-clang-component=Serialization
+
 
+CLANG_TABLEGEN_INCLUDES.arm_neon.td=	-I${CLANG_SRCDIR}/include/clang/Basic
 CLANG_TABLEGEN_OUTPUT.arm_neon.td= \
 	clang/Basic/arm_neon.inc|-gen-arm-neon-sema \
 	arm_neon.h|-gen-arm-neon
 
-CLANG_TABLEGEN_INCLUDES.Checkers.td=	-I${CLANG_SRCDIR}/include
+CLANG_TABLEGEN_INCLUDES.arm_fp16.td=	-I${CLANG_SRCDIR}/include/clang/Basic
+CLANG_TABLEGEN_OUTPUT.arm_fp16.td= \
+	clang/Basic/arm_fp16.inc|-gen-arm-neon-sema
+
+CLANG_TABLEGEN_INCLUDES.Checkers.td=	\
+	-I${CLANG_SRCDIR}/include \
+	-I${CLANG_SRCDIR}/include/clang/StaticAnalyzer/Checkers
 CLANG_TABLEGEN_OUTPUT.Checkers.td= \
 	clang/StaticAnalyzer/Checkers/Checkers.inc|-gen-clang-sa-checkers
 

Index: src/external/bsd/llvm/lib/Makefile
diff -u src/external/bsd/llvm/lib/Makefile:1.46 src/external/bsd/llvm/lib/Makefile:1.47
--- src/external/bsd/llvm/lib/Makefile:1.46	Tue Aug  1 21:40:03 2017
+++ src/external/bsd/llvm/lib/Makefile	Tue Jul 17 18:55:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2017/08/01 21:40:03 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2018/07/17 18:55:27 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -35,6 +35,7 @@ SUBDIR=	\
 	libLLVMSupport \
 	libLLVMTableGen \
 	libLLVMTarget \
+	libLLVMTransformsAggressiveInstCombine \
 	libLLVMTransformsCoroutines \
 	libLLVMTransformsUtils \
 	libLLVMVectorize \
@@ -60,7 +61,8 @@ SUBDIR+= \
 	libLLVMARMAsmPrinter \
 	libLLVMARMDisassembler \
 	libLLVMARMMCTargetDesc \
-	libLLVMARMTargetInfo
+	libLLVMARMTargetInfo \
+	libLLVMARMUtils
 
 SUBDIR+= \
 	libLLVMMipsAsmParser \
@@ -126,11 +128,13 @@ SUBDIR+= \
 	libclangASTMatchers \
 	libclangBasic \
 	libclangCodeGen \
+	libclangCrossTU \
 	libclangDriver \
 	libclangEdit \
 	libclangFrontend \
 	libclangFrontendRewrite \
 	libclangFrontendTool \
+	libclangIndex \
 	libclangLex \
 	libclangParse \
 	libclangRewrite \
@@ -145,9 +149,9 @@ SUBDIR+= \
 SUBDIR+= \
 	libclangASTMatchersDynamic \
 	libclangFormat \
-	libclangIndex \
 	libclangTooling \
 	libclangToolingCore \
+	libclangToolingInclusions \
 	libclangToolingRefactoring
 .endif
 

Index: src/external/bsd/llvm/lib/libLLVMAArch64CodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMAArch64CodeGen/Makefile:1.8 src/external/bsd/llvm/lib/libLLVMAArch64CodeGen/Makefile:1.9
--- src/external/bsd/llvm/lib/libLLVMAArch64CodeGen/Makefile:1.8	Tue Aug  1 20:07:40 2017
+++ src/external/bsd/llvm/lib/libLLVMAArch64CodeGen/Makefile	Tue Jul 17 18:55:27 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2017/08/01 20:07:40 joerg Exp $
+#	$NetBSD: Makefile,v 1.9 2018/07/17 18:55:27 joerg Exp $
 
 LIB=	LLVMAArch64CodeGen
 
@@ -16,8 +16,8 @@ SRCS+=	AArch64A53Fix835769.cpp \
 	AArch64CleanupLocalDynamicTLSPass.cpp \
 	AArch64CollectLOH.cpp \
 	AArch64CondBrTuning.cpp \
-	AArch64ConditionOptimizer.cpp \
 	AArch64ConditionalCompares.cpp \
+	AArch64ConditionOptimizer.cpp \
 	AArch64DeadRegisterDefinitionsPass.cpp \
 	AArch64ExpandPseudoInsts.cpp \
 	AArch64FalkorHWPFFix.cpp \
@@ -29,20 +29,20 @@ SRCS+=	AArch64A53Fix835769.cpp \
 	AArch64ISelLowering.cpp \
 	AArch64LegalizerInfo.cpp \
 	AArch64LoadStoreOptimizer.cpp \
-	AArch64MCInstLower.cpp \
 	AArch64MacroFusion.cpp \
+	AArch64MCInstLower.cpp \
 	AArch64PBQPRegAlloc.cpp \
 	AArch64PromoteConstant.cpp \
 	AArch64RedundantCopyElimination.cpp \
 	AArch64RegisterBankInfo.cpp \
 	AArch64RegisterInfo.cpp \
 	AArch64SelectionDAGInfo.cpp \
+	AArch64SIMDInstrOpt.cpp \
 	AArch64StorePairSuppress.cpp \
 	AArch64Subtarget.cpp \
 	AArch64TargetMachine.cpp \
 	AArch64TargetObjectFile.cpp \
-	AArch64TargetTransformInfo.cpp \
-	AArch64VectorByElementOpt.cpp
+	AArch64TargetTransformInfo.cpp
 
 TABLEGEN_SRC=		AArch64.td
 TABLEGEN_INCLUDES=	-I${LLVM_SRCDIR}/lib/Target/AArch64

Index: src/external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile:1.17 src/external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile:1.18
--- src/external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile:1.17	Tue Aug  1 20:07:40 2017
+++ src/external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile	Tue Jul 17 18:55:27 2018
@@ -1,12 +1,15 @@
-#	$NetBSD: Makefile,v 1.17 2017/08/01 20:07:40 joerg Exp $
+#	$NetBSD: Makefile,v 1.18 2018/07/17 18:55:27 joerg Exp $
 
 LIB=	LLVMARMCodeGen
 
 .include <bsd.init.mk>
 
+CPPFLAGS+=	-I${LLVM_SRCDIR}/lib/Target/ARM
+
 .PATH: ${LLVM_SRCDIR}/lib/Target/ARM
 
 SRCS+=	ARMAsmPrinter.cpp \
+	A15SDOptimizer.cpp \
 	ARMBaseInstrInfo.cpp \
 	ARMBaseRegisterInfo.cpp \
 	ARMCallLowering.cpp \
@@ -17,16 +20,17 @@ SRCS+=	ARMAsmPrinter.cpp \
 	ARMFastISel.cpp \
 	ARMFrameLowering.cpp \
 	ARMHazardRecognizer.cpp \
-	ARMISelDAGToDAG.cpp \
-	ARMISelLowering.cpp \
 	ARMInstrInfo.cpp \
 	ARMInstructionSelector.cpp \
+	ARMISelDAGToDAG.cpp \
+	ARMISelLowering.cpp \
 	ARMLegalizerInfo.cpp \
 	ARMLoadStoreOptimizer.cpp \
-	ARMMCInstLower.cpp \
 	ARMMachineFunctionInfo.cpp \
 	ARMMacroFusion.cpp \
+	ARMMCInstLower.cpp \
 	ARMOptimizeBarriersPass.cpp \
+	ARMParallelDSP.cpp \
 	ARMRegisterBankInfo.cpp \
 	ARMRegisterInfo.cpp \
 	ARMSelectionDAGInfo.cpp \
@@ -34,14 +38,13 @@ SRCS+=	ARMAsmPrinter.cpp \
 	ARMTargetMachine.cpp \
 	ARMTargetObjectFile.cpp \
 	ARMTargetTransformInfo.cpp \
-	A15SDOptimizer.cpp \
 	MLxExpansionPass.cpp \
-	ThumbRegisterInfo.cpp \
-	Thumb1InstrInfo.cpp \
 	Thumb1FrameLowering.cpp \
-	Thumb2ITBlockPass.cpp \
+	Thumb1InstrInfo.cpp \
 	Thumb2InstrInfo.cpp \
-	Thumb2SizeReduction.cpp
+	Thumb2ITBlockPass.cpp \
+	Thumb2SizeReduction.cpp \
+	ThumbRegisterInfo.cpp
 
 TABLEGEN_SRC=		ARM.td
 TABLEGEN_INCLUDES=	-I${LLVM_SRCDIR}/lib/Target/ARM
@@ -59,7 +62,9 @@ TABLEGEN_OUTPUT= \
 	ARMGenMCPseudoLowering.inc|-gen-pseudo-lowering \
 	ARMGenRegisterBank.inc|-gen-register-bank \
 	ARMGenRegisterInfo.inc|-gen-register-info \
-	ARMGenSubtargetInfo.inc|-gen-subtarget
+	ARMGenSubtargetInfo.inc|-gen-subtarget \
+	ARMGenSystemRegister.inc|-gen-searchable-tables
+
 
 .include "${.PARSEDIR}/../../tablegen.mk"
 

Index: src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile:1.24 src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile:1.25
--- src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile:1.24	Tue Aug  1 20:07:40 2017
+++ src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile	Tue Jul 17 18:55:27 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2017/08/01 20:07:40 joerg Exp $
+#	$NetBSD: Makefile,v 1.25 2018/07/17 18:55:27 joerg Exp $
 
 LIB=	LLVMAnalysis
 
@@ -16,15 +16,16 @@ SRCS+=	AliasAnalysis.cpp \
 	BlockFrequencyInfo.cpp \
 	BlockFrequencyInfoImpl.cpp \
 	BranchProbabilityInfo.cpp \
+	CallGraph.cpp \
+	CallGraphSCCPass.cpp \
+	CallPrinter.cpp \
+	CaptureTracking.cpp \
 	CFG.cpp \
 	CFGPrinter.cpp \
 	CFLAndersAliasAnalysis.cpp \
 	CFLSteensAliasAnalysis.cpp \
 	CGSCCPassManager.cpp \
-	CallGraphSCCPass.cpp \
-	CallGraph.cpp \
-	CallPrinter.cpp \
-	CaptureTracking.cpp \
+	CmpInstAnalysis.cpp \
 	CodeMetrics.cpp \
 	ConstantFolding.cpp \
 	CostModel.cpp \
@@ -32,11 +33,10 @@ SRCS+=	AliasAnalysis.cpp \
 	DemandedBits.cpp \
 	DependenceAnalysis.cpp \
 	DivergenceAnalysis.cpp \
-	DomPrinter.cpp \
 	DominanceFrontier.cpp \
+	DomPrinter.cpp \
 	EHPersonalities.cpp \
 	GlobalsModRef.cpp \
-	IVUsers.cpp \
 	IndirectCallPromotionAnalysis.cpp \
 	InlineCost.cpp \
 	InstCount.cpp \
@@ -44,6 +44,7 @@ SRCS+=	AliasAnalysis.cpp \
 	Interval.cpp \
 	IntervalPartition.cpp \
 	IteratedDominanceFrontier.cpp \
+	IVUsers.cpp \
 	LazyBlockFrequencyInfo.cpp \
 	LazyBranchProbabilityInfo.cpp \
 	LazyCallGraph.cpp \
@@ -60,33 +61,37 @@ SRCS+=	AliasAnalysis.cpp \
 	MemoryBuiltins.cpp \
 	MemoryDependenceAnalysis.cpp \
 	MemoryLocation.cpp \
-	MemorySSAUpdater.cpp \
 	MemorySSA.cpp \
+	MemorySSAUpdater.cpp \
 	ModuleDebugInfoPrinter.cpp \
 	ModuleSummaryAnalysis.cpp \
+	MustExecute.cpp \
 	ObjCARCAliasAnalysis.cpp \
 	ObjCARCAnalysisUtils.cpp \
 	ObjCARCInstKind.cpp \
-	OptimizationDiagnosticInfo.cpp \
+	OptimizationRemarkEmitter.cpp \
 	OrderedBasicBlock.cpp \
 	PHITransAddr.cpp \
+	PhiValues.cpp \
 	PostDominators.cpp \
 	ProfileSummaryInfo.cpp \
 	PtrUseVisitor.cpp \
 	RegionInfo.cpp \
 	RegionPass.cpp \
 	RegionPrinter.cpp \
-	ScalarEvolution.cpp \
 	ScalarEvolutionAliasAnalysis.cpp \
+	ScalarEvolution.cpp \
 	ScalarEvolutionExpander.cpp \
 	ScalarEvolutionNormalization.cpp \
 	ScopedNoAliasAA.cpp \
-	SparsePropagation.cpp \
+	SyntheticCountsUtils.cpp \
 	TargetLibraryInfo.cpp \
 	TargetTransformInfo.cpp \
 	Trace.cpp \
 	TypeBasedAliasAnalysis.cpp \
 	TypeMetadataUtils.cpp \
+	ValueLattice.cpp \
+	ValueLatticeUtils.cpp \
 	ValueTracking.cpp \
 	VectorUtils.cpp
 

Index: src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile:1.15 src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile:1.16
--- src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile:1.15	Wed Jan 11 12:02:28 2017
+++ src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile	Tue Jul 17 18:55:27 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2017/01/11 12:02:28 joerg Exp $
+#	$NetBSD: Makefile,v 1.16 2018/07/17 18:55:27 joerg Exp $
 
 LIB=	LLVMAsmPrinter
 
@@ -6,18 +6,18 @@ LIB=	LLVMAsmPrinter
 
 .PATH: ${LLVM_SRCDIR}/lib/CodeGen/AsmPrinter
 
-SRCS+=	ARMException.cpp \
+SRCS+=	AccelTable.cpp \
 	AddressPool.cpp \
+	ARMException.cpp \
 	AsmPrinter.cpp \
 	AsmPrinterDwarf.cpp \
 	AsmPrinterInlineAsm.cpp \
 	CodeViewDebug.cpp \
-	DIE.cpp \
-	DIEHash.cpp \
 	DbgValueHistoryCalculator.cpp \
 	DebugHandlerBase.cpp \
 	DebugLocStream.cpp \
-	DwarfAccelTable.cpp \
+	DIE.cpp \
+	DIEHash.cpp \
 	DwarfCFIException.cpp \
 	DwarfCompileUnit.cpp \
 	DwarfDebug.cpp \
@@ -28,6 +28,7 @@ SRCS+=	ARMException.cpp \
 	EHStreamer.cpp \
 	ErlangGCPrinter.cpp \
 	OcamlGCPrinter.cpp \
+	WinCFGuard.cpp \
 	WinException.cpp
 
 .if defined(HOSTLIB)

Index: src/external/bsd/llvm/lib/libLLVMBinaryFormat/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMBinaryFormat/Makefile:1.1 src/external/bsd/llvm/lib/libLLVMBinaryFormat/Makefile:1.2
--- src/external/bsd/llvm/lib/libLLVMBinaryFormat/Makefile:1.1	Tue Aug  1 20:07:40 2017
+++ src/external/bsd/llvm/lib/libLLVMBinaryFormat/Makefile	Tue Jul 17 18:55:27 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2017/08/01 20:07:40 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2018/07/17 18:55:27 joerg Exp $
 
 LIB=	LLVMBinaryFormat
 
@@ -7,7 +7,8 @@ LIB=	LLVMBinaryFormat
 .PATH: ${LLVM_SRCDIR}/lib/BinaryFormat
 
 SRCS+=	Dwarf.cpp \
-	Magic.cpp
+	Magic.cpp \
+	Wasm.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>

Index: src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.33 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.34
--- src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.33	Tue Aug  1 20:07:40 2017
+++ src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile	Tue Jul 17 18:55:27 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.33 2017/08/01 20:07:40 joerg Exp $
+#	$NetBSD: Makefile,v 1.34 2018/07/17 18:55:27 joerg Exp $
 
 LIB=	LLVMCodeGen
 
@@ -11,28 +11,29 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	Analysis.cpp \
 	AtomicExpandPass.cpp \
 	BasicTargetTransformInfo.cpp \
-	BranchCoalescing.cpp \
 	BranchFolding.cpp \
 	BranchRelaxation.cpp \
+	BreakFalseDeps.cpp \
 	BuiltinGCs.cpp \
 	CalcSpillWeights.cpp \
 	CallingConvLower.cpp \
+	CFIInstrInserter.cpp \
 	CodeGen.cpp \
 	CodeGenPrepare.cpp \
-	CountingFunctionInserter.cpp \
 	CriticalAntiDepBreaker.cpp \
-	DFAPacketizer.cpp \
 	DeadMachineInstructionElim.cpp \
 	DetectDeadLanes.cpp \
+	DFAPacketizer.cpp \
 	DwarfEHPrepare.cpp \
 	EarlyIfConversion.cpp \
 	EdgeBundles.cpp \
-	ExecutionDepsFix.cpp \
+	ExecutionDomainFix.cpp \
 	ExpandISelPseudos.cpp \
+	ExpandMemCmp.cpp \
 	ExpandPostRAPseudos.cpp \
 	ExpandReductions.cpp \
-	FEntryInserter.cpp \
 	FaultMaps.cpp \
+	FEntryInserter.cpp \
 	FuncletLayout.cpp \
 	GCMetadata.cpp \
 	GCMetadataPrinter.cpp \
@@ -41,18 +42,18 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	GlobalMerge.cpp \
 	IfConversion.cpp \
 	ImplicitNullChecks.cpp \
+	IndirectBrExpandPass.cpp \
 	InlineSpiller.cpp \
 	InterferenceCache.cpp \
 	InterleavedAccessPass.cpp \
 	IntrinsicLowering.cpp \
-	LLVMTargetMachine.cpp \
 	LatencyPriorityQueue.cpp \
 	LazyMachineBlockFrequencyInfo.cpp \
 	LexicalScopes.cpp \
 	LiveDebugValues.cpp \
 	LiveDebugVariables.cpp \
 	LiveInterval.cpp \
-	LiveIntervalAnalysis.cpp \
+	LiveIntervals.cpp \
 	LiveIntervalUnion.cpp \
 	LivePhysRegs.cpp \
 	LiveRangeCalc.cpp \
@@ -60,79 +61,84 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	LiveRangeShrink.cpp \
 	LiveRegMatrix.cpp \
 	LiveRegUnits.cpp \
-	LiveStackAnalysis.cpp \
+	LiveStacks.cpp \
 	LiveVariables.cpp \
+	LLVMTargetMachine.cpp \
 	LocalStackSlotAllocation.cpp \
-	LowLevelType.cpp \
+	LoopTraversal.cpp \
 	LowerEmuTLS.cpp \
-	MIRPrinter.cpp \
-	MIRPrintingPass.cpp \
+	LowLevelType.cpp \
 	MachineBasicBlock.cpp \
-	MachineBranchProbabilityInfo.cpp \
 	MachineBlockFrequencyInfo.cpp \
 	MachineBlockPlacement.cpp \
+	MachineBranchProbabilityInfo.cpp \
+	MachineCombiner.cpp \
 	MachineCopyPropagation.cpp \
 	MachineCSE.cpp \
-	MachineCombiner.cpp \
 	MachineDominanceFrontier.cpp \
 	MachineDominators.cpp \
 	MachineFrameInfo.cpp \
 	MachineFunction.cpp \
 	MachineFunctionPass.cpp \
 	MachineFunctionPrinterPass.cpp \
-	MachineInstr.cpp \
 	MachineInstrBundle.cpp \
+	MachineInstr.cpp \
 	MachineLICM.cpp \
 	MachineLoopInfo.cpp \
 	MachineModuleInfo.cpp \
 	MachineModuleInfoImpls.cpp \
-	MachineOutliner.cpp \
+	MachineOperand.cpp \
 	MachineOptimizationRemarkEmitter.cpp \
+	MachineOutliner.cpp \
 	MachinePassRegistry.cpp \
 	MachinePipeliner.cpp \
 	MachinePostDominators.cpp \
 	MachineRegionInfo.cpp \
 	MachineRegisterInfo.cpp \
-	MachineSSAUpdater.cpp \
 	MachineScheduler.cpp \
 	MachineSink.cpp \
+	MachineSSAUpdater.cpp \
 	MachineTraceMetrics.cpp \
 	MachineVerifier.cpp \
 	MacroFusion.cpp \
+	MIRCanonicalizerPass.cpp \
+	MIRPrinter.cpp \
+	MIRPrintingPass.cpp \
 	OptimizePHIs.cpp \
-	PHIElimination.cpp \
-	PHIEliminationUtils.cpp \
 	ParallelCG.cpp \
 	PatchableFunction.cpp \
 	PeepholeOptimizer.cpp \
-	ScoreboardHazardRecognizer.cpp \
+	PHIElimination.cpp \
+	PHIEliminationUtils.cpp \
 	PostRAHazardRecognizer.cpp \
 	PostRASchedulerList.cpp \
 	PreISelIntrinsicLowering.cpp \
 	ProcessImplicitDefs.cpp \
 	PrologEpilogInserter.cpp \
 	PseudoSourceValue.cpp \
+	ReachingDefAnalysis.cpp \
 	RegAllocBase.cpp \
 	RegAllocBasic.cpp \
 	RegAllocFast.cpp \
 	RegAllocGreedy.cpp \
 	RegAllocPBQP.cpp \
-	RegUsageInfoCollector.cpp \
-	RegUsageInfoPropagate.cpp \
 	RegisterClassInfo.cpp \
 	RegisterCoalescer.cpp \
 	RegisterPressure.cpp \
 	RegisterScavenging.cpp \
 	RegisterUsageInfo.cpp \
+	RegUsageInfoCollector.cpp \
+	RegUsageInfoPropagate.cpp \
 	RenameIndependentSubregs.cpp \
 	ResetMachineFunctionPass.cpp \
-	SafeStack.cpp \
 	SafeStackColoring.cpp \
+	SafeStack.cpp \
 	SafeStackLayout.cpp \
 	ScalarizeMaskedMemIntrin.cpp \
 	ScheduleDAG.cpp \
 	ScheduleDAGInstrs.cpp \
 	ScheduleDAGPrinter.cpp \
+	ScoreboardHazardRecognizer.cpp \
 	ShadowStackGCLowering.cpp \
 	ShrinkWrap.cpp \
 	SjLjEHPrepare.cpp \
@@ -157,7 +163,9 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	TargetSubtargetInfo.cpp \
 	TwoAddressInstructionPass.cpp \
 	UnreachableBlockElim.cpp \
+	ValueTypes.cpp \
 	VirtRegMap.cpp \
+	WasmEHPrepare.cpp \
 	WinEHPrepare.cpp \
 	XRayInstrumentation.cpp
 

Index: src/external/bsd/llvm/lib/libLLVMDebugInfoCodeView/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMDebugInfoCodeView/Makefile:1.4 src/external/bsd/llvm/lib/libLLVMDebugInfoCodeView/Makefile:1.5
--- src/external/bsd/llvm/lib/libLLVMDebugInfoCodeView/Makefile:1.4	Tue Aug  1 20:07:40 2017
+++ src/external/bsd/llvm/lib/libLLVMDebugInfoCodeView/Makefile	Tue Jul 17 18:55:27 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2017/08/01 20:07:40 joerg Exp $
+#	$NetBSD: Makefile,v 1.5 2018/07/17 18:55:27 joerg Exp $
 
 LIB=	LLVMDebugInfoCodeView
 
@@ -6,36 +6,41 @@ LIB=	LLVMDebugInfoCodeView
 
 .PATH: ${LLVM_SRCDIR}/lib/DebugInfo/CodeView
 
-SRCS+=	CVSymbolVisitor.cpp \
-	CVTypeVisitor.cpp \
+SRCS+=	AppendingTypeTableBuilder.cpp \
 	CodeViewError.cpp \
 	CodeViewRecordIO.cpp \
-	DebugFrameDataSubsection.cpp \
+	ContinuationRecordBuilder.cpp \
+	CVSymbolVisitor.cpp \
+	CVTypeVisitor.cpp \
 	DebugChecksumsSubsection.cpp \
 	DebugCrossExSubsection.cpp \
-	DebugSymbolsSubsection.cpp \
 	DebugCrossImpSubsection.cpp \
+	DebugFrameDataSubsection.cpp \
 	DebugInlineeLinesSubsection.cpp \
-	DebugSubsectionRecord.cpp \
-	DebugSubsection.cpp \
-	DebugSubsectionVisitor.cpp \
 	DebugLinesSubsection.cpp \
 	DebugStringTableSubsection.cpp \
+	DebugSubsection.cpp \
+	DebugSubsectionRecord.cpp \
+	DebugSubsectionVisitor.cpp \
+	DebugSymbolsSubsection.cpp \
 	EnumTables.cpp \
 	Formatters.cpp \
+	GlobalTypeTableBuilder.cpp \
+	LazyRandomTypeCollection.cpp \
 	Line.cpp \
+	MergingTypeTableBuilder.cpp \
+	RecordName.cpp \
 	RecordSerialization.cpp \
+	SimpleTypeSerializer.cpp \
 	StringsAndChecksums.cpp \
 	SymbolDumper.cpp \
 	SymbolRecordMapping.cpp \
 	SymbolSerializer.cpp \
 	TypeDumpVisitor.cpp \
+	TypeHashing.cpp \
 	TypeIndex.cpp \
 	TypeIndexDiscovery.cpp \
-	TypeName.cpp \
-	LazyRandomTypeCollection.cpp \
 	TypeRecordMapping.cpp \
-	TypeSerializer.cpp \
 	TypeStreamMerger.cpp \
 	TypeTableCollection.cpp
 

Index: src/external/bsd/llvm/lib/libLLVMDebugInfoDWARF/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMDebugInfoDWARF/Makefile:1.3 src/external/bsd/llvm/lib/libLLVMDebugInfoDWARF/Makefile:1.4
--- src/external/bsd/llvm/lib/libLLVMDebugInfoDWARF/Makefile:1.3	Tue Aug  1 20:07:40 2017
+++ src/external/bsd/llvm/lib/libLLVMDebugInfoDWARF/Makefile	Tue Jul 17 18:55:27 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2017/08/01 20:07:40 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2018/07/17 18:55:27 joerg Exp $
 
 LIB=	LLVMDebugInfoDWARF
 
@@ -8,12 +8,13 @@ LIB=	LLVMDebugInfoDWARF
 
 SRCS+=	DWARFAbbreviationDeclaration.cpp \
 	DWARFAcceleratorTable.cpp \
+	DWARFAddressRange.cpp \
 	DWARFCompileUnit.cpp \
 	DWARFContext.cpp \
 	DWARFDataExtractor.cpp \
 	DWARFDebugAbbrev.cpp \
-	DWARFDebugArangeSet.cpp \
 	DWARFDebugAranges.cpp \
+	DWARFDebugArangeSet.cpp \
 	DWARFDebugFrame.cpp \
 	DWARFDebugInfoEntry.cpp \
 	DWARFDebugLine.cpp \
@@ -21,14 +22,15 @@ SRCS+=	DWARFAbbreviationDeclaration.cpp 
 	DWARFDebugMacro.cpp \
 	DWARFDebugPubTable.cpp \
 	DWARFDebugRangeList.cpp \
+	DWARFDebugRnglists.cpp \
 	DWARFDie.cpp \
+	DWARFExpression.cpp \
 	DWARFFormValue.cpp \
 	DWARFGdbIndex.cpp \
 	DWARFTypeUnit.cpp \
 	DWARFUnit.cpp \
 	DWARFUnitIndex.cpp \
-	DWARFVerifier.cpp \
-	SyntaxHighlighting.cpp
+	DWARFVerifier.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>

Index: src/external/bsd/llvm/lib/libLLVMDebugInfoPDBNative/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMDebugInfoPDBNative/Makefile:1.1 src/external/bsd/llvm/lib/libLLVMDebugInfoPDBNative/Makefile:1.2
--- src/external/bsd/llvm/lib/libLLVMDebugInfoPDBNative/Makefile:1.1	Tue Aug  1 20:07:41 2017
+++ src/external/bsd/llvm/lib/libLLVMDebugInfoPDBNative/Makefile	Tue Jul 17 18:55:28 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2017/08/01 20:07:41 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2018/07/17 18:55:28 joerg Exp $
 
 LIB=	LLVMDebugInfoPDBNative
 
@@ -6,14 +6,14 @@ LIB=	LLVMDebugInfoPDBNative
 
 .PATH: ${LLVM_SRCDIR}/lib/DebugInfo/PDB/Native
 
-SRCS+=	DbiModuleDescriptor.cpp \
-	DbiModuleDescriptorBuilder.cpp \
+SRCS+=	DbiModuleDescriptorBuilder.cpp \
+	DbiModuleDescriptor.cpp \
 	DbiModuleList.cpp \
 	DbiStreamBuilder.cpp \
 	DbiStream.cpp \
 	EnumTables.cpp \
 	GlobalsStream.cpp \
-	GSI.cpp \
+	GSIStreamBuilder.cpp \
 	Hash.cpp \
 	HashTable.cpp \
 	InfoStreamBuilder.cpp \
@@ -23,15 +23,16 @@ SRCS+=	DbiModuleDescriptor.cpp \
 	NativeBuiltinSymbol.cpp \
 	NativeCompilandSymbol.cpp \
 	NativeEnumModules.cpp \
+	NativeEnumSymbol.cpp \
+	NativeEnumTypes.cpp \
 	NativeExeSymbol.cpp \
 	NativeRawSymbol.cpp \
 	NativeSession.cpp \
 	PDBFileBuilder.cpp \
 	PDBFile.cpp \
-	PDBStringTable.cpp \
 	PDBStringTableBuilder.cpp \
+	PDBStringTable.cpp \
 	PublicsStream.cpp \
-	PublicsStreamBuilder.cpp \
 	RawError.cpp \
 	SymbolStream.cpp \
 	TpiHashing.cpp \

Index: src/external/bsd/llvm/lib/libLLVMGlobalISel/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMGlobalISel/Makefile:1.2 src/external/bsd/llvm/lib/libLLVMGlobalISel/Makefile:1.3
--- src/external/bsd/llvm/lib/libLLVMGlobalISel/Makefile:1.2	Tue Aug  1 20:07:41 2017
+++ src/external/bsd/llvm/lib/libLLVMGlobalISel/Makefile	Tue Jul 17 18:55:28 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2017/08/01 20:07:41 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2018/07/17 18:55:28 joerg Exp $
 
 LIB=	LLVMGlobalISel
 
@@ -7,15 +7,19 @@ LIB=	LLVMGlobalISel
 .PATH: ${LLVM_SRCDIR}/lib/CodeGen/GlobalISel
 
 SRCS+=	CallLowering.cpp \
+	Combiner.cpp \
+	CombinerHelper.cpp \
 	GlobalISel.cpp \
 	InstructionSelect.cpp \
 	InstructionSelector.cpp \
 	IRTranslator.cpp \
-	MachineIRBuilder.cpp \
+	LegalityPredicates.cpp \
+	LegalizeMutations.cpp \
 	Legalizer.cpp \
 	LegalizerHelper.cpp \
 	LegalizerInfo.cpp \
 	Localizer.cpp \
+	MachineIRBuilder.cpp \
 	RegBankSelect.cpp \
 	RegisterBank.cpp \
 	RegisterBankInfo.cpp \

Index: src/external/bsd/llvm/lib/libLLVMIR/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMIR/Makefile:1.12 src/external/bsd/llvm/lib/libLLVMIR/Makefile:1.13
--- src/external/bsd/llvm/lib/libLLVMIR/Makefile:1.12	Tue Aug  1 20:07:41 2017
+++ src/external/bsd/llvm/lib/libLLVMIR/Makefile	Tue Jul 17 18:55:28 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2017/08/01 20:07:41 joerg Exp $
+#	$NetBSD: Makefile,v 1.13 2018/07/17 18:55:28 joerg Exp $
 
 LIB=	LLVMIR
 
@@ -19,29 +19,30 @@ SRCS+=	AsmWriter.cpp \
 	ConstantRange.cpp \
 	Constants.cpp \
 	Core.cpp \
-	DIBuilder.cpp \
 	DataLayout.cpp \
 	DebugInfo.cpp \
 	DebugInfoMetadata.cpp \
 	DebugLoc.cpp \
+	DiagnosticHandler.cpp \
 	DiagnosticInfo.cpp \
 	DiagnosticPrinter.cpp \
+	DIBuilder.cpp \
 	Dominators.cpp \
+	DomTreeUpdater.cpp \
 	Function.cpp \
-	GCOV.cpp \
-	GVMaterializer.cpp \
 	Globals.cpp \
-	IRBuilder.cpp \
-	IRPrintingPasses.cpp \
+	GVMaterializer.cpp \
 	InlineAsm.cpp \
 	Instruction.cpp \
 	Instructions.cpp \
 	IntrinsicInst.cpp \
+	IRBuilder.cpp \
+	IRPrintingPasses.cpp \
+	LegacyPassManager.cpp \
 	LLVMContext.cpp \
 	LLVMContextImpl.cpp \
-	LegacyPassManager.cpp \
-	MDBuilder.cpp \
 	Mangler.cpp \
+	MDBuilder.cpp \
 	Metadata.cpp \
 	Module.cpp \
 	ModuleSummaryIndex.cpp \
@@ -59,7 +60,6 @@ SRCS+=	AsmWriter.cpp \
 	User.cpp \
 	Value.cpp \
 	ValueSymbolTable.cpp \
-	ValueTypes.cpp \
 	Verifier.cpp
 
 .include "${.PARSEDIR}/../../tablegen.mk"

Index: src/external/bsd/llvm/lib/libLLVMInstCombine/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMInstCombine/Makefile:1.1 src/external/bsd/llvm/lib/libLLVMInstCombine/Makefile:1.2
--- src/external/bsd/llvm/lib/libLLVMInstCombine/Makefile:1.1	Sun Feb  6 01:13:57 2011
+++ src/external/bsd/llvm/lib/libLLVMInstCombine/Makefile	Tue Jul 17 18:55:28 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:13:57 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2018/07/17 18:55:28 joerg Exp $
 
 LIB=	LLVMInstCombine
 
@@ -6,6 +6,10 @@ LIB=	LLVMInstCombine
 
 .PATH: ${LLVM_SRCDIR}/lib/Transforms/InstCombine
 
+TABLEGEN_SRC=		InstCombineTables.td
+TABLEGEN_OUTPUT= \
+	InstCombineTables.inc|-gen-searchable-tables
+
 SRCS+=	InstructionCombining.cpp \
 	InstCombineAddSub.cpp \
 	InstCombineAndOrXor.cpp \
@@ -20,6 +24,8 @@ SRCS+=	InstructionCombining.cpp \
 	InstCombineSimplifyDemanded.cpp \
 	InstCombineVectorOps.cpp
 
+.include "${.PARSEDIR}/../../tablegen.mk"
+
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>
 .else

Index: src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile:1.16 src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile:1.17
--- src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile:1.16	Tue Aug  1 20:07:41 2017
+++ src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile	Tue Jul 17 18:55:28 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2017/08/01 20:07:41 joerg Exp $
+#	$NetBSD: Makefile,v 1.17 2018/07/17 18:55:28 joerg Exp $
 
 LIB=	LLVMInstrumentation
 
@@ -8,9 +8,11 @@ LIB=	LLVMInstrumentation
 
 SRCS+=	AddressSanitizer.cpp \
 	BoundsChecking.cpp \
+	CGProfile.cpp \
 	DataFlowSanitizer.cpp \
 	EfficiencySanitizer.cpp \
 	GCOVProfiling.cpp \
+	HWAddressSanitizer.cpp \
 	IndirectCallPromotion.cpp \
 	InstrProfiling.cpp \
 	Instrumentation.cpp \

Index: src/external/bsd/llvm/lib/libLLVMMC/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMMC/Makefile:1.20 src/external/bsd/llvm/lib/libLLVMMC/Makefile:1.21
--- src/external/bsd/llvm/lib/libLLVMMC/Makefile:1.20	Tue Aug  1 20:07:41 2017
+++ src/external/bsd/llvm/lib/libLLVMMC/Makefile	Tue Jul 17 18:55:28 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2017/08/01 20:07:41 joerg Exp $
+#	$NetBSD: Makefile,v 1.21 2018/07/17 18:55:28 joerg Exp $
 
 LIB=	LLVMMC
 
@@ -8,15 +8,18 @@ LIB=	LLVMMC
 
 SRCS+=	ConstantPools.cpp \
 	ELFObjectWriter.cpp \
+	MachObjectWriter.cpp \
 	MCAsmBackend.cpp \
-	MCAsmInfo.cpp \
 	MCAsmInfoCOFF.cpp \
+	MCAsmInfo.cpp \
 	MCAsmInfoDarwin.cpp \
 	MCAsmInfoELF.cpp \
 	MCAsmInfoWasm.cpp \
+	MCAsmMacro.cpp \
 	MCAsmStreamer.cpp \
 	MCAssembler.cpp \
 	MCCodeEmitter.cpp \
+	MCCodePadder.cpp \
 	MCCodeView.cpp \
 	MCContext.cpp \
 	MCDwarf.cpp \
@@ -25,21 +28,21 @@ SRCS+=	ConstantPools.cpp \
 	MCExpr.cpp \
 	MCFragment.cpp \
 	MCInst.cpp \
+	MCInstPrinter.cpp \
 	MCInstrAnalysis.cpp \
 	MCInstrDesc.cpp \
-	MCInstPrinter.cpp \
 	MCLabel.cpp \
 	MCLinkerOptimizationHint.cpp \
-	MCMachOStreamer.cpp \
 	MCMachObjectTargetWriter.cpp \
+	MCMachOStreamer.cpp \
 	MCNullStreamer.cpp \
 	MCObjectFileInfo.cpp \
 	MCObjectStreamer.cpp \
 	MCObjectWriter.cpp \
 	MCRegisterInfo.cpp \
 	MCSchedule.cpp \
-	MCSection.cpp \
 	MCSectionCOFF.cpp \
+	MCSection.cpp \
 	MCSectionELF.cpp \
 	MCSectionMachO.cpp \
 	MCSectionWasm.cpp \
@@ -54,7 +57,6 @@ SRCS+=	ConstantPools.cpp \
 	MCWin64EH.cpp \
 	MCWinCOFFStreamer.cpp \
 	MCWinEH.cpp \
-	MachObjectWriter.cpp \
 	StringTableBuilder.cpp \
 	SubtargetFeature.cpp \
 	WasmObjectWriter.cpp \

Index: src/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile:1.28 src/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile:1.29
--- src/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile:1.28	Tue Aug  1 20:07:41 2017
+++ src/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile	Tue Jul 17 18:55:28 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2017/08/01 20:07:41 joerg Exp $
+#	$NetBSD: Makefile,v 1.29 2018/07/17 18:55:28 joerg Exp $
 
 LIB=	LLVMMipsCodeGen
 
@@ -7,35 +7,39 @@ LIB=	LLVMMipsCodeGen
 .PATH: ${LLVM_SRCDIR}/lib/Target/Mips
 
 SRCS+=	MicroMipsSizeReduction.cpp \
-	Mips16ISelDAGToDAG.cpp \
-	Mips16ISelLowering.cpp \
-	Mips16InstrInfo.cpp \
 	Mips16FrameLowering.cpp \
 	Mips16HardFloat.cpp \
 	Mips16HardFloatInfo.cpp \
+	Mips16InstrInfo.cpp \
+	Mips16ISelDAGToDAG.cpp \
+	Mips16ISelLowering.cpp \
 	Mips16RegisterInfo.cpp \
 	MipsAnalyzeImmediate.cpp \
 	MipsAsmPrinter.cpp \
+	MipsBranchExpansion.cpp \
+	MipsCallLowering.cpp \
 	MipsCCState.cpp \
 	MipsConstantIslandPass.cpp \
 	MipsDelaySlotFiller.cpp \
+	MipsExpandPseudo.cpp \
 	MipsFastISel.cpp \
 	MipsFrameLowering.cpp \
-	MipsHazardSchedule.cpp \
 	MipsInstrInfo.cpp \
+	MipsInstructionSelector.cpp \
 	MipsISelDAGToDAG.cpp \
 	MipsISelLowering.cpp \
-	MipsLongBranch.cpp \
+	MipsLegalizerInfo.cpp \
 	MipsMachineFunction.cpp \
-	MipsModuleISelDAGToDAG.cpp \
 	MipsMCInstLower.cpp \
+	MipsModuleISelDAGToDAG.cpp \
 	MipsOptimizePICCall.cpp \
 	MipsOs16.cpp \
+	MipsRegisterBankInfo.cpp \
 	MipsRegisterInfo.cpp \
-	MipsSEISelLowering.cpp \
-	MipsSEISelDAGToDAG.cpp \
-	MipsSEInstrInfo.cpp \
 	MipsSEFrameLowering.cpp \
+	MipsSEInstrInfo.cpp \
+	MipsSEISelDAGToDAG.cpp \
+	MipsSEISelLowering.cpp \
 	MipsSERegisterInfo.cpp \
 	MipsSubtarget.cpp \
 	MipsTargetMachine.cpp \
@@ -44,8 +48,6 @@ SRCS+=	MicroMipsSizeReduction.cpp \
 TABLEGEN_SRC=		Mips.td
 TABLEGEN_INCLUDES=	-I${LLVM_SRCDIR}/lib/Target/Mips
 TABLEGEN_OUTPUT= \
-	MipsGenRegisterInfo.inc|-gen-register-info \
-	MipsGenInstrInfo.inc|-gen-instr-info \
 	MipsGenAsmMatcher.inc|-gen-asm-matcher \
 	MipsGenAsmWriter.inc|-gen-asm-writer \
 	MipsGenCallingConv.inc|-gen-callingconv \
@@ -53,8 +55,12 @@ TABLEGEN_OUTPUT= \
 	MipsGenDAGISel.inc|-gen-dag-isel \
 	MipsGenDisassemblerTables.inc|-gen-disassembler \
 	MipsGenFastISel.inc|-gen-fast-isel \
+	MipsGenGlobalISel.inc|-gen-global-isel \
+	MipsGenInstrInfo.inc|-gen-instr-info \
 	MipsGenMCCodeEmitter.inc|-gen-emitter \
 	MipsGenMCPseudoLowering.inc|-gen-pseudo-lowering \
+	MipsGenRegisterBank.inc|-gen-register-bank \
+	MipsGenRegisterInfo.inc|-gen-register-info \
 	MipsGenSubtargetInfo.inc|-gen-subtarget
 
 .include "${.PARSEDIR}/../../tablegen.mk"

Index: src/external/bsd/llvm/lib/libLLVMObjectYAML/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMObjectYAML/Makefile:1.2 src/external/bsd/llvm/lib/libLLVMObjectYAML/Makefile:1.3
--- src/external/bsd/llvm/lib/libLLVMObjectYAML/Makefile:1.2	Tue Aug  1 20:07:41 2017
+++ src/external/bsd/llvm/lib/libLLVMObjectYAML/Makefile	Tue Jul 17 18:55:28 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2017/08/01 20:07:41 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2018/07/17 18:55:28 joerg Exp $
 
 LIB=	LLVMObjectYAML
 
@@ -6,10 +6,11 @@ LIB=	LLVMObjectYAML
 
 .PATH: ${LLVM_SRCDIR}/lib/ObjectYAML
 
-SRCS+=	COFFYAML.cpp \
-	CodeViewYAMLDebugSections.cpp \
+SRCS+=	CodeViewYAMLDebugSections.cpp \
 	CodeViewYAMLSymbols.cpp \
+	CodeViewYAMLTypeHashing.cpp \
 	CodeViewYAMLTypes.cpp \
+	COFFYAML.cpp \
 	DWARFEmitter.cpp \
 	DWARFVisitor.cpp \
 	DWARFYAML.cpp \

Index: src/external/bsd/llvm/lib/libLLVMOrc/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMOrc/Makefile:1.3 src/external/bsd/llvm/lib/libLLVMOrc/Makefile:1.4
--- src/external/bsd/llvm/lib/libLLVMOrc/Makefile:1.3	Tue Aug  1 20:07:41 2017
+++ src/external/bsd/llvm/lib/libLLVMOrc/Makefile	Tue Jul 17 18:55:28 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2017/08/01 20:07:41 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2018/07/17 18:55:28 joerg Exp $
 
 LIB=	LLVMOrc
 
@@ -6,13 +6,22 @@ LIB=	LLVMOrc
 
 .PATH: ${LLVM_SRCDIR}/lib/ExecutionEngine/Orc
 
-SRCS+=	ExecutionUtils.cpp \
+SRCS+=	CompileOnDemandLayer.cpp \
+	Core.cpp \
+	ExecutionUtils.cpp \
 	IndirectionUtils.cpp \
+	IRCompileLayer.cpp \
+	IRTransformLayer.cpp \
+	Layer.cpp \
+	Legacy.cpp \
+	LLJIT.cpp \
 	NullResolver.cpp \
+	ObjectTransformLayer.cpp \
 	OrcABISupport.cpp \
 	OrcCBindings.cpp \
 	OrcError.cpp \
 	OrcMCJITReplacement.cpp \
-	RPCUtils.cpp
+	RPCUtils.cpp \
+	RTDyldObjectLinkingLayer.cpp
 
 .include <bsd.lib.mk>

Index: src/external/bsd/llvm/lib/libLLVMPasses/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMPasses/Makefile:1.1 src/external/bsd/llvm/lib/libLLVMPasses/Makefile:1.2
--- src/external/bsd/llvm/lib/libLLVMPasses/Makefile:1.1	Sat Feb 27 21:47:34 2016
+++ src/external/bsd/llvm/lib/libLLVMPasses/Makefile	Tue Jul 17 18:55:28 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2016/02/27 21:47:34 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2018/07/17 18:55:28 joerg Exp $
 
 LIB=	LLVMPasses
 
@@ -6,7 +6,8 @@ LIB=	LLVMPasses
 
 .PATH: ${LLVM_SRCDIR}/lib/Passes
 
-SRCS+=	PassBuilder.cpp
+SRCS+=	PassBuilder.cpp \
+	PassPlugin.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>

Index: src/external/bsd/llvm/lib/libLLVMPowerPCCodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMPowerPCCodeGen/Makefile:1.13 src/external/bsd/llvm/lib/libLLVMPowerPCCodeGen/Makefile:1.14
--- src/external/bsd/llvm/lib/libLLVMPowerPCCodeGen/Makefile:1.13	Tue Aug  1 20:07:41 2017
+++ src/external/bsd/llvm/lib/libLLVMPowerPCCodeGen/Makefile	Tue Jul 17 18:55:28 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2017/08/01 20:07:41 joerg Exp $
+#	$NetBSD: Makefile,v 1.14 2018/07/17 18:55:28 joerg Exp $
 
 LIB=	LLVMPowerPCCodeGen
 
@@ -8,32 +8,35 @@ LIB=	LLVMPowerPCCodeGen
 
 SRCS+=	PPCAsmPrinter.cpp \
 	PPCBoolRetToInt.cpp \
+	PPCBranchCoalescing.cpp \
 	PPCBranchSelector.cpp \
 	PPCCCState.cpp \
 	PPCCTRLoops.cpp \
 	PPCEarlyReturn.cpp \
 	PPCExpandISEL.cpp \
+	PPCFastISel.cpp \
+	PPCFrameLowering.cpp \
 	PPCHazardRecognizers.cpp \
 	PPCInstrInfo.cpp \
 	PPCISelDAGToDAG.cpp \
 	PPCISelLowering.cpp \
-	PPCFastISel.cpp \
-	PPCFrameLowering.cpp \
 	PPCLoopPreIncPrep.cpp \
 	PPCMachineFunctionInfo.cpp \
 	PPCMCInstLower.cpp \
 	PPCMIPeephole.cpp \
+	PPCPreEmitPeephole.cpp \
 	PPCQPXLoadSplat.cpp \
+	PPCReduceCRLogicals.cpp \
 	PPCRegisterInfo.cpp \
 	PPCSubtarget.cpp \
-	PPCTLSDynamicCall.cpp \
-	PPCTOCRegDeps.cpp \
 	PPCTargetMachine.cpp \
 	PPCTargetObjectFile.cpp \
 	PPCTargetTransformInfo.cpp \
+	PPCTLSDynamicCall.cpp \
+	PPCTOCRegDeps.cpp \
 	PPCVSXCopy.cpp \
 	PPCVSXFMAMutate.cpp \
-	PPCVSXSwapRemoval.cpp
+	PPCVSXSwapRemoval.cpp \
 
 TABLEGEN_SRC=		PPC.td
 TABLEGEN_INCLUDES=	-I${LLVM_SRCDIR}/lib/Target/PowerPC

Index: src/external/bsd/llvm/lib/libLLVMProfileData/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMProfileData/Makefile:1.4 src/external/bsd/llvm/lib/libLLVMProfileData/Makefile:1.5
--- src/external/bsd/llvm/lib/libLLVMProfileData/Makefile:1.4	Wed Jan 11 12:02:30 2017
+++ src/external/bsd/llvm/lib/libLLVMProfileData/Makefile	Tue Jul 17 18:55:29 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2017/01/11 12:02:30 joerg Exp $
+#	$NetBSD: Makefile,v 1.5 2018/07/17 18:55:29 joerg Exp $
 
 LIB=	LLVMProfileData
 
@@ -6,7 +6,8 @@ LIB=	LLVMProfileData
 
 .PATH: ${LLVM_SRCDIR}/lib/ProfileData
 
-SRCS+=	InstrProf.cpp \
+SRCS+=	GCOV.cpp \
+	InstrProf.cpp \
 	InstrProfReader.cpp \
 	InstrProfWriter.cpp \
 	ProfileSummaryBuilder.cpp \

Index: src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile:1.23 src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile:1.24
--- src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile:1.23	Tue Aug  1 20:07:42 2017
+++ src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile	Tue Jul 17 18:55:29 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2017/08/01 20:07:42 joerg Exp $
+#	$NetBSD: Makefile,v 1.24 2018/07/17 18:55:29 joerg Exp $
 
 LIB=	LLVMScalarOpts
 
@@ -9,28 +9,31 @@ LIB=	LLVMScalarOpts
 SRCS+=	ADCE.cpp \
 	AlignmentFromAssumptions.cpp \
 	BDCE.cpp \
+	CallSiteSplitting.cpp \
 	ConstantHoisting.cpp \
 	ConstantProp.cpp \
 	CorrelatedValuePropagation.cpp \
 	DCE.cpp \
 	DeadStoreElimination.cpp \
+	DivRemPairs.cpp \
 	EarlyCSE.cpp \
 	FlattenCFGPass.cpp \
 	Float2Int.cpp \
+	GuardWidening.cpp \
 	GVN.cpp \
 	GVNHoist.cpp \
 	GVNSink.cpp \
-	GuardWidening.cpp \
-	IVUsersPrinter.cpp \
-	IndVarSimplify.cpp \
 	InductiveRangeCheckElimination.cpp \
+	IndVarSimplify.cpp \
 	InferAddressSpaces.cpp \
+	InstSimplifyPass.cpp \
+	IVUsersPrinter.cpp \
 	JumpThreading.cpp \
 	LICM.cpp \
 	LoopAccessAnalysisPrinter.cpp \
 	LoopDataPrefetch.cpp \
-	LoopDistribute.cpp \
 	LoopDeletion.cpp \
+	LoopDistribute.cpp \
 	LoopIdiomRecognize.cpp \
 	LoopInstSimplify.cpp \
 	LoopInterchange.cpp \
@@ -42,6 +45,7 @@ SRCS+=	ADCE.cpp \
 	LoopSimplifyCFG.cpp \
 	LoopSink.cpp \
 	LoopStrengthReduce.cpp \
+	LoopUnrollAndJamPass.cpp \
 	LoopUnrollPass.cpp \
 	LoopUnswitch.cpp \
 	LoopVersioningLICM.cpp \
@@ -50,6 +54,7 @@ SRCS+=	ADCE.cpp \
 	LowerGuardIntrinsic.cpp \
 	MemCpyOptimizer.cpp \
 	MergedLoadStoreMotion.cpp \
+	MergeICmps.cpp \
 	NaryReassociate.cpp \
 	NewGVN.cpp \
 	PartiallyInlineLibCalls.cpp \
@@ -57,15 +62,16 @@ SRCS+=	ADCE.cpp \
 	Reassociate.cpp \
 	Reg2Mem.cpp \
 	RewriteStatepointsForGC.cpp \
-	SCCP.cpp \
-	SROA.cpp \
 	Scalar.cpp \
 	Scalarizer.cpp \
+	SCCP.cpp \
 	SeparateConstOffsetFromGEP.cpp \
 	SimpleLoopUnswitch.cpp \
 	SimplifyCFGPass.cpp \
 	Sink.cpp \
+	SpeculateAroundPHIs.cpp \
 	SpeculativeExecution.cpp \
+	SROA.cpp \
 	StraightLineStrengthReduce.cpp \
 	StructurizeCFG.cpp \
 	TailRecursionElimination.cpp

Index: src/external/bsd/llvm/lib/libLLVMSupport/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMSupport/Makefile:1.34 src/external/bsd/llvm/lib/libLLVMSupport/Makefile:1.35
--- src/external/bsd/llvm/lib/libLLVMSupport/Makefile:1.34	Tue Aug  1 20:07:42 2017
+++ src/external/bsd/llvm/lib/libLLVMSupport/Makefile	Tue Jul 17 18:55:29 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.34 2017/08/01 20:07:42 joerg Exp $
+#	$NetBSD: Makefile,v 1.35 2018/07/17 18:55:29 joerg Exp $
 
 LIB=	LLVMSupport
 
@@ -6,33 +6,36 @@ LIB=	LLVMSupport
 
 .PATH: ${LLVM_SRCDIR}/lib/Support
 
-SRCS+=	AMDGPUCodeObjectMetadata.cpp \
+SRCS+=	Allocator.cpp \
+	AMDGPUMetadata.cpp \
 	APFloat.cpp \
 	APInt.cpp \
 	APSInt.cpp \
 	ARMAttributeParser.cpp \
 	ARMBuildAttrs.cpp \
 	ARMWinEH.cpp \
-	Allocator.cpp \
 	BinaryStreamError.cpp \
 	BinaryStreamReader.cpp \
 	BinaryStreamRef.cpp \
 	BinaryStreamWriter.cpp \
 	BlockFrequency.cpp \
 	BranchProbability.cpp \
-	COM.cpp \
 	CachePruning.cpp \
 	Chrono.cpp \
+	circular_raw_ostream.cpp \
+	CodeGenCoverage.cpp \
+	COM.cpp \
 	CommandLine.cpp \
 	Compression.cpp \
 	ConvertUTF.cpp \
 	ConvertUTFWrapper.cpp \
 	CrashRecoveryContext.cpp \
+	DAGDeltaAlgorithm.cpp \
 	DataExtractor.cpp \
 	DebugCounter.cpp \
 	Debug.cpp \
 	DeltaAlgorithm.cpp \
-	DAGDeltaAlgorithm.cpp \
+	DJB.cpp \
 	Error.cpp \
 	ErrorHandling.cpp \
 	FileOutputBuffer.cpp \
@@ -42,26 +45,36 @@ SRCS+=	AMDGPUCodeObjectMetadata.cpp \
 	GlobPattern.cpp \
 	GraphWriter.cpp \
 	Hashing.cpp \
+	InitLLVM.cpp \
 	IntEqClasses.cpp \
 	IntervalMap.cpp \
 	JamCRC.cpp \
+	JSON.cpp \
+	KnownBits.cpp \
 	LEB128.cpp \
 	LineIterator.cpp \
 	Locale.cpp \
 	LockFileManager.cpp \
 	LowLevelType.cpp \
-	MD5.cpp \
 	ManagedStatic.cpp \
 	MathExtras.cpp \
+	MD5.cpp \
 	MemoryBuffer.cpp \
 	NativeFormatting.cpp \
 	Options.cpp \
 	Parallel.cpp \
 	PluginLoader.cpp \
 	PrettyStackTrace.cpp \
+	raw_os_ostream.cpp \
+	raw_ostream.cpp \
+	regcomp.c \
+	regerror.c \
 	Regex.cpp \
-	SHA1.cpp \
+	regexec.c \
+	regfree.c \
+	regstrlcpy.c \
 	ScopedPrinter.cpp \
+	SHA1.cpp \
 	SmallPtrSet.cpp \
 	SmallVector.cpp \
 	SourceMgr.cpp \
@@ -73,27 +86,22 @@ SRCS+=	AMDGPUCodeObjectMetadata.cpp \
 	StringRef.cpp \
 	StringSaver.cpp \
 	SystemUtils.cpp \
-	TarWriter.cpp \
 	TargetParser.cpp \
 	TargetRegistry.cpp \
-	TrigramIndex.cpp \
+	TarWriter.cpp \
 	Timer.cpp \
 	ToolOutputFile.cpp \
+	TrigramIndex.cpp \
 	Triple.cpp \
 	Twine.cpp \
+	UnicodeCaseFold.cpp \
 	Unicode.cpp \
+	VersionTuple.cpp \
 	Watchdog.cpp \
+	WithColor.cpp \
+	xxhash.cpp \
 	YAMLParser.cpp \
 	YAMLTraits.cpp \
-	circular_raw_ostream.cpp \
-	raw_os_ostream.cpp \
-	raw_ostream.cpp \
-	regcomp.c \
-	regerror.c \
-	regexec.c \
-	regfree.c \
-	regstrlcpy.c \
-	xxhash.cpp
 
 SRCS+=	Atomic.cpp \
 	DynamicLibrary.cpp \

Index: src/external/bsd/llvm/lib/libLLVMTableGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMTableGen/Makefile:1.5 src/external/bsd/llvm/lib/libLLVMTableGen/Makefile:1.6
--- src/external/bsd/llvm/lib/libLLVMTableGen/Makefile:1.5	Sun Aug 10 17:34:22 2014
+++ src/external/bsd/llvm/lib/libLLVMTableGen/Makefile	Tue Jul 17 18:55:29 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2014/08/10 17:34:22 joerg Exp $
+#	$NetBSD: Makefile,v 1.6 2018/07/17 18:55:29 joerg Exp $
 
 LIB=	LLVMTableGen
 
@@ -7,6 +7,7 @@ LIB=	LLVMTableGen
 .PATH: ${LLVM_SRCDIR}/lib/TableGen
 
 SRCS+=	Error.cpp \
+	JSONBackend.cpp \
 	Main.cpp \
 	Record.cpp \
 	SetTheory.cpp \

Index: src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile:1.20 src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile:1.21
--- src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile:1.20	Tue Aug  1 20:07:42 2017
+++ src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile	Tue Jul 17 18:55:29 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2017/08/01 20:07:42 joerg Exp $
+#	$NetBSD: Makefile,v 1.21 2018/07/17 18:55:29 joerg Exp $
 
 LIB=	LLVMTransformsUtils
 
@@ -6,20 +6,21 @@ LIB=	LLVMTransformsUtils
 
 .PATH: ${LLVM_SRCDIR}/lib/Transforms/Utils
 
-SRCS+=	ASanStackFrameLayout.cpp \
-	AddDiscriminators.cpp \
+SRCS+=	AddDiscriminators.cpp \
+	ASanStackFrameLayout.cpp \
 	BasicBlockUtils.cpp \
 	BreakCriticalEdges.cpp \
 	BuildLibCalls.cpp \
 	BypassSlowDivision.cpp \
+	CallPromotionUtils.cpp \
 	CloneFunction.cpp \
 	CloneModule.cpp \
-	CmpInstAnalysis.cpp \
 	CodeExtractor.cpp \
 	CtorUtils.cpp \
 	DemoteRegToStack.cpp \
-	Evaluator.cpp \
+	EntryExitInstrumenter.cpp \
 	EscapeEnumerator.cpp \
+	Evaluator.cpp \
 	FlattenCFG.cpp \
 	FunctionComparator.cpp \
 	FunctionImportUtils.cpp \
@@ -31,7 +32,9 @@ SRCS+=	ASanStackFrameLayout.cpp \
 	LCSSA.cpp \
 	LibCallsShrinkWrap.cpp \
 	Local.cpp \
+	LoopRotationUtils.cpp \
 	LoopSimplify.cpp \
+	LoopUnrollAndJam.cpp \
 	LoopUnroll.cpp \
 	LoopUnrollPeel.cpp \
 	LoopUnrollRuntime.cpp \
@@ -47,20 +50,20 @@ SRCS+=	ASanStackFrameLayout.cpp \
 	OrderedInstructions.cpp \
 	PredicateInfo.cpp \
 	PromoteMemoryToRegister.cpp \
-	SSAUpdater.cpp \
 	SanitizerStats.cpp \
 	SimplifyCFG.cpp \
 	SimplifyIndVar.cpp \
-	SimplifyInstructions.cpp \
 	SimplifyLibCalls.cpp \
 	SplitModule.cpp \
+	SSAUpdaterBulk.cpp \
+	SSAUpdater.cpp \
 	StripGCRelocates.cpp \
 	StripNonLineTableDebugInfo.cpp \
 	SymbolRewriter.cpp \
 	UnifyFunctionExitNodes.cpp \
 	Utils.cpp \
-	VNCoercion.cpp \
-	ValueMapper.cpp
+	ValueMapper.cpp \
+	VNCoercion.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>

Index: src/external/bsd/llvm/lib/libLLVMVectorize/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMVectorize/Makefile:1.7 src/external/bsd/llvm/lib/libLLVMVectorize/Makefile:1.8
--- src/external/bsd/llvm/lib/libLLVMVectorize/Makefile:1.7	Tue Aug  1 20:07:42 2017
+++ src/external/bsd/llvm/lib/libLLVMVectorize/Makefile	Tue Jul 17 18:55:29 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2017/08/01 20:07:42 joerg Exp $
+#	$NetBSD: Makefile,v 1.8 2018/07/17 18:55:29 joerg Exp $
 
 LIB=	LLVMVectorize
 
@@ -7,9 +7,14 @@ LIB=	LLVMVectorize
 .PATH: ${LLVM_SRCDIR}/lib/Transforms/Vectorize
 
 SRCS+=	LoadStoreVectorizer.cpp \
+	LoopVectorizationLegality.cpp \
 	LoopVectorize.cpp \
 	SLPVectorizer.cpp \
-	Vectorize.cpp
+	Vectorize.cpp \
+	VPlan.cpp \
+	VPlanHCFGBuilder.cpp \
+	VPlanHCFGTransforms.cpp \
+	VPlanVerifier.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>

Index: src/external/bsd/llvm/lib/libLLVMX86AsmPrinter/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMX86AsmPrinter/Makefile:1.3 src/external/bsd/llvm/lib/libLLVMX86AsmPrinter/Makefile:1.4
--- src/external/bsd/llvm/lib/libLLVMX86AsmPrinter/Makefile:1.3	Sat Feb 27 21:47:35 2016
+++ src/external/bsd/llvm/lib/libLLVMX86AsmPrinter/Makefile	Tue Jul 17 18:55:29 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2016/02/27 21:47:35 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2018/07/17 18:55:29 joerg Exp $
 
 LIB=	LLVMX86AsmPrinter
 
@@ -10,8 +10,9 @@ CPPFLAGS+=	-I${X86_OBJDIR} -I${LLVM_SRCD
 .PATH: ${LLVM_SRCDIR}/lib/Target/X86/InstPrinter
 
 SRCS+=	X86ATTInstPrinter.cpp \
-	X86IntelInstPrinter.cpp \
-	X86InstComments.cpp
+	X86InstComments.cpp \
+	X86InstPrinterCommon.cpp \
+	X86IntelInstPrinter.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>

Index: src/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile:1.16 src/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile:1.17
--- src/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile:1.16	Tue Aug  1 20:07:42 2017
+++ src/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile	Tue Jul 17 18:55:29 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2017/08/01 20:07:42 joerg Exp $
+#	$NetBSD: Makefile,v 1.17 2018/07/17 18:55:29 joerg Exp $
 
 LIB=	LLVMX86CodeGen
 
@@ -6,25 +6,31 @@ LIB=	LLVMX86CodeGen
 
 .PATH: ${LLVM_SRCDIR}/lib/Target/X86
 
-SRCS+=	X86AsmPrinter.cpp \
+SRCS+=	ShadowCallStack.cpp \
+	X86AsmPrinter.cpp \
+	X86AvoidStoreForwardingBlocks.cpp \
 	X86CallFrameOptimization.cpp \
-	X86CallLowering.cpp \
 	X86CallingConv.cpp \
+	X86CallLowering.cpp \
 	X86CmovConversion.cpp \
+	X86DomainReassignment.cpp \
 	X86EvexToVex.cpp\
 	X86ExpandPseudo.cpp \
 	X86FastISel.cpp \
 	X86FixupBWInsts.cpp \
 	X86FixupLEAs.cpp \
 	X86FixupSetCC.cpp \
+	X86FlagsCopyLowering.cpp \
 	X86FloatingPoint.cpp \
 	X86FrameLowering.cpp \
-	X86ISelDAGToDAG.cpp \
-	X86ISelLowering.cpp \
+	X86IndirectBranchTracking.cpp \
 	X86InstrFMA3Info.cpp \
+	X86InstrFoldTables.cpp \
 	X86InstrInfo.cpp \
 	X86InstructionSelector.cpp \
 	X86InterleavedAccess.cpp \
+	X86ISelDAGToDAG.cpp \
+	X86ISelLowering.cpp \
 	X86LegalizerInfo.cpp \
 	X86MachineFunctionInfo.cpp \
 	X86MacroFusion.cpp \
@@ -33,8 +39,10 @@ SRCS+=	X86AsmPrinter.cpp \
 	X86PadShortFunction.cpp \
 	X86RegisterBankInfo.cpp \
 	X86RegisterInfo.cpp \
+	X86RetpolineThunks.cpp \
 	X86SelectionDAGInfo.cpp \
 	X86ShuffleDecodeConstantPool.cpp \
+	X86SpeculativeLoadHardening.cpp \
 	X86Subtarget.cpp \
 	X86TargetMachine.cpp \
 	X86TargetObjectFile.cpp \

Index: src/external/bsd/llvm/lib/libLLVMX86MCTargetDesc/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMX86MCTargetDesc/Makefile:1.8 src/external/bsd/llvm/lib/libLLVMX86MCTargetDesc/Makefile:1.9
--- src/external/bsd/llvm/lib/libLLVMX86MCTargetDesc/Makefile:1.8	Wed Jan 11 12:02:31 2017
+++ src/external/bsd/llvm/lib/libLLVMX86MCTargetDesc/Makefile	Tue Jul 17 18:55:29 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2017/01/11 12:02:31 joerg Exp $
+#	$NetBSD: Makefile,v 1.9 2018/07/17 18:55:29 joerg Exp $
 
 LIB=	LLVMX86MCTargetDesc
 
@@ -11,12 +11,13 @@ CPPFLAGS+=	-I${X86_OBJDIR} -I${LLVM_SRCD
 
 SRCS+=	X86AsmBackend.cpp \
 	X86ELFObjectWriter.cpp \
+	X86MachObjectWriter.cpp \
 	X86MCAsmInfo.cpp \
 	X86MCCodeEmitter.cpp \
 	X86MCTargetDesc.cpp \
-	X86MachObjectWriter.cpp \
 	X86WinCOFFObjectWriter.cpp \
-	X86WinCOFFStreamer.cpp
+	X86WinCOFFStreamer.cpp \
+	X86WinCOFFTargetStreamer.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>

Index: src/external/bsd/llvm/lib/libLLVMipo/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMipo/Makefile:1.7 src/external/bsd/llvm/lib/libLLVMipo/Makefile:1.8
--- src/external/bsd/llvm/lib/libLLVMipo/Makefile:1.7	Wed Jan 11 12:02:32 2017
+++ src/external/bsd/llvm/lib/libLLVMipo/Makefile	Tue Jul 17 18:55:29 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2017/01/11 12:02:32 joerg Exp $
+#	$NetBSD: Makefile,v 1.8 2018/07/17 18:55:29 joerg Exp $
 
 LIB=	LLVMipo
 
@@ -9,6 +9,8 @@ LIB=	LLVMipo
 SRCS+=	AlwaysInliner.cpp \
 	ArgumentPromotion.cpp \
 	BarrierNoopPass.cpp \
+	BlockExtractor.cpp \
+	CalledValuePropagation.cpp \
 	ConstantMerge.cpp \
 	CrossDSOCFI.cpp \
 	DeadArgumentElimination.cpp \
@@ -20,12 +22,12 @@ SRCS+=	AlwaysInliner.cpp \
 	GlobalDCE.cpp \
 	GlobalOpt.cpp \
 	GlobalSplit.cpp \
-	IPConstantPropagation.cpp \
-	IPO.cpp \
 	InferFunctionAttrs.cpp \
-	InlineSimple.cpp \
 	Inliner.cpp \
+	InlineSimple.cpp \
 	Internalize.cpp \
+	IPConstantPropagation.cpp \
+	IPO.cpp \
 	LoopExtractor.cpp \
 	LowerTypeTests.cpp \
 	MergeFunctions.cpp \
@@ -33,8 +35,10 @@ SRCS+=	AlwaysInliner.cpp \
 	PassManagerBuilder.cpp \
 	PruneEH.cpp \
 	SampleProfile.cpp \
+	SCCP.cpp \
 	StripDeadPrototypes.cpp \
 	StripSymbols.cpp \
+	SyntheticCountsPropagation.cpp \
 	ThinLTOBitcodeWriter.cpp \
 	WholeProgramDevirt.cpp
 

Index: src/external/bsd/llvm/lib/libclangAST/Makefile
diff -u src/external/bsd/llvm/lib/libclangAST/Makefile:1.15 src/external/bsd/llvm/lib/libclangAST/Makefile:1.16
--- src/external/bsd/llvm/lib/libclangAST/Makefile:1.15	Tue Aug  1 20:07:42 2017
+++ src/external/bsd/llvm/lib/libclangAST/Makefile	Tue Jul 17 18:55:29 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2017/08/01 20:07:42 joerg Exp $
+#	$NetBSD: Makefile,v 1.16 2018/07/17 18:55:29 joerg Exp $
 
 LIB=	clangAST
 
@@ -22,6 +22,8 @@ SRCS+=	APValue.cpp \
 	CommentLexer.cpp \
 	CommentParser.cpp \
 	CommentSema.cpp \
+	ComparisonCategories.cpp \
+	DataCollection.cpp \
 	Decl.cpp \
 	DeclarationName.cpp \
 	DeclBase.cpp \
@@ -50,6 +52,7 @@ SRCS+=	APValue.cpp \
 	ODRHash.cpp \
 	OpenMPClause.cpp \
 	ParentMap.cpp \
+	QualTypeNames.cpp \
 	RawCommentList.cpp \
 	RecordLayout.cpp \
 	RecordLayoutBuilder.cpp \

Index: src/external/bsd/llvm/lib/libclangAnalysis/Makefile
diff -u src/external/bsd/llvm/lib/libclangAnalysis/Makefile:1.14 src/external/bsd/llvm/lib/libclangAnalysis/Makefile:1.15
--- src/external/bsd/llvm/lib/libclangAnalysis/Makefile:1.14	Wed Jan 11 12:02:32 2017
+++ src/external/bsd/llvm/lib/libclangAnalysis/Makefile	Tue Jul 17 18:55:30 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2017/01/11 12:02:32 joerg Exp $
+#	$NetBSD: Makefile,v 1.15 2018/07/17 18:55:30 joerg Exp $
 
 LIB=	clangAnalysis
 
@@ -15,6 +15,7 @@ SRCS+=	AnalysisDeclContext.cpp \
 	CloneDetection.cpp \
 	CocoaConventions.cpp \
 	CodeInjector.cpp \
+	ConstructionContext.cpp \
 	Consumed.cpp \
 	Dominators.cpp \
 	FormatString.cpp \

Index: src/external/bsd/llvm/lib/libclangBasic/Makefile
diff -u src/external/bsd/llvm/lib/libclangBasic/Makefile:1.16 src/external/bsd/llvm/lib/libclangBasic/Makefile:1.17
--- src/external/bsd/llvm/lib/libclangBasic/Makefile:1.16	Tue Aug  1 20:07:42 2017
+++ src/external/bsd/llvm/lib/libclangBasic/Makefile	Tue Jul 17 18:55:30 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2017/08/01 20:07:42 joerg Exp $
+#	$NetBSD: Makefile,v 1.17 2018/07/17 18:55:30 joerg Exp $
 
 LIB=	clangBasic
 
@@ -23,6 +23,7 @@ SRCS+=	Attributes.cpp \
 	OpenMPKinds.cpp \
 	OperatorPrecedence.cpp \
 	SanitizerBlacklist.cpp \
+	SanitizerSpecialCaseList.cpp \
 	Sanitizers.cpp \
 	SourceLocation.cpp \
 	SourceManager.cpp \
@@ -30,11 +31,39 @@ SRCS+=	Attributes.cpp \
 	Targets.cpp \
 	TokenKinds.cpp \
 	Version.cpp \
-	VersionTuple.cpp \
 	VirtualFileSystem.cpp \
 	Warnings.cpp \
+	XRayInstr.cpp \
 	XRayLists.cpp
 
+.PATH: ${CLANG_SRCDIR}/lib/Basic/Targets
+
+SRCS+=	AArch64.cpp \
+	AMDGPU.cpp \
+	ARM.cpp \
+	AVR.cpp \
+	BPF.cpp \
+	Hexagon.cpp \
+	Lanai.cpp \
+	Le64.cpp \
+	MSP430.cpp \
+	Mips.cpp \
+	NVPTX.cpp \
+	Nios2.cpp \
+	OSTargets.cpp \
+	PNaCl.cpp \
+	PPC.cpp \
+	RISCV.cpp \
+	SPIR.cpp \
+	Sparc.cpp \
+	SystemZ.cpp \
+	TCE.cpp \
+	WebAssembly.cpp \
+	X86.cpp \
+	XCore.cpp
+
+CPPFLAGS+=	-I${CLANG_SRCDIR}/lib/Basic
+
 CPPFLAGS.Version.cpp=	-DSVN_REVISION=\"${CLANG_REVISION}\" \
 			-DLLVM_REVISION=\"${LLVM_REVISION}\"
 

Index: src/external/bsd/llvm/lib/libclangCodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libclangCodeGen/Makefile:1.15 src/external/bsd/llvm/lib/libclangCodeGen/Makefile:1.16
--- src/external/bsd/llvm/lib/libclangCodeGen/Makefile:1.15	Tue Aug  1 20:07:42 2017
+++ src/external/bsd/llvm/lib/libclangCodeGen/Makefile	Tue Jul 17 18:55:30 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2017/08/01 20:07:42 joerg Exp $
+#	$NetBSD: Makefile,v 1.16 2018/07/17 18:55:30 joerg Exp $
 
 LIB=	clangCodeGen
 
@@ -30,6 +30,7 @@ SRCS+=	BackendUtil.cpp \
 	CGExprScalar.cpp \
 	CGGPUBuiltin.cpp \
 	CGLoopInfo.cpp \
+	CGNonTrivialStruct.cpp \
 	CGObjC.cpp \
 	CGObjCGNU.cpp \
 	CGObjCMac.cpp \

Index: src/external/bsd/llvm/lib/libclangDriver/Makefile
diff -u src/external/bsd/llvm/lib/libclangDriver/Makefile:1.12 src/external/bsd/llvm/lib/libclangDriver/Makefile:1.13
--- src/external/bsd/llvm/lib/libclangDriver/Makefile:1.12	Tue Aug  1 20:07:42 2017
+++ src/external/bsd/llvm/lib/libclangDriver/Makefile	Tue Jul 17 18:55:30 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2017/08/01 20:07:42 joerg Exp $
+#	$NetBSD: Makefile,v 1.13 2018/07/17 18:55:30 joerg Exp $
 
 LIB=	clangDriver
 
@@ -28,7 +28,6 @@ SRCS+=	AMDGPU.cpp \
 	AVR.cpp \
 	Ananas.cpp \
 	BareMetal.cpp \
-	Bitrig.cpp \
 	Clang.cpp \
 	CloudABI.cpp \
 	CommonArgs.cpp \
@@ -41,6 +40,7 @@ SRCS+=	AMDGPU.cpp \
 	Fuchsia.cpp \
 	Gnu.cpp \
 	Haiku.cpp \
+	HIP.cpp \
 	Hexagon.cpp \
 	Linux.cpp \
 	MinGW.cpp \
@@ -63,6 +63,7 @@ SRCS+=	AArch64.cpp \
 	ARM.cpp \
 	Mips.cpp \
 	PPC.cpp \
+	RISCV.cpp \
 	Sparc.cpp \
 	SystemZ.cpp \
 	X86.cpp

Index: src/external/bsd/llvm/lib/libclangFrontend/Makefile
diff -u src/external/bsd/llvm/lib/libclangFrontend/Makefile:1.16 src/external/bsd/llvm/lib/libclangFrontend/Makefile:1.17
--- src/external/bsd/llvm/lib/libclangFrontend/Makefile:1.16	Tue Aug  1 20:07:43 2017
+++ src/external/bsd/llvm/lib/libclangFrontend/Makefile	Tue Jul 17 18:55:30 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2017/08/01 20:07:43 joerg Exp $
+#	$NetBSD: Makefile,v 1.17 2018/07/17 18:55:30 joerg Exp $
 
 LIB=	clangFrontend
 
@@ -22,6 +22,7 @@ SRCS+=	ASTConsumers.cpp \
 	FrontendAction.cpp \
 	FrontendActions.cpp \
 	FrontendOptions.cpp \
+	FrontendTiming.cpp \
 	HeaderIncludeGen.cpp \
 	InitHeaderSearch.cpp \
 	InitPreprocessor.cpp \

Index: src/external/bsd/llvm/lib/libclangSema/Makefile
diff -u src/external/bsd/llvm/lib/libclangSema/Makefile:1.16 src/external/bsd/llvm/lib/libclangSema/Makefile:1.17
--- src/external/bsd/llvm/lib/libclangSema/Makefile:1.16	Sat Feb 27 21:47:35 2016
+++ src/external/bsd/llvm/lib/libclangSema/Makefile	Tue Jul 17 18:55:30 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2016/02/27 21:47:35 joerg Exp $
+#	$NetBSD: Makefile,v 1.17 2018/07/17 18:55:30 joerg Exp $
 
 LIB=	clangSema
 
@@ -7,13 +7,13 @@ LIB=	clangSema
 .PATH: ${CLANG_SRCDIR}/lib/Sema
 
 SRCS+=	AnalysisBasedWarnings.cpp \
-	AttributeList.cpp \
 	CodeCompleteConsumer.cpp \
 	DeclSpec.cpp \
 	DelayedDiagnostic.cpp \
 	IdentifierResolver.cpp \
 	JumpDiagnostics.cpp \
 	MultiplexExternalSemaSource.cpp \
+	ParsedAttr.cpp \
 	Scope.cpp \
 	ScopeInfo.cpp \
 	Sema.cpp \

Index: src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile
diff -u src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile:1.27 src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile:1.28
--- src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile:1.27	Tue Aug  1 20:07:43 2017
+++ src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile	Tue Jul 17 18:55:30 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2017/08/01 20:07:43 joerg Exp $
+#	$NetBSD: Makefile,v 1.28 2018/07/17 18:55:30 joerg Exp $
 
 LIB=	clangStaticAnalyzerCheckers
 
@@ -16,23 +16,25 @@ SRCS+=	AllocationDiagnostics.cpp \
 	BlockInCriticalSectionChecker.cpp \
 	BoolAssignmentChecker.cpp \
 	BuiltinFunctionChecker.cpp \
-	CXXSelfAssignmentChecker.cpp \
-	ClangCheckers.cpp \
-	CStringChecker.cpp \
-	CStringSyntaxChecker.cpp \
 	CallAndMessageChecker.cpp \
 	CastSizeChecker.cpp \
 	CastToStructChecker.cpp \
+	CheckerDocumentation.cpp \
 	CheckObjCDealloc.cpp \
 	CheckObjCInstMethSignature.cpp \
 	CheckSecuritySyntaxOnly.cpp \
 	CheckSizeofPointer.cpp \
-	CheckerDocumentation.cpp \
 	ChrootChecker.cpp \
+	ClangCheckers.cpp \
 	CloneChecker.cpp \
 	ConversionChecker.cpp \
+	CStringChecker.cpp \
+	CStringSyntaxChecker.cpp \
+	CXXSelfAssignmentChecker.cpp \
+	DanglingInternalBufferChecker.cpp \
 	DeadStoresChecker.cpp \
 	DebugCheckers.cpp \
+	DeleteWithNonVirtualDtorChecker.cpp \
 	DereferenceChecker.cpp \
 	DirectIvarAssignment.cpp \
 	DivZeroChecker.cpp \
@@ -40,29 +42,33 @@ SRCS+=	AllocationDiagnostics.cpp \
 	DynamicTypePropagation.cpp \
 	ExprInspectionChecker.cpp \
 	FixedAddressChecker.cpp \
-	GTestChecker.cpp \
+	GCDAntipatternChecker.cpp \
 	GenericTaintChecker.cpp \
+	GTestChecker.cpp \
 	IdenticalExprChecker.cpp \
 	IteratorChecker.cpp \
 	IvarInvalidationChecker.cpp \
 	LLVMConventionsChecker.cpp \
 	LocalizationChecker.cpp \
-	MPIBugReporter.cpp \
-	MPIChecker.cpp \
-	MPIFunctionClassifier.cpp \
 	MacOSKeychainAPIChecker.cpp \
 	MacOSXAPIChecker.cpp \
 	MallocChecker.cpp \
 	MallocOverflowSecurityChecker.cpp \
 	MallocSizeofChecker.cpp \
 	MisusedMovedObjectChecker.cpp \
+	MmapWriteExecChecker.cpp \
+	MPIBugReporter.cpp \
+	MPIChecker.cpp \
+	MPIFunctionClassifier.cpp \
+	NonnullGlobalConstantsChecker.cpp \
+	NonNullParamChecker.cpp \
+	NoReturnFunctionChecker.cpp \
 	NSAutoreleasePoolChecker.cpp \
 	NSErrorChecker.cpp \
-	NoReturnFunctionChecker.cpp \
-	NonNullParamChecker.cpp \
 	NullabilityChecker.cpp \
 	NumberObjectConversionChecker.cpp \
 	ObjCAtSyncChecker.cpp \
+	ObjCAutoreleaseWriteChecker.cpp \
 	ObjCContainersASTChecker.cpp \
 	ObjCContainersChecker.cpp \
 	ObjCMissingSuperCallChecker.cpp \
@@ -84,17 +90,19 @@ SRCS+=	AllocationDiagnostics.cpp \
 	TaintTesterChecker.cpp \
 	TestAfterDivZeroChecker.cpp \
 	TraversalChecker.cpp \
+	TrustNonnullChecker.cpp \
 	UndefBranchChecker.cpp \
 	UndefCapturedBlockVarChecker.cpp \
-	UndefResultChecker.cpp \
 	UndefinedArraySubscriptChecker.cpp \
 	UndefinedAssignmentChecker.cpp \
+	UndefResultChecker.cpp \
+	UninitializedObjectChecker.cpp \
 	UnixAPIChecker.cpp \
 	UnreachableCodeChecker.cpp \
-	VLASizeChecker.cpp \
 	ValistChecker.cpp \
 	VforkChecker.cpp \
-	VirtualCallChecker.cpp
+	VirtualCallChecker.cpp \
+	VLASizeChecker.cpp
 
 .include "${.PARSEDIR}/../../tablegen.mk"
 

Index: src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile
diff -u src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile:1.16 src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile:1.17
--- src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile:1.16	Tue Aug  1 20:07:43 2017
+++ src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile	Tue Jul 17 18:55:30 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2017/08/01 20:07:43 joerg Exp $
+#	$NetBSD: Makefile,v 1.17 2018/07/17 18:55:30 joerg Exp $
 
 LIB=	clangStaticAnalyzerCore
 
@@ -14,8 +14,8 @@ SRCS+=	APSIntType.cpp \
 	BugReporter.cpp \
 	BugReporterVisitors.cpp \
 	CallEvent.cpp \
-	Checker.cpp \
 	CheckerContext.cpp \
+	Checker.cpp \
 	CheckerHelpers.cpp \
 	CheckerManager.cpp \
 	CheckerRegistry.cpp \
@@ -25,14 +25,15 @@ SRCS+=	APSIntType.cpp \
 	DynamicTypeMap.cpp \
 	Environment.cpp \
 	ExplodedGraph.cpp \
-	ExprEngine.cpp \
+	ExprEngineCallAndReturn.cpp \
 	ExprEngineC.cpp \
+	ExprEngine.cpp \
 	ExprEngineCXX.cpp \
-	ExprEngineCallAndReturn.cpp \
 	ExprEngineObjC.cpp \
 	FunctionSummary.cpp \
 	HTMLDiagnostics.cpp \
 	IssueHash.cpp \
+	LoopUnrolling.cpp \
 	LoopWidening.cpp \
 	MemRegion.cpp \
 	PathDiagnostic.cpp \
@@ -44,10 +45,11 @@ SRCS+=	APSIntType.cpp \
 	SimpleConstraintManager.cpp \
 	SimpleSValBuilder.cpp \
 	Store.cpp \
+	SubEngine.cpp \
 	SValBuilder.cpp \
 	SVals.cpp \
-	SubEngine.cpp \
 	SymbolManager.cpp \
+	WorkList.cpp \
 	Z3ConstraintManager.cpp
 
 .if defined(HOSTLIB)

Index: src/external/bsd/llvm/lib/libclangTooling/Makefile
diff -u src/external/bsd/llvm/lib/libclangTooling/Makefile:1.9 src/external/bsd/llvm/lib/libclangTooling/Makefile:1.10
--- src/external/bsd/llvm/lib/libclangTooling/Makefile:1.9	Wed Jan 11 12:02:32 2017
+++ src/external/bsd/llvm/lib/libclangTooling/Makefile	Tue Jul 17 18:55:30 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2017/01/11 12:02:32 joerg Exp $
+#	$NetBSD: Makefile,v 1.10 2018/07/17 18:55:30 joerg Exp $
 
 LIB=	clangTooling
 
@@ -7,13 +7,17 @@ LIB=	clangTooling
 .PATH: ${CLANG_SRCDIR}/lib/Tooling
 
 SRCS+=	ArgumentsAdjusters.cpp \
+	AllTUsExecution.cpp \
 	CommonOptionsParser.cpp \
 	CompilationDatabase.cpp \
+	Execution.cpp \
 	FileMatchTrie.cpp \
 	FixIt.cpp \
+	InterpolatingCompilationDatabase.cpp \
 	JSONCompilationDatabase.cpp \
-	Refactoring.cpp \
 	RefactoringCallbacks.cpp \
+	Refactoring.cpp \
+	StandaloneExecution.cpp \
 	Tooling.cpp
 
 .if defined(HOSTLIB)

Index: src/external/bsd/llvm/lib/libclangToolingCore/Makefile
diff -u src/external/bsd/llvm/lib/libclangToolingCore/Makefile:1.3 src/external/bsd/llvm/lib/libclangToolingCore/Makefile:1.4
--- src/external/bsd/llvm/lib/libclangToolingCore/Makefile:1.3	Wed Jan 11 12:02:32 2017
+++ src/external/bsd/llvm/lib/libclangToolingCore/Makefile	Tue Jul 17 18:55:30 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2017/01/11 12:02:32 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2018/07/17 18:55:30 joerg Exp $
 
 LIB=	clangToolingCore
 
@@ -8,7 +8,6 @@ LIB=	clangToolingCore
 
 SRCS+=	Diagnostic.cpp \
 	Lookup.cpp \
-	QualTypeNames.cpp \
 	Replacement.cpp
 
 .if defined(HOSTLIB)

Index: src/external/bsd/llvm/lib/libclangToolingRefactoring/Makefile
diff -u src/external/bsd/llvm/lib/libclangToolingRefactoring/Makefile:1.1 src/external/bsd/llvm/lib/libclangToolingRefactoring/Makefile:1.2
--- src/external/bsd/llvm/lib/libclangToolingRefactoring/Makefile:1.1	Tue Aug  1 20:07:43 2017
+++ src/external/bsd/llvm/lib/libclangToolingRefactoring/Makefile	Tue Jul 17 18:55:31 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2017/08/01 20:07:43 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2018/07/17 18:55:31 joerg Exp $
 
 LIB=	clangToolingRefactoring
 
@@ -6,11 +6,20 @@ LIB=	clangToolingRefactoring
 
 .PATH: ${CLANG_SRCDIR}/lib/Tooling/Refactoring
 
-SRCS+=	AtomicChange.cpp
+SRCS+=	ASTSelection.cpp \
+	ASTSelectionRequirements.cpp \
+	AtomicChange.cpp \
+	RefactoringActions.cpp
+
+.PATH: ${CLANG_SRCDIR}/lib/Tooling/Refactoring/Extract
+
+SRCS+=	Extract.cpp \
+	SourceExtraction.cpp
 
 .PATH: ${CLANG_SRCDIR}/lib/Tooling/Refactoring/Rename
 
 SRCS+=	RenamingAction.cpp \
+	SymbolOccurrences.cpp \
 	USRFinder.cpp \
 	USRFindingAction.cpp \
 	USRLocFinder.cpp

Added files:

Index: src/external/bsd/llvm/bin/llvm-objcopy/Makefile
diff -u /dev/null src/external/bsd/llvm/bin/llvm-objcopy/Makefile:1.1
--- /dev/null	Tue Jul 17 18:55:32 2018
+++ src/external/bsd/llvm/bin/llvm-objcopy/Makefile	Tue Jul 17 18:55:26 2018
@@ -0,0 +1,28 @@
+#	$NetBSD: Makefile,v 1.1 2018/07/17 18:55:26 joerg Exp $
+
+PROG_CXX=	llvm-objcopy
+NOMAN=		yes
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/tools/llvm-objcopy
+
+SRCS=	Object.cpp \
+	llvm-objcopy.cpp
+
+TABLEGEN_SRC=		ObjcopyOpts.td StripOpts.td
+TABLEGEN_OUTPUT.ObjcopyOpts.td= \
+	ObjcopyOpts.inc|-gen-opt-parser-defs
+
+TABLEGEN_OUTPUT.StripOpts.td= \
+	StripOpts.inc|-gen-opt-parser-defs
+.include "${.PARSEDIR}/../../tablegen.mk"
+
+LLVM_LIBS+= \
+
+LDADD+=	-lz
+DPADD+=	${LIBZ}
+
+.include "${.PARSEDIR}/../../link.mk"
+
+.include <bsd.prog.mk>

Index: src/external/bsd/llvm/lib/libLLVMARMUtils/Makefile
diff -u /dev/null src/external/bsd/llvm/lib/libLLVMARMUtils/Makefile:1.1
--- /dev/null	Tue Jul 17 18:55:32 2018
+++ src/external/bsd/llvm/lib/libLLVMARMUtils/Makefile	Tue Jul 17 18:55:27 2018
@@ -0,0 +1,18 @@
+#	$NetBSD: Makefile,v 1.1 2018/07/17 18:55:27 joerg Exp $
+
+LIB=	LLVMARMUtils
+
+.include <bsd.init.mk>
+
+ARM_OBJDIR!=	cd ${.CURDIR}/../libLLVMARMCodeGen && ${PRINTOBJDIR}
+CPPFLAGS+=	-I${ARM_OBJDIR} -I${LLVM_SRCDIR}/lib/Target/ARM
+
+.PATH: ${LLVM_SRCDIR}/lib/Target/ARM/Utils
+
+SRCS+=	ARMBaseInfo.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif

Index: src/external/bsd/llvm/lib/libLLVMDebugInfoPDBDIA/Makefile
diff -u /dev/null src/external/bsd/llvm/lib/libLLVMDebugInfoPDBDIA/Makefile:1.1
--- /dev/null	Tue Jul 17 18:55:32 2018
+++ src/external/bsd/llvm/lib/libLLVMDebugInfoPDBDIA/Makefile	Tue Jul 17 18:55:27 2018
@@ -0,0 +1,20 @@
+#	$NetBSD: Makefile,v 1.1 2018/07/17 18:55:27 joerg Exp $
+
+LIB=	LLVMDebugInfoPDBDIA
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/DebugInfo/PDB/DIA
+
+SRCS+=	DIAEnumInjectedSources.cpp \
+	DIAEnumSectionContribs.cpp \
+	DIAEnumTables.cpp \
+	DIAInjectedSource.cpp \
+	DIASectionContrib.cpp \
+	DIATable.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif

Index: src/external/bsd/llvm/lib/libLLVMTransformsAggressiveInstCombine/Makefile
diff -u /dev/null src/external/bsd/llvm/lib/libLLVMTransformsAggressiveInstCombine/Makefile:1.1
--- /dev/null	Tue Jul 17 18:55:32 2018
+++ src/external/bsd/llvm/lib/libLLVMTransformsAggressiveInstCombine/Makefile	Tue Jul 17 18:55:29 2018
@@ -0,0 +1,16 @@
+#	$NetBSD: Makefile,v 1.1 2018/07/17 18:55:29 joerg Exp $
+
+LIB=	LLVMTransformsAggressiveInstCombine
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/Transforms/AggressiveInstCombine
+
+SRCS+=	AggressiveInstCombine.cpp \
+	TruncInstCombine.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif

Index: src/external/bsd/llvm/lib/libclangCrossTU/Makefile
diff -u /dev/null src/external/bsd/llvm/lib/libclangCrossTU/Makefile:1.1
--- /dev/null	Tue Jul 17 18:55:32 2018
+++ src/external/bsd/llvm/lib/libclangCrossTU/Makefile	Tue Jul 17 18:55:30 2018
@@ -0,0 +1,15 @@
+#	$NetBSD: Makefile,v 1.1 2018/07/17 18:55:30 joerg Exp $
+
+LIB=	clangCrossTU
+
+.include <bsd.init.mk>
+
+.PATH: ${CLANG_SRCDIR}/lib/CrossTU
+
+SRCS+=	CrossTranslationUnit.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif

Index: src/external/bsd/llvm/lib/libclangToolingASTDiff/Makefile
diff -u /dev/null src/external/bsd/llvm/lib/libclangToolingASTDiff/Makefile:1.1
--- /dev/null	Tue Jul 17 18:55:32 2018
+++ src/external/bsd/llvm/lib/libclangToolingASTDiff/Makefile	Tue Jul 17 18:55:30 2018
@@ -0,0 +1,15 @@
+#	$NetBSD: Makefile,v 1.1 2018/07/17 18:55:30 joerg Exp $
+
+LIB=	clangASTDiff
+
+.include <bsd.init.mk>
+
+.PATH: ${CLANG_SRCDIR}/lib/Tooling/ASTDiff
+
+SRCS+=	ASTDiff.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif

Index: src/external/bsd/llvm/lib/libclangToolingInclusions/Makefile
diff -u /dev/null src/external/bsd/llvm/lib/libclangToolingInclusions/Makefile:1.1
--- /dev/null	Tue Jul 17 18:55:32 2018
+++ src/external/bsd/llvm/lib/libclangToolingInclusions/Makefile	Tue Jul 17 18:55:31 2018
@@ -0,0 +1,16 @@
+#	$NetBSD: Makefile,v 1.1 2018/07/17 18:55:31 joerg Exp $
+
+LIB=	clangToolingInclusions
+
+.include <bsd.init.mk>
+
+.PATH: ${CLANG_SRCDIR}/lib/Tooling/Inclusions
+
+SRCS+=	HeaderIncludes.cpp \
+	IncludeStyle.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif

Index: src/tools/llvm-lib/libLLVMARMUtils/Makefile
diff -u /dev/null src/tools/llvm-lib/libLLVMARMUtils/Makefile:1.1
--- /dev/null	Tue Jul 17 18:55:32 2018
+++ src/tools/llvm-lib/libLLVMARMUtils/Makefile	Tue Jul 17 18:55:31 2018
@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2018/07/17 18:55:31 joerg Exp $
+
+.include <bsd.init.mk>

Index: src/tools/llvm-lib/libLLVMTransformsAggressiveInstCombine/Makefile
diff -u /dev/null src/tools/llvm-lib/libLLVMTransformsAggressiveInstCombine/Makefile:1.1
--- /dev/null	Tue Jul 17 18:55:32 2018
+++ src/tools/llvm-lib/libLLVMTransformsAggressiveInstCombine/Makefile	Tue Jul 17 18:55:31 2018
@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2018/07/17 18:55:31 joerg Exp $
+
+.include <bsd.init.mk>

Index: src/tools/llvm-lib/libclangCrossTU/Makefile
diff -u /dev/null src/tools/llvm-lib/libclangCrossTU/Makefile:1.1
--- /dev/null	Tue Jul 17 18:55:32 2018
+++ src/tools/llvm-lib/libclangCrossTU/Makefile	Tue Jul 17 18:55:31 2018
@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2018/07/17 18:55:31 joerg Exp $
+
+.include <bsd.init.mk>

CVS commit: src

Reply via email to