Update to a new version (LLVM HEAD is now 9.0.0).

Remove clang headers conflicting with FreeBSD headers.  I'd throught
this was nolonger required, but it seems to still be necessicary in at
least some cases.

Submitted by:	Alfredo Dal'Ava Júnior
Differential Revision:	https://reviews.freebsd.org/D18879

7 files changed, 117 insertions, 68 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 6c6e08dfa7d0..0c859e81eb1e 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -421,6 +421,10 @@ post-patch-CLANG-on:
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format
 
+post-patch-COMPILER_RT-on:
+	cd ${WRKSRC_compiler_rt} && \
+	${PATCH} -p0 < ${PATCHDIR}/compiler-rt-safestack_platform.h
+
 post-build-COMPILER_RT-on:
 	${MKDIR} ${WRKDIR}/compiler-rt-build
 	cd ${WRKDIR}/compiler-rt-build && \
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index 49d554ad5bd3..8e8fdb11a96a 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -4,14 +4,14 @@
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	8
+LLVM_MAJOR=	9
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20190114
+SNAPDATE=	20190118
 
-LLVM_COMMIT=		7cae0753be3bf8bdf753409fe98cf84b6062f386
-CLANG_COMMIT=		cf6bc00ebb7901a8ca51a33510564cd982a22da6
-COMPILER_RT_COMMIT=	02e6c67dee5d39681622fd2c40b827957d550fc3
-EXTRAS_COMMIT=		e0441f6939da38f26bea9c1d75bb33024daa4e40
-LLD_COMMIT=		d6940a2f3ec93fb20fd253f20eeec0fe852241c6
-LLDB_COMMIT=		1a1bd957473a40d6f28a387a9e9900c11e963b5c
-OPENMP_COMMIT=		2355503bd2c84deab180cdf174fb17e2884bdf8d
+LLVM_COMMIT=		5570b0702238f61773d973fe6b8163c535dce2fb
+CLANG_COMMIT=		87155c67f399837e1875acd5658a8ff76c3f3164
+COMPILER_RT_COMMIT=	205e34f422a7d170d8a1e53c2cfe6f38e7ea8659
+EXTRAS_COMMIT=		9e454c861c254debad1a0cbac9a56f8d6f84d058
+LLD_COMMIT=		0a0e0cb4cce9d95873248788de7ba620b6918236
+LLDB_COMMIT=		f031f20ae94286eba6274f7019db47872af033fd
+OPENMP_COMMIT=		e223da31a44825cd907ed89306d8bcf3313b3180
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 6729083a16d6..8d84d097ac46 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1547486342
-SHA256 (llvm-mirror-llvm-8.0.d20190114-7cae0753be3bf8bdf753409fe98cf84b6062f386_GH0.tar.gz) = 2b0274fa7899e2eb99ba6b844ffd1c3503cd55ee193a0ca3211d7535b56ebe5e
-SIZE (llvm-mirror-llvm-8.0.d20190114-7cae0753be3bf8bdf753409fe98cf84b6062f386_GH0.tar.gz) = 45874574
-SHA256 (llvm-mirror-clang-cf6bc00ebb7901a8ca51a33510564cd982a22da6_GH0.tar.gz) = 92eab760bb702bbe5c5dba6c78cc6f61cf0ac5c32e8b21590fe662ae978fdbb5
-SIZE (llvm-mirror-clang-cf6bc00ebb7901a8ca51a33510564cd982a22da6_GH0.tar.gz) = 18040028
-SHA256 (llvm-mirror-compiler-rt-02e6c67dee5d39681622fd2c40b827957d550fc3_GH0.tar.gz) = 7b15bb9947ab260e14e1ae4463ab880e30831d8a76d001b688a006eb7546ad5f
-SIZE (llvm-mirror-compiler-rt-02e6c67dee5d39681622fd2c40b827957d550fc3_GH0.tar.gz) = 3269121
-SHA256 (llvm-mirror-clang-tools-extra-e0441f6939da38f26bea9c1d75bb33024daa4e40_GH0.tar.gz) = 8999fe35237cf59d664588794be728285d93b3608bc1fe67466adc41b453cb16
-SIZE (llvm-mirror-clang-tools-extra-e0441f6939da38f26bea9c1d75bb33024daa4e40_GH0.tar.gz) = 1402848
-SHA256 (llvm-mirror-lld-d6940a2f3ec93fb20fd253f20eeec0fe852241c6_GH0.tar.gz) = 2d8545b5a2578dd5246c1f9dfe0bddcdbdd0e3542ad271b9276611c3f3f4c50d
-SIZE (llvm-mirror-lld-d6940a2f3ec93fb20fd253f20eeec0fe852241c6_GH0.tar.gz) = 1386185
-SHA256 (llvm-mirror-lldb-1a1bd957473a40d6f28a387a9e9900c11e963b5c_GH0.tar.gz) = 3241a23ce25a97093bdd8d304d1b1e635970457ac58fc73f7229ffba014eff4e
-SIZE (llvm-mirror-lldb-1a1bd957473a40d6f28a387a9e9900c11e963b5c_GH0.tar.gz) = 24656169
-SHA256 (llvm-mirror-openmp-2355503bd2c84deab180cdf174fb17e2884bdf8d_GH0.tar.gz) = a67a183342709146ba0135e06aa3b7b00c759cae2357a47579242b7af186156e
-SIZE (llvm-mirror-openmp-2355503bd2c84deab180cdf174fb17e2884bdf8d_GH0.tar.gz) = 1474263
+TIMESTAMP = 1547847258
+SHA256 (llvm-mirror-llvm-9.0.d20190118-5570b0702238f61773d973fe6b8163c535dce2fb_GH0.tar.gz) = 8b359d4ef2a73e044b1d570d7abb343c10842c071121d8d6dff641c36553e5fa
+SIZE (llvm-mirror-llvm-9.0.d20190118-5570b0702238f61773d973fe6b8163c535dce2fb_GH0.tar.gz) = 45954312
+SHA256 (llvm-mirror-clang-87155c67f399837e1875acd5658a8ff76c3f3164_GH0.tar.gz) = 9b3b40f3af59f8552561e9f6da31943133c67a5beec41307515054cd2f1c966e
+SIZE (llvm-mirror-clang-87155c67f399837e1875acd5658a8ff76c3f3164_GH0.tar.gz) = 18070353
+SHA256 (llvm-mirror-compiler-rt-205e34f422a7d170d8a1e53c2cfe6f38e7ea8659_GH0.tar.gz) = 65990ec0cbc58ac0199a7ce9a52fd93df4262b59bf1c7ff5739f57c9ccbffb56
+SIZE (llvm-mirror-compiler-rt-205e34f422a7d170d8a1e53c2cfe6f38e7ea8659_GH0.tar.gz) = 3273195
+SHA256 (llvm-mirror-clang-tools-extra-9e454c861c254debad1a0cbac9a56f8d6f84d058_GH0.tar.gz) = 75a63231dff7b3b89dc4bd9da2b39ce0b43c6d58b8cf373bb97aa221ef163d7f
+SIZE (llvm-mirror-clang-tools-extra-9e454c861c254debad1a0cbac9a56f8d6f84d058_GH0.tar.gz) = 1416456
+SHA256 (llvm-mirror-lld-0a0e0cb4cce9d95873248788de7ba620b6918236_GH0.tar.gz) = 64d9049c5feb83838b1e01eed8630ee12c0229420d44e23b2141ee84c990b680
+SIZE (llvm-mirror-lld-0a0e0cb4cce9d95873248788de7ba620b6918236_GH0.tar.gz) = 1388289
+SHA256 (llvm-mirror-lldb-f031f20ae94286eba6274f7019db47872af033fd_GH0.tar.gz) = 1b3144d9ca3eb3556c25dd991d1f930e955812d4b7e7aca416fd0301d432cdac
+SIZE (llvm-mirror-lldb-f031f20ae94286eba6274f7019db47872af033fd_GH0.tar.gz) = 24665858
+SHA256 (llvm-mirror-openmp-e223da31a44825cd907ed89306d8bcf3313b3180_GH0.tar.gz) = 0f0a4256b3f5d38e261833e26c2121c5214188abf50fc42075875cfd32de7720
+SIZE (llvm-mirror-openmp-e223da31a44825cd907ed89306d8bcf3313b3180_GH0.tar.gz) = 1479385
diff --git a/devel/llvm-devel/files/compiler-rt-safestack_platform.h b/devel/llvm-devel/files/compiler-rt-safestack_platform.h
new file mode 100644
index 000000000000..2f4c5548242f
--- /dev/null
+++ b/devel/llvm-devel/files/compiler-rt-safestack_platform.h
@@ -0,0 +1,13 @@
+--- lib/safestack/safestack_platform.h.orig	2019-01-18 22:19:46.188728000 +0000
++++ lib/safestack/safestack_platform.h	2019-01-18 22:14:46.776765000 +0000
+@@ -20,6 +20,10 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
++#if SANITIZER_FREEBSD
++#include <sys/thr.h>
++#endif
++
+ namespace safestack {
+ 
+ inline pid_t GetTid() {
diff --git a/devel/llvm-devel/files/gen-Makefile.snapshot.sh b/devel/llvm-devel/files/gen-Makefile.snapshot.sh
index b2ca5b0a6da8..03274249197c 100644
--- a/devel/llvm-devel/files/gen-Makefile.snapshot.sh
+++ b/devel/llvm-devel/files/gen-Makefile.snapshot.sh
@@ -17,7 +17,7 @@ cat <<EOF > Makefile.snapshot
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	8
+LLVM_MAJOR=	9
 LLVM_RELEASE=	\${LLVM_MAJOR}.0.0
 SNAPDATE=	$(date +%Y%m%d)
 
diff --git a/devel/llvm-devel/files/patch-tools_clang_lib_Headers_CMakeLists.txt b/devel/llvm-devel/files/patch-tools_clang_lib_Headers_CMakeLists.txt
new file mode 100644
index 000000000000..10efad9db02f
--- /dev/null
+++ b/devel/llvm-devel/files/patch-tools_clang_lib_Headers_CMakeLists.txt
@@ -0,0 +1,44 @@
+--- ./tools/clang/lib/Headers/CMakeLists.txt-orig	2018-10-23 20:12:12.000000000 -0300
++++ ./tools/clang/lib/Headers/CMakeLists.txt	2018-12-06 12:47:11.915695000 -0200
+@@ -47,7 +47,6 @@
+   clwbintrin.h
+   emmintrin.h
+   f16cintrin.h
+-  float.h
+   fma4intrin.h
+   fmaintrin.h
+   fxsrintrin.h
+@@ -56,11 +55,7 @@
+   htmxlintrin.h
+   ia32intrin.h
+   immintrin.h
+-  intrin.h
+-  inttypes.h
+   invpcidintrin.h
+-  iso646.h
+-  limits.h
+   lwpintrin.h
+   lzcntintrin.h
+   mm3dnow.h
+@@ -84,21 +79,11 @@
+   s390intrin.h
+   shaintrin.h
+   smmintrin.h
+-  stdalign.h
+-  stdarg.h
+-  stdatomic.h
+-  stdbool.h
+-  stddef.h
+   __stddef_max_align_t.h
+-  stdint.h
+-  stdnoreturn.h
+   tbmintrin.h
+-  tgmath.h
+   tmmintrin.h
+-  unwind.h
+   vadefs.h
+   vaesintrin.h
+-  varargs.h
+   vecintrin.h
+   vpclmulqdqintrin.h
+   waitpkgintrin.h
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 286e1d19dc9a..80e2a25a2d17 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -386,12 +386,11 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Basic/BuiltinsMips.def
 %%CLANG%%llvm-devel/include/clang/Basic/BuiltinsNEON.def
 %%CLANG%%llvm-devel/include/clang/Basic/BuiltinsNVPTX.def
-%%CLANG%%llvm-devel/include/clang/Basic/BuiltinsNios2.def
 %%CLANG%%llvm-devel/include/clang/Basic/BuiltinsPPC.def
 %%CLANG%%llvm-devel/include/clang/Basic/BuiltinsSystemZ.def
 %%CLANG%%llvm-devel/include/clang/Basic/BuiltinsWebAssembly.def
-%%CLANG%%llvm-devel/include/clang/Basic/BuiltinsX%%LLVM_MAJOR%%6.def
-%%CLANG%%llvm-devel/include/clang/Basic/BuiltinsX%%LLVM_MAJOR%%6_64.def
+%%CLANG%%llvm-devel/include/clang/Basic/BuiltinsX86.def
+%%CLANG%%llvm-devel/include/clang/Basic/BuiltinsX86_64.def
 %%CLANG%%llvm-devel/include/clang/Basic/BuiltinsXCore.def
 %%CLANG%%llvm-devel/include/clang/Basic/CapturedStmt.h
 %%CLANG%%llvm-devel/include/clang/Basic/CharInfo.h
@@ -444,6 +443,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Basic/LangOptions.def
 %%CLANG%%llvm-devel/include/clang/Basic/LangOptions.h
 %%CLANG%%llvm-devel/include/clang/Basic/Linkage.h
+%%CLANG%%llvm-devel/include/clang/Basic/MSP430Target.def
 %%CLANG%%llvm-devel/include/clang/Basic/MacroBuilder.h
 %%CLANG%%llvm-devel/include/clang/Basic/MemoryBufferCache.h
 %%CLANG%%llvm-devel/include/clang/Basic/Module.h
@@ -482,7 +482,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Basic/Version.h
 %%CLANG%%llvm-devel/include/clang/Basic/Version.inc
 %%CLANG%%llvm-devel/include/clang/Basic/Visibility.h
-%%CLANG%%llvm-devel/include/clang/Basic/X%%LLVM_MAJOR%%6Target.def
+%%CLANG%%llvm-devel/include/clang/Basic/X86Target.def
 %%CLANG%%llvm-devel/include/clang/Basic/XRayInstr.h
 %%CLANG%%llvm-devel/include/clang/Basic/XRayLists.h
 %%CLANG%%llvm-devel/include/clang/Basic/arm_fp16.inc
@@ -1519,8 +1519,8 @@ llvm-devel/include/llvm/BinaryFormat/ELFRelocs/PowerPC64.def
 llvm-devel/include/llvm/BinaryFormat/ELFRelocs/RISCV.def
 llvm-devel/include/llvm/BinaryFormat/ELFRelocs/Sparc.def
 llvm-devel/include/llvm/BinaryFormat/ELFRelocs/SystemZ.def
-llvm-devel/include/llvm/BinaryFormat/ELFRelocs/i3%%LLVM_MAJOR%%6.def
-llvm-devel/include/llvm/BinaryFormat/ELFRelocs/x%%LLVM_MAJOR%%6_64.def
+llvm-devel/include/llvm/BinaryFormat/ELFRelocs/i386.def
+llvm-devel/include/llvm/BinaryFormat/ELFRelocs/x86_64.def
 llvm-devel/include/llvm/BinaryFormat/MachO.def
 llvm-devel/include/llvm/BinaryFormat/MachO.h
 llvm-devel/include/llvm/BinaryFormat/Magic.h
@@ -1565,6 +1565,8 @@ llvm-devel/include/llvm/CodeGen/FunctionLoweringInfo.h
 llvm-devel/include/llvm/CodeGen/GCMetadata.h
 llvm-devel/include/llvm/CodeGen/GCMetadataPrinter.h
 llvm-devel/include/llvm/CodeGen/GCStrategy.h
+llvm-devel/include/llvm/CodeGen/GlobalISel/CSEInfo.h
+llvm-devel/include/llvm/CodeGen/GlobalISel/CSEMIRBuilder.h
 llvm-devel/include/llvm/CodeGen/GlobalISel/CallLowering.h
 llvm-devel/include/llvm/CodeGen/GlobalISel/Combiner.h
 llvm-devel/include/llvm/CodeGen/GlobalISel/CombinerHelper.h
@@ -1633,6 +1635,7 @@ llvm-devel/include/llvm/CodeGen/MachineOperand.h
 llvm-devel/include/llvm/CodeGen/MachineOptimizationRemarkEmitter.h
 llvm-devel/include/llvm/CodeGen/MachineOutliner.h
 llvm-devel/include/llvm/CodeGen/MachinePassRegistry.h
+llvm-devel/include/llvm/CodeGen/MachinePipeliner.h
 llvm-devel/include/llvm/CodeGen/MachinePostDominators.h
 llvm-devel/include/llvm/CodeGen/MachineRegionInfo.h
 llvm-devel/include/llvm/CodeGen/MachineRegisterInfo.h
@@ -1913,8 +1916,8 @@ llvm-devel/include/llvm/DebugInfo/PDB/UDTLayout.h
 llvm-devel/include/llvm/DebugInfo/Symbolize/DIPrinter.h
 llvm-devel/include/llvm/DebugInfo/Symbolize/SymbolizableModule.h
 llvm-devel/include/llvm/DebugInfo/Symbolize/Symbolize.h
-llvm-devel/include/llvm/Demangle/Compiler.h
 llvm-devel/include/llvm/Demangle/Demangle.h
+llvm-devel/include/llvm/Demangle/DemangleConfig.h
 llvm-devel/include/llvm/Demangle/ItaniumDemangle.h
 llvm-devel/include/llvm/Demangle/MicrosoftDemangle.h
 llvm-devel/include/llvm/Demangle/MicrosoftDemangleNodes.h
@@ -2031,7 +2034,7 @@ llvm-devel/include/llvm/IR/IntrinsicsPowerPC.td
 llvm-devel/include/llvm/IR/IntrinsicsRISCV.td
 llvm-devel/include/llvm/IR/IntrinsicsSystemZ.td
 llvm-devel/include/llvm/IR/IntrinsicsWebAssembly.td
-llvm-devel/include/llvm/IR/IntrinsicsX%%LLVM_MAJOR%%6.td
+llvm-devel/include/llvm/IR/IntrinsicsX86.td
 llvm-devel/include/llvm/IR/IntrinsicsXCore.td
 llvm-devel/include/llvm/IR/LLVMContext.h
 llvm-devel/include/llvm/IR/LegacyPassManager.h
@@ -2322,7 +2325,7 @@ llvm-devel/include/llvm/Support/ItaniumManglingCanonicalizer.h
 llvm-devel/include/llvm/Support/JSON.h
 llvm-devel/include/llvm/Support/JamCRC.h
 llvm-devel/include/llvm/Support/KnownBits.h
-llvm-devel/include/llvm/Support/LEB12%%LLVM_MAJOR%%.h
+llvm-devel/include/llvm/Support/LEB128.h
 llvm-devel/include/llvm/Support/LICENSE.TXT
 llvm-devel/include/llvm/Support/LineIterator.h
 llvm-devel/include/llvm/Support/Locale.h
@@ -2397,8 +2400,8 @@ llvm-devel/include/llvm/Support/Watchdog.h
 llvm-devel/include/llvm/Support/Win64EH.h
 llvm-devel/include/llvm/Support/WindowsError.h
 llvm-devel/include/llvm/Support/WithColor.h
-llvm-devel/include/llvm/Support/X%%LLVM_MAJOR%%6DisassemblerDecoderCommon.h
-llvm-devel/include/llvm/Support/X%%LLVM_MAJOR%%6TargetParser.def
+llvm-devel/include/llvm/Support/X86DisassemblerDecoderCommon.h
+llvm-devel/include/llvm/Support/X86TargetParser.def
 llvm-devel/include/llvm/Support/YAMLParser.h
 llvm-devel/include/llvm/Support/YAMLTraits.h
 llvm-devel/include/llvm/Support/circular_raw_ostream.h
@@ -2477,6 +2480,7 @@ llvm-devel/include/llvm/Transforms/Instrumentation/GCOVProfiler.h
 llvm-devel/include/llvm/Transforms/Instrumentation/InstrProfiling.h
 llvm-devel/include/llvm/Transforms/Instrumentation/MemorySanitizer.h
 llvm-devel/include/llvm/Transforms/Instrumentation/PGOInstrumentation.h
+llvm-devel/include/llvm/Transforms/Instrumentation/ThreadSanitizer.h
 llvm-devel/include/llvm/Transforms/ObjCARC.h
 llvm-devel/include/llvm/Transforms/Scalar.h
 llvm-devel/include/llvm/Transforms/Scalar/ADCE.h
@@ -2624,10 +2628,8 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/tsan_interface_atomic.h
 %%COMPILER_RT%%llvm-devel/include/xray/xray_interface.h
 %%COMPILER_RT%%llvm-devel/include/xray/xray_log_interface.h
-llvm-devel/lib/BugpointPasses.so
-llvm-devel/lib/LLVMHello.so
+%%COMPILER_RT%%llvm-devel/include/xray/xray_records.h
 %%GOLD%%llvm-devel/lib/LLVMgold.so
-llvm-devel/lib/TestPlugin.so
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_builtin_vars.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_cmath.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_complex_builtins.h
@@ -2684,7 +2686,6 @@ llvm-devel/lib/TestPlugin.so
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/cuda_wrappers/new
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/emmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/f16cintrin.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/float.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fma4intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fmaintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fxsrintrin.h
@@ -2693,11 +2694,7 @@ llvm-devel/lib/TestPlugin.so
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/htmxlintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ia32intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/immintrin.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/intrin.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/inttypes.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/invpcidintrin.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/iso646.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/limits.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/lwpintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/lzcntintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/mm3dnow.h
@@ -2708,6 +2705,7 @@ llvm-devel/lib/TestPlugin.so
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/msa.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/mwaitxintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/nmmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/omp-tools.h
 %%OPENMP%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/omp.h
 %%CLANG%%%%OPENMP%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ompt.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/opencl-c.h
@@ -2719,30 +2717,20 @@ llvm-devel/lib/TestPlugin.so
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ptwriteintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/s390intrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/s3%%LLVM_MAJOR%%0intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sgxintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/shaintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/smmintrin.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/stdalign.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/stdarg.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/stdatomic.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/stdbool.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/stddef.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/stdint.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/stdnoreturn.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/tbmintrin.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/tgmath.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/tmmintrin.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/unwind.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vadefs.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vaesintrin.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/varargs.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vecintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vpclmulqdqintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/waitpkgintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/wbnoinvdintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/wmmintrin.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/x%%LLVM_MAJOR%%6intrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/x86intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xmmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xopintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xsavecintrin.h
@@ -2914,13 +2902,13 @@ llvm-devel/lib/libLLVMWebAssemblyDesc.a
 llvm-devel/lib/libLLVMWebAssemblyDisassembler.a
 llvm-devel/lib/libLLVMWebAssemblyInfo.a
 llvm-devel/lib/libLLVMWindowsManifest.a
-llvm-devel/lib/libLLVMX%%LLVM_MAJOR%%6AsmParser.a
-llvm-devel/lib/libLLVMX%%LLVM_MAJOR%%6AsmPrinter.a
-llvm-devel/lib/libLLVMX%%LLVM_MAJOR%%6CodeGen.a
-llvm-devel/lib/libLLVMX%%LLVM_MAJOR%%6Desc.a
-llvm-devel/lib/libLLVMX%%LLVM_MAJOR%%6Disassembler.a
-llvm-devel/lib/libLLVMX%%LLVM_MAJOR%%6Info.a
-llvm-devel/lib/libLLVMX%%LLVM_MAJOR%%6Utils.a
+llvm-devel/lib/libLLVMX86AsmParser.a
+llvm-devel/lib/libLLVMX86AsmPrinter.a
+llvm-devel/lib/libLLVMX86CodeGen.a
+llvm-devel/lib/libLLVMX86Desc.a
+llvm-devel/lib/libLLVMX86Disassembler.a
+llvm-devel/lib/libLLVMX86Info.a
+llvm-devel/lib/libLLVMX86Utils.a
 llvm-devel/lib/libLLVMXCoreAsmPrinter.a
 llvm-devel/lib/libLLVMXCoreCodeGen.a
 llvm-devel/lib/libLLVMXCoreDesc.a
@@ -3022,17 +3010,17 @@ llvm-devel/lib/libOptRemarks.so.%%LLVM_MAJOR%%svn
 %%LLDB%%llvm-devel/lib/liblldbInterpreter.a
 %%LLDB%%llvm-devel/lib/liblldbPluginABIMacOSX_arm.a
 %%LLDB%%llvm-devel/lib/liblldbPluginABIMacOSX_arm64.a
-%%LLDB%%llvm-devel/lib/liblldbPluginABIMacOSX_i3%%LLVM_MAJOR%%6.a
+%%LLDB%%llvm-devel/lib/liblldbPluginABIMacOSX_i386.a
 %%LLDB%%llvm-devel/lib/liblldbPluginABISysV_arm.a
 %%LLDB%%llvm-devel/lib/liblldbPluginABISysV_arm64.a
 %%LLDB%%llvm-devel/lib/liblldbPluginABISysV_hexagon.a
-%%LLDB%%llvm-devel/lib/liblldbPluginABISysV_i3%%LLVM_MAJOR%%6.a
+%%LLDB%%llvm-devel/lib/liblldbPluginABISysV_i386.a
 %%LLDB%%llvm-devel/lib/liblldbPluginABISysV_mips.a
 %%LLDB%%llvm-devel/lib/liblldbPluginABISysV_mips64.a
 %%LLDB%%llvm-devel/lib/liblldbPluginABISysV_ppc.a
 %%LLDB%%llvm-devel/lib/liblldbPluginABISysV_ppc64.a
-%%LLDB%%llvm-devel/lib/liblldbPluginABISysV_s390x.a
-%%LLDB%%llvm-devel/lib/liblldbPluginABISysV_x%%LLVM_MAJOR%%6_64.a
+%%LLDB%%llvm-devel/lib/liblldbPluginABISysV_s3%%LLVM_MAJOR%%0x.a
+%%LLDB%%llvm-devel/lib/liblldbPluginABISysV_x86_64.a
 %%LLDB%%llvm-devel/lib/liblldbPluginAppleObjCRuntime.a
 %%LLDB%%llvm-devel/lib/liblldbPluginArchitectureArm.a
 %%LLDB%%llvm-devel/lib/liblldbPluginArchitectureMips.a
@@ -3098,7 +3086,7 @@ llvm-devel/lib/libOptRemarks.so.%%LLVM_MAJOR%%svn
 %%LLDB%%llvm-devel/lib/liblldbPluginSymbolVendorELF.a
 %%LLDB%%llvm-devel/lib/liblldbPluginSystemRuntimeMacOSX.a
 %%LLDB%%llvm-devel/lib/liblldbPluginUnwindAssemblyInstEmulation.a
-%%LLDB%%llvm-devel/lib/liblldbPluginUnwindAssemblyX%%LLVM_MAJOR%%6.a
+%%LLDB%%llvm-devel/lib/liblldbPluginUnwindAssemblyX86.a
 %%LLDB%%llvm-devel/lib/liblldbSymbol.a
 %%LLDB%%llvm-devel/lib/liblldbTarget.a
 %%LLDB%%llvm-devel/lib/liblldbUtility.a