HardenedBSD/src 6d5a643contrib/llvm-project/libcxx/include regex, contrib/llvm-project/libcxx/src locale.cpp

Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        cddl/lib/libnvpair/Makefile (unresolved)
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+20,997-20,920contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+8,621-6,629contrib/xz/ChangeLog
+4,499-5,385contrib/llvm-project/libcxx/src/locale.cpp
+3,748-4,889contrib/llvm-project/libcxx/include/regex
+7,713-0contrib/unbound/util/configparser.c
+7,627-0contrib/unbound/util/configlexer.c
+53,205-37,82315,239 files not shown
+1,349,003-1,091,48015,245 files

HardenedBSD/src 065d123contrib/llvm-project/libcxx/include regex locale, contrib/llvm-project/libcxx/src locale.cpp

Merge remote-tracking branch 'origin/freebsd/14-stable/main' into hardened/14-stable/master

Conflicts:
        contrib/llvm-project/clang/lib/Driver/SanitizerArgs.cpp (unresolved)
        contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp (unresolved)
DeltaFile
+20,997-20,920contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+4,499-5,385contrib/llvm-project/libcxx/src/locale.cpp
+3,748-4,889contrib/llvm-project/libcxx/include/regex
+2,665-3,296contrib/llvm-project/libcxx/include/locale
+4,344-1,459contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+2,039-3,709contrib/llvm-project/libcxx/include/valarray
+38,292-39,6586,585 files not shown
+483,205-312,3366,591 files

HardenedBSD/src cf984dfcontrib/llvm-project/libcxx/include regex locale, contrib/llvm-project/libcxx/src locale.cpp

Merge remote-tracking branch 'internal/freebsd/13-stable/main' into hardened/13-stable/master

Conflicts:
        contrib/llvm-project/clang/lib/Driver/SanitizerArgs.cpp (unresolved)
        contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp (unresolved)
DeltaFile
+20,997-20,920contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+4,499-5,385contrib/llvm-project/libcxx/src/locale.cpp
+3,748-4,889contrib/llvm-project/libcxx/include/regex
+2,665-3,296contrib/llvm-project/libcxx/include/locale
+4,344-1,459contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+2,039-3,709contrib/llvm-project/libcxx/include/valarray
+38,292-39,6586,575 files not shown
+483,200-312,3436,581 files

HardenedBSD/src b09953dcontrib/llvm-project/llvm/include/llvm/IR Attributes.td, contrib/llvm-project/llvm/lib/Target/AArch64 AArch64SchedAmpere1B.td AArch64.td

Merge llvm-project release/18.x llvmorg-18.1.1-0-gdba2a75e9c7e

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvm-project release/18.x llvmorg-18.1.1-0-gdba2a75e9c7e.

PR:             276104
MFC after:      1 month

(cherry picked from commit 4c2d3b022a1d543dbbff75a0c53e8d3d7242216d)
DeltaFile
+1,149-0contrib/llvm-project/llvm/lib/Target/AArch64/AArch64SchedAmpere1B.td
+84-78lib/clang/liblldb/LLDBWrapLua.cpp
+77-1contrib/llvm-project/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
+21-7contrib/llvm-project/llvm/include/llvm/IR/Attributes.td
+27-0contrib/llvm-project/llvm/lib/Target/AArch64/AArch64.td
+24-2contrib/llvm-project/llvm/tools/llvm-readobj/ObjDumper.cpp
+1,382-8848 files not shown
+1,501-16354 files

HardenedBSD/src bdbe302contrib/llvm-project/libcxx/include/__pstl/internal algorithm_impl.h, contrib/llvm-project/llvm/lib/Support UnicodeNameToCodepointGenerated.cpp

Merge llvm-project main llvmorg-18-init-15088-gd14ee76181fb

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvm-project main llvmorg-18-init-15088-gd14ee76181fb.

PR:             276104
MFC after:      1 month

(cherry picked from commit 5f757f3ff9144b609b3c433dfd370cc6bdc191ad)
DeltaFile
+20,887-20,814contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+3,698-1,244contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+1,147-3,670contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp
+2,664-1,914contrib/llvm-project/llvm/lib/Target/X86/X86InstrInfo.cpp
+2,741-1,506contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+0-4,174contrib/llvm-project/libcxx/include/__pstl/internal/algorithm_impl.h
+31,137-33,3225,785 files not shown
+348,182-202,0365,791 files

HardenedBSD/src 471f3bacontrib/llvm-project/llvm/include/llvm/IR Attributes.td, contrib/llvm-project/llvm/lib/Target/AArch64 AArch64SchedAmpere1B.td AArch64.td

Merge llvm-project release/18.x llvmorg-18.1.1-0-gdba2a75e9c7e

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvm-project release/18.x llvmorg-18.1.1-0-gdba2a75e9c7e.

PR:             276104
MFC after:      1 month

(cherry picked from commit 4c2d3b022a1d543dbbff75a0c53e8d3d7242216d)
DeltaFile
+1,149-0contrib/llvm-project/llvm/lib/Target/AArch64/AArch64SchedAmpere1B.td
+84-78lib/clang/liblldb/LLDBWrapLua.cpp
+77-1contrib/llvm-project/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
+21-7contrib/llvm-project/llvm/include/llvm/IR/Attributes.td
+27-0contrib/llvm-project/llvm/lib/Target/AArch64/AArch64.td
+24-2contrib/llvm-project/llvm/tools/llvm-readobj/ObjDumper.cpp
+1,382-8848 files not shown
+1,501-16354 files

HardenedBSD/src c9157d9contrib/llvm-project/libcxx/include/__pstl/internal algorithm_impl.h, contrib/llvm-project/llvm/lib/Support UnicodeNameToCodepointGenerated.cpp

Merge llvm-project main llvmorg-18-init-15088-gd14ee76181fb

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvm-project main llvmorg-18-init-15088-gd14ee76181fb.

PR:             276104
MFC after:      1 month

(cherry picked from commit 5f757f3ff9144b609b3c433dfd370cc6bdc191ad)
DeltaFile
+20,887-20,814contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+3,698-1,244contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+1,147-3,670contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp
+2,664-1,914contrib/llvm-project/llvm/lib/Target/X86/X86InstrInfo.cpp
+2,741-1,506contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+0-4,174contrib/llvm-project/libcxx/include/__pstl/internal/algorithm_impl.h
+31,137-33,3225,785 files not shown
+348,182-202,0365,791 files

HardenedBSD/src d9d3181contrib/llvm-project/libcxx/include regex locale, contrib/llvm-project/libcxx/src locale.cpp

Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master

Conflicts:
        contrib/llvm-project/clang/lib/Driver/SanitizerArgs.cpp (unresolved)
        contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp (unresolved)
DeltaFile
+20,997-20,920contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+4,499-5,385contrib/llvm-project/libcxx/src/locale.cpp
+3,748-4,889contrib/llvm-project/libcxx/include/regex
+2,665-3,296contrib/llvm-project/libcxx/include/locale
+4,344-1,459contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+2,039-3,709contrib/llvm-project/libcxx/include/valarray
+38,292-39,6586,564 files not shown
+483,069-312,3676,570 files

HardenedBSD/src 4c2d3b0contrib/llvm-project/llvm/include/llvm/IR Attributes.td, contrib/llvm-project/llvm/lib/Target/AArch64 AArch64SchedAmpere1B.td AArch64.td

Merge llvm-project release/18.x llvmorg-18.1.1-0-gdba2a75e9c7e

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvm-project release/18.x llvmorg-18.1.1-0-gdba2a75e9c7e.

PR:             276104
MFC after:      1 month
DeltaFile
+1,149-0contrib/llvm-project/llvm/lib/Target/AArch64/AArch64SchedAmpere1B.td
+84-78lib/clang/liblldb/LLDBWrapLua.cpp
+77-1contrib/llvm-project/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
+21-7contrib/llvm-project/llvm/include/llvm/IR/Attributes.td
+27-0contrib/llvm-project/llvm/lib/Target/AArch64/AArch64.td
+24-2contrib/llvm-project/llvm/tools/llvm-readobj/ObjDumper.cpp
+1,382-8848 files not shown
+1,501-16354 files

HardenedBSD/src 5f757f3contrib/llvm-project/libcxx/include/__pstl/internal algorithm_impl.h, contrib/llvm-project/llvm/lib/Support UnicodeNameToCodepointGenerated.cpp

Merge llvm-project main llvmorg-18-init-15088-gd14ee76181fb

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvm-project main llvmorg-18-init-15088-gd14ee76181fb.

PR:             276104
MFC after:      1 month
DeltaFile
+20,887-20,814contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+3,698-1,244contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+1,147-3,670contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp
+2,664-1,914contrib/llvm-project/llvm/lib/Target/X86/X86InstrInfo.cpp
+2,741-1,506contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+0-4,174contrib/llvm-project/libcxx/include/__pstl/internal/algorithm_impl.h
+31,137-33,3225,785 files not shown
+348,182-202,0365,791 files

HardenedBSD/src 4329d78contrib/llvm-project/clang/lib/Headers opencl-c.h, contrib/llvm-project/llvm/lib/Support UnicodeNameToCodepointGenerated.cpp

Merge remote-tracking branch 'freebsd/stable/13' into hardened/13-stable/master

Conflicts:
        contrib/llvm-project/clang/lib/Driver/SanitizerArgs.cpp (unresolved)
        contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp (unresolved)
DeltaFile
+20,911-0contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+6,634-6,860contrib/llvm-project/clang/lib/Headers/opencl-c.h
+6,600-6,569contrib/llvm-project/llvm/lib/Target/AArch64/AArch64PerfectShuffle.h
+3,362-1,144contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+3,150-1,233contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
+2,921-1,406contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+43,578-17,2126,642 files not shown
+453,739-200,2316,648 files

HardenedBSD/src 7982d1econtrib/llvm-project/clang/lib/Format MacroCallReconstructor.cpp, contrib/llvm-project/libcxx/include/__format parser_std_format_spec.h

Merge llvm-project main llvmorg-15-init-16436-g18a6ab5b8d1f

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-15-init-16436-g18a6ab5b8d1f.

PR:             265425
MFC after:      2 weeks

(cherry picked from commit 753f127f3ace09432b2baeffd71a308760641a62)
DeltaFile
+2,279-0contrib/llvm-project/llvm/lib/Target/AArch64/AArch64SchedNeoverseN2.td
+38-855contrib/llvm-project/libcxx/include/__format/parser_std_format_spec.h
+315-418contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+307-337contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp
+573-0contrib/llvm-project/clang/lib/Format/MacroCallReconstructor.cpp
+569-0contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp
+4,081-1,6101,062 files not shown
+27,192-10,4811,068 files

HardenedBSD/src 50994e3contrib/llvm-project/clang/lib/Headers opencl-c.h, contrib/llvm-project/llvm/lib/Support UnicodeNameToCodepointGenerated.cpp

Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        contrib/llvm-project/llvm/tools/llvm-objcopy/llvm-objcopy.cpp (unresolved)
DeltaFile
+20,911-0contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+6,634-6,860contrib/llvm-project/clang/lib/Headers/opencl-c.h
+6,600-6,569contrib/llvm-project/llvm/lib/Target/AArch64/AArch64PerfectShuffle.h
+3,362-1,144contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+3,150-1,233contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
+2,921-1,406contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+43,578-17,2128,111 files not shown
+494,492-225,0368,117 files

HardenedBSD/src 7468af2contrib/llvm-project/clang/lib/Headers opencl-c.h, contrib/llvm-project/llvm/lib/Support UnicodeNameToCodepointGenerated.cpp

Merge remote-tracking branch 'freebsd/main' into hardened/current/master

Conflicts:
        contrib/llvm-project/clang/lib/Driver/SanitizerArgs.cpp (unresolved)
        contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp (unresolved)
DeltaFile
+20,911-0contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+6,634-6,860contrib/llvm-project/clang/lib/Headers/opencl-c.h
+6,600-6,569contrib/llvm-project/llvm/lib/Target/AArch64/AArch64PerfectShuffle.h
+3,362-1,144contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+3,150-1,233contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
+2,921-1,406contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+43,578-17,2126,554 files not shown
+450,981-198,8016,560 files

HardenedBSD/src 753f127contrib/llvm-project/clang/lib/Format MacroCallReconstructor.cpp, contrib/llvm-project/libcxx/include/__format parser_std_format_spec.h

Merge llvm-project main llvmorg-15-init-16436-g18a6ab5b8d1f

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-15-init-16436-g18a6ab5b8d1f.

PR:             265425
MFC after:      2 weeks
DeltaFile
+2,279-0contrib/llvm-project/llvm/lib/Target/AArch64/AArch64SchedNeoverseN2.td
+38-855contrib/llvm-project/libcxx/include/__format/parser_std_format_spec.h
+315-418contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+307-337contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp
+573-0contrib/llvm-project/clang/lib/Format/MacroCallReconstructor.cpp
+569-0contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp
+4,081-1,6101,062 files not shown
+27,192-10,4811,068 files

HardenedBSD/src ef4a6ddcontrib/libarchive/libarchive/test test_read_format_rar5_sfx.exe.uu, contrib/sqlite3 sqlite3.c

Merge remote-tracking branch 'origin/hardened/13-stable/master' into hardened/13-stable/blackhawk
DeltaFile
+46,300-0sys/contrib/dev/rtw88/rtw8822c_table.c
+22,204-0sys/contrib/dev/rtw88/rtw8822b_table.c
+9,441-436sys/contrib/zlib/crc32.h
+5,882-3,904contrib/sqlite3/sqlite3.c
+7,048-0contrib/libarchive/libarchive/test/test_read_format_rar5_sfx.exe.uu
+7,008-0sys/contrib/dev/rtw88/rtw8821c_table.c
+97,883-4,34010,149 files not shown
+651,663-267,13710,155 files

HardenedBSD/src 21ae3f7contrib/llvm-project/libcxx/include random, contrib/llvm-project/libcxx/src/include/ryu d2fixed_full_table.h

Merge remote-tracking branch 'origin/freebsd/13-stable/main' into hardened/13-stable/master

Conflicts:
        contrib/llvm-project/clang/lib/Driver/SanitizerArgs.cpp (unresolved)
        lib/libclang_rt/Makefile (unresolved)
        lib/libclang_rt/cfi/Makefile (unresolved)
DeltaFile
+2,350-3,767contrib/llvm-project/llvm/lib/Target/NVPTX/NVPTXIntrinsics.td
+48-5,320contrib/llvm-project/libcxx/include/random
+3,791-1,165contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp
+4,451-0contrib/llvm-project/libcxx/src/include/ryu/d2fixed_full_table.h
+2,533-1,146contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+2,170-1,435lib/clang/liblldb/LLDBWrapLua.cpp
+15,343-12,8336,314 files not shown
+396,479-214,8156,320 files

HardenedBSD/src 4b6eb0econtrib/llvm-project/clang/lib/Headers avx512fp16intrin.h avx512fintrin.h, contrib/llvm-project/llvm/lib/CodeGen/LiveDebugValues InstrRefBasedImpl.cpp

Merge llvm-project main llvmorg-14-init-10186-gff7f2cfa959b

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-14-init-10186-gff7f2cfa959b.

PR:             261742
MFC after:      2 weeks

(cherry picked from commit 349cc55c9796c4596a5b9904cd3281af295f878f)
DeltaFile
+2,318-3,767contrib/llvm-project/llvm/lib/Target/NVPTX/NVPTXIntrinsics.td
+2,680-865contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp
+3,349-0contrib/llvm-project/clang/lib/Headers/avx512fp16intrin.h
+1,545-1,545contrib/llvm-project/clang/lib/Headers/avx512fintrin.h
+1,155-1,800contrib/llvm-project/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp
+1,566-1,237contrib/llvm-project/llvm/lib/Target/AVR/AVRInstrInfo.td
+12,613-9,2144,438 files not shown
+222,538-116,1294,444 files

HardenedBSD/src 31367a1contrib/sqlite3 sqlite3.c, share/colldef_unicode zh_CN.UTF-8.src

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+40,646-40,658share/colldef_unicode/zh_CN.UTF-8.src
+46,300-0sys/contrib/dev/rtw88/rtw8822c_table.c
+0-27,824sys/contrib/openzfs/module/zstd/lib/zstd.c
+22,204-0sys/contrib/dev/rtw88/rtw8822b_table.c
+9,441-436sys/contrib/zlib/crc32.h
+5,931-3,922contrib/sqlite3/sqlite3.c
+124,522-72,84014,231 files not shown
+826,315-442,38114,237 files

HardenedBSD/src 3cd26decontrib/llvm-project/libcxx/include random, contrib/llvm-project/libcxx/src/include/ryu d2fixed_full_table.h

Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master

Conflicts:
        contrib/llvm-project/clang/lib/Driver/SanitizerArgs.cpp (unresolved)
        lib/libclang_rt/Makefile (unresolved)
DeltaFile
+2,350-3,767contrib/llvm-project/llvm/lib/Target/NVPTX/NVPTXIntrinsics.td
+48-5,320contrib/llvm-project/libcxx/include/random
+3,786-1,164contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp
+4,451-0contrib/llvm-project/libcxx/src/include/ryu/d2fixed_full_table.h
+2,533-1,146contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+2,170-1,435lib/clang/liblldb/LLDBWrapLua.cpp
+15,338-12,8326,314 files not shown
+396,211-214,7976,320 files

HardenedBSD/src 349cc55contrib/llvm-project/clang/lib/Headers avx512fp16intrin.h avx512fintrin.h, contrib/llvm-project/llvm/lib/CodeGen/LiveDebugValues InstrRefBasedImpl.cpp

Merge llvm-project main llvmorg-14-init-10186-gff7f2cfa959b

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-14-init-10186-gff7f2cfa959b.

PR:             261742
MFC after:      2 weeks
DeltaFile
+2,318-3,767contrib/llvm-project/llvm/lib/Target/NVPTX/NVPTXIntrinsics.td
+2,680-865contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp
+3,349-0contrib/llvm-project/clang/lib/Headers/avx512fp16intrin.h
+1,545-1,545contrib/llvm-project/clang/lib/Headers/avx512fintrin.h
+1,155-1,800contrib/llvm-project/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp
+1,566-1,237contrib/llvm-project/llvm/lib/Target/AVR/AVRInstrInfo.td
+12,613-9,2144,438 files not shown
+222,538-116,1294,444 files

HardenedBSD/src 6a32f4fcontrib/llvm-project/llvm/lib/Analysis/models/inliner saved_model.pbtxt, contrib/sqlite3 sqlite3.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
        usr.sbin/hbsd-update/hbsd-update.conf (unresolved)
DeltaFile
+0-32,634contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+9,480-9,480lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+10,895-7,688contrib/sqlite3/sqlite3.c
+8,062-8,054lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+7,713-7,713lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+0-13,083sys/contrib/octeon-sdk/cvmx-ciu-defs.h
+36,150-78,65213,448 files not shown
+1,006,794-1,015,87713,454 files

HardenedBSD/src 6aa4d3ccontrib/llvm-project/clang/lib/Headers hexagon_protos.h, contrib/llvm-project/llvm/include/llvm/IR IntrinsicsHexagonDep.td

Merge remote-tracking branch 'origin/freebsd/12-stable/main' into hardened/12-stable/master

Conflicts:
        contrib/llvm-project/clang/lib/Driver/SanitizerArgs.cpp (unresolved)
        lib/clang/liblldb/Makefile (unresolved)
        share/mk/src.opts.mk (unresolved)
        usr.bin/clang/llvm-ar/Makefile (unresolved)
        usr.bin/clang/llvm-nm/Makefile (unresolved)
        usr.bin/clang/llvm-objdump/Makefile (unresolved)
DeltaFile
+0-32,634contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+4,694-4,662contrib/llvm-project/llvm/include/llvm/IR/IntrinsicsHexagonDep.td
+8,450-0contrib/llvm-project/clang/lib/Headers/hexagon_protos.h
+5,037-2,697contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp
+3,187-3,844contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepInstrFormats.td
+6,360-306contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+27,728-44,1437,321 files not shown
+762,563-369,2037,327 files

HardenedBSD/src c7893a8contrib/llvm-project/clang/lib/Headers hexagon_protos.h, contrib/llvm-project/llvm/include/llvm/IR IntrinsicsHexagonDep.td

Merge llvm-project main llvmorg-13-init-16847-g88e66fa60ae5

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-13-init-16847-g88e66fa60ae5, the last commit before
the upstream release/13.x branch was created.

PR:             258209
MFC after:      2 weeks

(cherry picked from commit fe6060f10f634930ff71b7c50291ddc610da2475)
DeltaFile
+0-32,634contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+4,694-4,662contrib/llvm-project/llvm/include/llvm/IR/IntrinsicsHexagonDep.td
+8,450-0contrib/llvm-project/clang/lib/Headers/hexagon_protos.h
+3,187-3,844contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepInstrFormats.td
+5,281-781contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+2,968-2,932contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepMapAsm2Intrin.td
+24,580-44,8535,529 files not shown
+405,061-214,8345,535 files

HardenedBSD/src fdf7151contrib/llvm-project/clang/lib/Headers vecintrin.h, contrib/llvm-project/lldb/source/Plugins/TypeSystem/Clang TypeSystemClang.cpp

Merge remote-tracking branch 'origin/freebsd/12-stable/main' into hardened/12-stable/master

Conflicts:
        contrib/llvm-project/clang/lib/Driver/SanitizerArgs.cpp (unresolved)
        lib/clang/libllvm/Makefile (unresolved)
DeltaFile
+32,634-0contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+6,876-3,589contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepIICScalar.td
+6,569-3,667contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp
+9,591-0contrib/llvm-project/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
+0-9,304contrib/llvm-project/lldb/source/Symbol/ClangASTContext.cpp
+4,565-4,429contrib/llvm-project/clang/lib/Headers/vecintrin.h
+60,235-20,9896,308 files not shown
+513,423-266,5326,314 files

HardenedBSD/src e55e5e6contrib/llvm-project/clang/lib/Headers vecintrin.h, contrib/llvm-project/lldb/source/Plugins/TypeSystem/Clang TypeSystemClang.cpp

Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
master 2e10b7a39b9, the last commit before the llvmorg-12-init tag, from
which release/11.x was branched.

Note that for now, I rolled back all our local changes to make merging
easier, and I will reapply the still-relevant ones after updating to
11.0.0-rc1.

(cherry picked from commit 5ffd83dbcc34f10e07f6d3e968ae6365869615f4)
DeltaFile
+32,634-0contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+6,876-3,589contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepIICScalar.td
+6,419-3,589contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp
+9,587-0contrib/llvm-project/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
+0-9,304contrib/llvm-project/lldb/source/Symbol/ClangASTContext.cpp
+4,565-4,429contrib/llvm-project/clang/lib/Headers/vecintrin.h
+60,081-20,9116,248 files not shown
+506,510-264,1556,254 files

HardenedBSD/src 07cf134contrib/llvm-project/clang/lib/Headers hexagon_protos.h, contrib/llvm-project/llvm/include/llvm/IR IntrinsicsHexagonDep.td

Merge remote-tracking branch 'origin/freebsd/13-stable/main' into hardened/13-stable/master

Conflicts:
        contrib/llvm-project/clang/lib/Driver/SanitizerArgs.cpp (unresolved)
DeltaFile
+0-32,634contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+4,694-4,662contrib/llvm-project/llvm/include/llvm/IR/IntrinsicsHexagonDep.td
+8,450-0contrib/llvm-project/clang/lib/Headers/hexagon_protos.h
+3,187-3,844contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepInstrFormats.td
+5,288-781contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+2,968-2,932contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepMapAsm2Intrin.td
+24,587-44,8535,624 files not shown
+410,901-217,5285,630 files

HardenedBSD/src 5f7ddb1contrib/llvm-project/clang/lib/Headers hexagon_protos.h, contrib/llvm-project/llvm/include/llvm/IR IntrinsicsHexagonDep.td

Merge llvm-project main llvmorg-13-init-16847-g88e66fa60ae5

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-13-init-16847-g88e66fa60ae5, the last commit before
the upstream release/13.x branch was created.

PR:             258209

(cherry picked from commit fe6060f10f634930ff71b7c50291ddc610da2475)
DeltaFile
+0-32,634contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+4,694-4,662contrib/llvm-project/llvm/include/llvm/IR/IntrinsicsHexagonDep.td
+8,450-0contrib/llvm-project/clang/lib/Headers/hexagon_protos.h
+3,187-3,844contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepInstrFormats.td
+5,281-781contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+2,968-2,932contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepMapAsm2Intrin.td
+24,580-44,8535,529 files not shown
+405,061-214,8345,535 files

HardenedBSD/src 815fd12contrib/llvm-project/clang/lib/Headers hexagon_protos.h, contrib/llvm-project/llvm/include/llvm/IR IntrinsicsHexagonDep.td

Merge branch 'hardened/current/master' into hardened/current/sensitive
DeltaFile
+0-32,634contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+4,694-4,662contrib/llvm-project/llvm/include/llvm/IR/IntrinsicsHexagonDep.td
+8,450-0contrib/llvm-project/clang/lib/Headers/hexagon_protos.h
+3,187-3,844contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepInstrFormats.td
+5,288-781contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+2,968-2,932contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepMapAsm2Intrin.td
+24,587-44,8535,729 files not shown
+416,775-220,2345,735 files

HardenedBSD/src f9a7ed9contrib/llvm-project/clang/lib/Headers hexagon_protos.h, contrib/llvm-project/llvm/include/llvm/IR IntrinsicsHexagonDep.td

Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master

Conflicts:
        contrib/llvm-project/clang/lib/Driver/SanitizerArgs.cpp (unresolved)
DeltaFile
+0-32,634contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+4,694-4,662contrib/llvm-project/llvm/include/llvm/IR/IntrinsicsHexagonDep.td
+8,450-0contrib/llvm-project/clang/lib/Headers/hexagon_protos.h
+3,187-3,844contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepInstrFormats.td
+5,288-781contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+2,968-2,932contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepMapAsm2Intrin.td
+24,587-44,8535,575 files not shown
+409,793-216,0695,581 files