diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2018-08-04 13:15:56 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2018-08-04 13:15:56 +0000 |
| commit | 44ca6042a42585862a14f62e307ed08663888b26 (patch) | |
| tree | 785f5fe691a0dee367ee3d513e1f0864f29ad14f | |
| parent | 005b7ed8f76756d94ef6266ded755ab7863cb936 (diff) | |
| download | src-44ca6042a42585862a14f62e307ed08663888b26.tar.gz src-44ca6042a42585862a14f62e307ed08663888b26.zip | |
Vendor import of compiler-rt release_70 branch r338892:vendor/compiler-rt/compiler-rt-release_70-r338892
Notes
Notes:
svn path=/vendor/compiler-rt/dist-release_70/; revision=337303
svn path=/vendor/compiler-rt/compiler-rt-release_70-r338892/; revision=337304; tag=vendor/compiler-rt/compiler-rt-release_70-r338892
| -rw-r--r-- | lib/sanitizer_common/sanitizer_common_interceptors.inc | 1 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_linux_libcdep.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/sanitizer_common/sanitizer_common_interceptors.inc b/lib/sanitizer_common/sanitizer_common_interceptors.inc index ff18bc801749..801d6a0bdeac 100644 --- a/lib/sanitizer_common/sanitizer_common_interceptors.inc +++ b/lib/sanitizer_common/sanitizer_common_interceptors.inc @@ -4460,6 +4460,7 @@ INTERCEPTOR(int, random_r, void *buf, u32 *result) { // its metadata. See // https://github.com/google/sanitizers/issues/321. #if SANITIZER_INTERCEPT_PTHREAD_ATTR_GET || \ + SANITIZER_INTERCEPT_PTHREAD_ATTR_GET_SCHED || \ SANITIZER_INTERCEPT_PTHREAD_ATTR_GETINHERITSSCHED || \ SANITIZER_INTERCEPT_PTHREAD_MUTEXATTR_GET || \ SANITIZER_INTERCEPT_PTHREAD_RWLOCKATTR_GET || \ diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc index 1c7fb7db8844..4962ff8322d6 100644 --- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc +++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc @@ -292,7 +292,7 @@ uptr ThreadDescriptorSize() { val = FIRST_32_SECOND_64(1168, 1776); else if (minor == 11 || (minor == 12 && patch == 1)) val = FIRST_32_SECOND_64(1168, 2288); - else if (minor <= 13) + else if (minor <= 14) val = FIRST_32_SECOND_64(1168, 2304); else val = FIRST_32_SECOND_64(1216, 2304); |