I am checking in these patches to merge with upstream commit:
commit fdf4c035225de52f596899931b1f6100e5e3e928
Author: H.J. Lu <[email protected]>
Date: Fri Sep 10 06:24:36 2021 -0700
[sanitizer] Support Intel CET
1. Include <cet.h> in sanitizer_common/sanitizer_asm.h to mark Intel CET
support when Intel CET is enabled.
2. Add _CET_ENDBR to function entries in assembly codes so that ENDBR
instruction will be generated when Intel CET is enabled.
Reviewed By: dvyukov
Differential Revision: https://reviews.llvm.org/D111185
H.J. Lu (2):
libsanitizer: Merge with upstream
libsanitizer: Apply local patches
libsanitizer/MERGE | 2 +-
libsanitizer/asan/asan_allocator.cpp | 15 -----
libsanitizer/asan/asan_allocator.h | 2 -
libsanitizer/asan/asan_debugging.cpp | 5 +-
libsanitizer/asan/asan_stats.cpp | 4 +-
libsanitizer/hwasan/hwasan.cpp | 4 +-
libsanitizer/hwasan/hwasan_setjmp_x86_64.S | 2 +
libsanitizer/lsan/lsan_common.cpp | 56 ++++++++---------
libsanitizer/lsan/lsan_common.h | 3 +
libsanitizer/sanitizer_common/sanitizer_asm.h | 4 ++
.../sanitizer_chained_origin_depot.cpp | 11 ++--
.../sanitizer_chained_origin_depot.h | 9 +--
...tizer_common_interceptors_vfork_i386.inc.S | 1 +
...zer_common_interceptors_vfork_x86_64.inc.S | 1 +
.../sanitizer_common_libcdep.cpp | 20 +++---
.../sanitizer_common/sanitizer_hash.h | 24 +++++++
.../sanitizer_platform_interceptors.h | 4 +-
.../sanitizer_platform_limits_freebsd.cpp | 21 +++++++
.../sanitizer_platform_limits_freebsd.h | 16 +++++
.../sanitizer_common/sanitizer_stackdepot.cpp | 49 ++++++++-------
.../sanitizer_common/sanitizer_stackdepot.h | 10 +--
.../sanitizer_stackdepotbase.h | 9 +--
libsanitizer/tsan/tsan_interceptors.h | 6 +-
libsanitizer/tsan/tsan_interceptors_posix.cpp | 13 ++--
libsanitizer/tsan/tsan_interface.cpp | 5 +-
libsanitizer/tsan/tsan_platform_linux.cpp | 18 +++---
libsanitizer/tsan/tsan_platform_mac.cpp | 62 ++++++++++---------
libsanitizer/tsan/tsan_rtl.cpp | 8 +--
libsanitizer/tsan/tsan_rtl.h | 9 +--
libsanitizer/tsan/tsan_rtl_amd64.S | 6 ++
30 files changed, 227 insertions(+), 172 deletions(-)
--
2.31.1
