[llvm-branch-commits] [compiler-rt-branch] r338690 - Merging r338577:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Aug  2 01:57:59 2018
New Revision: 338690

URL: http://llvm.org/viewvc/llvm-project?rev=338690&view=rev
Log:
Merging r338577:
------------------------------------------------------------------------
r338577 | filcab | 2018-08-01 17:30:14 +0200 (Wed, 01 Aug 2018) | 1 line

Add missing condition
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_70/   (props changed)
    compiler-rt/branches/release_70/lib/sanitizer_common/sanitizer_common_interceptors.inc

Propchange: compiler-rt/branches/release_70/
------------------------------------------------------------------------------
    svn:mergeinfo = /compiler-rt/trunk:338577

Modified: compiler-rt/branches/release_70/lib/sanitizer_common/sanitizer_common_interceptors.inc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_70/lib/sanitizer_common/sanitizer_common_interceptors.inc?rev=338690&r1=338689&r2=338690&view=diff
==============================================================================
--- compiler-rt/branches/release_70/lib/sanitizer_common/sanitizer_common_interceptors.inc (original)
+++ compiler-rt/branches/release_70/lib/sanitizer_common/sanitizer_common_interceptors.inc Thu Aug  2 01:57:59 2018
@@ -4460,6 +4460,7 @@ INTERCEPTOR(int, random_r, void *buf, u3
 // 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 ||        \