svn commit: r337313 - projects/clang700-import/contrib/compiler-rt/lib/sanitizer_common

[Dimitry Andric]

Author: dim
Date: Sat Aug  4 13:35:13 2018
New Revision: 337313
URL: https://svnweb.freebsd.org/changeset/base/337313

Log:
  Merge compiler-rt release_70 branch r338892, and resolve conflicts.

Modified:
  projects/clang700-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
  projects/clang700-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
Directory Properties:
  projects/clang700-import/contrib/compiler-rt/   (props changed)

Modified: projects/clang700-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
==============================================================================
--- projects/clang700-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc	Sat Aug  4 13:33:36 2018	(r337312)
+++ projects/clang700-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc	Sat Aug  4 13:35:13 2018	(r337313)
@@ -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 ||        \

Modified: projects/clang700-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
==============================================================================
--- projects/clang700-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc	Sat Aug  4 13:33:36 2018	(r337312)
+++ projects/clang700-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc	Sat Aug  4 13:35:13 2018	(r337313)
@@ -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);