HardenedBSD/src 5bd2ecbcontrib/llvm-project/llvm/include/llvm/IR IntrinsicsX86.td, contrib/llvm-project/llvm/lib/Support UnicodeNameToCodepointGenerated.cpp

Merge remote-tracking branch 'freebsd/stable/13' into hardened/13-stable/master
DeltaFile
+41,587-40,593lib/clang/liblldb/LLDBWrapLua.cpp
+20,766-20,576contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+3,116-2,618contrib/llvm-project/llvm/include/llvm/IR/IntrinsicsX86.td
+3,565-1,874contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+3,022-1,523contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+2,257-1,568contrib/llvm-project/llvm/lib/Target/X86/X86TargetTransformInfo.cpp
+74,313-68,7526,476 files not shown
+446,808-268,2046,482 files

HardenedBSD/src 320d4fbcontrib/llvm-project/llvm/include/llvm/IR IntrinsicsX86.td, contrib/llvm-project/llvm/lib/Support UnicodeNameToCodepointGenerated.cpp

Merge llvm-project main llvmorg-16-init-18548-gb0daacf58f41

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-16-init-18548-gb0daacf58f41.

PR:             271047
MFC after:      1 month

(cherry picked from commit bdd1243df58e60e85101c09001d9812a789b6bc4)
DeltaFile
+20,766-20,576contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+3,116-2,618contrib/llvm-project/llvm/include/llvm/IR/IntrinsicsX86.td
+3,546-1,877contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+3,022-1,523contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+2,257-1,568contrib/llvm-project/llvm/lib/Target/X86/X86TargetTransformInfo.cpp
+2,881-790contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
+35,588-28,9526,395 files not shown
+401,464-225,9406,401 files

HardenedBSD/src 1a25c77contrib/llvm-project/llvm/include/llvm/IR IntrinsicsX86.td, contrib/llvm-project/llvm/lib/Support UnicodeNameToCodepointGenerated.cpp

Merge remote-tracking branch 'github/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+41,587-40,593lib/clang/liblldb/LLDBWrapLua.cpp
+20,766-20,576contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+3,116-2,618contrib/llvm-project/llvm/include/llvm/IR/IntrinsicsX86.td
+3,565-1,874contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+3,022-1,523contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+2,257-1,568contrib/llvm-project/llvm/lib/Target/X86/X86TargetTransformInfo.cpp
+74,313-68,7526,481 files not shown
+447,328-268,4776,487 files

HardenedBSD/src 6e8e7bccontrib/llvm-project/llvm/include/llvm/IR IntrinsicsX86.td, contrib/llvm-project/llvm/lib/Support UnicodeNameToCodepointGenerated.cpp

Merge remote-tracking branch 'freebsd/main' into hardened/current/master
DeltaFile
+41,587-40,593lib/clang/liblldb/LLDBWrapLua.cpp
+20,766-20,576contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+3,116-2,618contrib/llvm-project/llvm/include/llvm/IR/IntrinsicsX86.td
+3,565-1,874contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+3,022-1,523contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+2,257-1,568contrib/llvm-project/llvm/lib/Target/X86/X86TargetTransformInfo.cpp
+74,313-68,7526,462 files not shown
+446,706-268,0716,468 files

HardenedBSD/src bdd1243contrib/llvm-project/llvm/include/llvm/IR IntrinsicsX86.td, contrib/llvm-project/llvm/lib/Support UnicodeNameToCodepointGenerated.cpp

Merge llvm-project main llvmorg-16-init-18548-gb0daacf58f41

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-16-init-18548-gb0daacf58f41.

PR:             271047
MFC after:      1 month
DeltaFile
+20,766-20,576contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+3,116-2,618contrib/llvm-project/llvm/include/llvm/IR/IntrinsicsX86.td
+3,546-1,877contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+3,022-1,523contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+2,257-1,568contrib/llvm-project/llvm/lib/Target/X86/X86TargetTransformInfo.cpp
+2,881-790contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
+35,588-28,9526,395 files not shown
+401,464-225,9406,401 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 8a84287contrib/llvm-project/compiler-rt/lib/tsan/rtl-old tsan_interceptors_posix.cpp, contrib/llvm-project/libcxx/include filesystem

Merge llvm-project main llvmorg-14-init-13186-g0c553cc1af2e

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

PR:             261742
MFC after:      2 weeks

(cherry picked from commit 0eae32dcef82f6f06de6419a0d623d7def0cc8f6)
DeltaFile
+4,451-0contrib/llvm-project/libcxx/src/include/ryu/d2fixed_full_table.h
+3,015-0contrib/llvm-project/compiler-rt/lib/tsan/rtl-old/tsan_interceptors_posix.cpp
+16-2,792contrib/llvm-project/libcxx/include/filesystem
+866-1,039contrib/llvm-project/lldb/bindings/python/python-wrapper.swig
+0-1,657contrib/llvm-project/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
+0-1,635contrib/llvm-project/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
+8,348-7,1231,630 files not shown
+81,707-48,4291,636 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 0eae32dcontrib/llvm-project/compiler-rt/lib/tsan/rtl-old tsan_interceptors_posix.cpp, contrib/llvm-project/libcxx/include filesystem

Merge llvm-project main llvmorg-14-init-13186-g0c553cc1af2e

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

PR:             261742
MFC after:      2 weeks
DeltaFile
+4,451-0contrib/llvm-project/libcxx/src/include/ryu/d2fixed_full_table.h
+3,015-0contrib/llvm-project/compiler-rt/lib/tsan/rtl-old/tsan_interceptors_posix.cpp
+16-2,792contrib/llvm-project/libcxx/include/filesystem
+866-1,039contrib/llvm-project/lldb/bindings/python/python-wrapper.swig
+0-1,657contrib/llvm-project/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
+0-1,635contrib/llvm-project/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
+8,348-7,1231,630 files not shown
+81,707-48,4291,636 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

HardenedBSD/src fe6060fcontrib/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
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 c7ce6b0contrib/libstdc++ configure, lib/clang/liblldb LLDBWrapLua.cpp

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit
DeltaFile
+0-111,817contrib/libstdc++/configure
+72,183-0lib/clang/liblldb/LLDBWrapLua.cpp
+71,590-432tools/tools/locale/etc/final-maps/widths.txt
+31,726-39,305share/ctypedef/ja_JP.eucJP.src
+59,521-0sys/contrib/dev/iwm/iwm-9000-34.fw.uu
+59,517-0sys/contrib/dev/iwm/iwm-9260-34.fw.uu
+294,537-151,55460,534 files not shown
+10,288,584-10,879,88160,540 files

HardenedBSD/src f86c9ebcontrib/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:
        Makefile.inc1 (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        share/mk/src.opts.mk (unresolved)
        share/mk/sys.mk (unresolved)
DeltaFile
+95,073-589share/man/man5/src.conf.5
+35,376-0sys/contrib/openzfs/include/sys/u8_textprep_data.h
+32,634-0contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+27,826-0sys/contrib/openzfs/module/zstd/lib/zstd.c
+9,980-9,250contrib/sqlite3/sqlite3.c
+10,609-0sys/contrib/openzfs/module/zfs/arc.c
+211,498-9,83918,438 files not shown
+1,674,079-664,95318,444 files

HardenedBSD/src 0e3bd8acontrib/llvm-project/llvm/lib/Analysis/models/inliner saved_model.pbtxt, contrib/llvm-project/llvm/lib/Target/Hexagon HexagonDepIICScalar.td

MFH

Sponsored by:   Rubicon Communications, LLC (netgate.com)
DeltaFile
+35,376-0sys/contrib/openzfs/include/sys/u8_textprep_data.h
+32,634-0contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+27,826-0sys/contrib/openzfs/module/zstd/lib/zstd.c
+9,980-9,250contrib/sqlite3/sqlite3.c
+10,565-0sys/contrib/openzfs/module/zfs/arc.c
+6,876-3,589contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepIICScalar.td
+123,257-12,83911,178 files not shown
+1,373,540-560,26311,184 files

HardenedBSD/src e251528 (r364886)contrib/llvm-project/llvm/lib/Analysis/models/inliner saved_model.pbtxt, contrib/llvm-project/llvm/lib/Target/Hexagon HexagonDepIICScalar.td

MFH

Sponsored by:   Rubicon Communications, LLC (netgate.com)
DeltaFile
+35,376-0sys/contrib/openzfs/include/sys/u8_textprep_data.h
+32,634-0contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+27,826-0sys/contrib/openzfs/module/zstd/lib/zstd.c
+9,980-9,250contrib/sqlite3/sqlite3.c
+10,565-0sys/contrib/openzfs/module/zfs/arc.c
+6,876-3,589contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepIICScalar.td
+123,257-12,83911,178 files not shown
+1,373,540-560,26311,184 files

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

Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/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,581-3,663contrib/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,247-20,9856,335 files not shown
+514,134-265,6816,341 files

HardenedBSD/src 37f253e (r364284)contrib/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
release/11.x llvmorg-11.0.0-rc1-47-gff47911ddfc.

MFC after:      6 weeks
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,581-3,663contrib/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,247-20,9856,279 files not shown
+510,794-265,5546,285 files

HardenedBSD/src bcdf3c6contrib/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
release/11.x llvmorg-11.0.0-rc1-47-gff47911ddfc.

MFC after:      6 weeks
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,581-3,663contrib/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,247-20,9856,279 files not shown
+510,794-265,5546,285 files

HardenedBSD/src 5ffd83d (r363742)contrib/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.
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,460-3,591contrib/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,122-20,9136,248 files not shown
+506,576-264,1716,254 files

HardenedBSD/src 52577a6contrib/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.
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,460-3,591contrib/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,122-20,9136,248 files not shown
+506,576-264,1716,254 files