diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
@@ -4032,7 +4032,7 @@
   // FIXME: under ASan the call below may write to freed memory and corrupt
   // its metadata. See
   // https://github.com/google/sanitizers/issues/321.
-  int res = REAL(sigwait)(set, sig);
+  int res = COMMON_INTERCEPTOR_BLOCK_REAL(sigwait)(set, sig);
   if (!res && sig) COMMON_INTERCEPTOR_WRITE_RANGE(ctx, sig, sizeof(*sig));
   return res;
 }
@@ -4049,7 +4049,7 @@
   // FIXME: under ASan the call below may write to freed memory and corrupt
   // its metadata. See
   // https://github.com/google/sanitizers/issues/321.
-  int res = REAL(sigwaitinfo)(set, info);
+  int res = COMMON_INTERCEPTOR_BLOCK_REAL(sigwaitinfo)(set, info);
   if (res > 0 && info) COMMON_INTERCEPTOR_WRITE_RANGE(ctx, info, siginfo_t_sz);
   return res;
 }
@@ -4068,7 +4068,7 @@
   // FIXME: under ASan the call below may write to freed memory and corrupt
   // its metadata. See
   // https://github.com/google/sanitizers/issues/321.
-  int res = REAL(sigtimedwait)(set, info, timeout);
+  int res = COMMON_INTERCEPTOR_BLOCK_REAL(sigtimedwait)(set, info, timeout);
   if (res > 0 && info) COMMON_INTERCEPTOR_WRITE_RANGE(ctx, info, siginfo_t_sz);
   return res;
 }
diff --git a/compiler-rt/test/tsan/signal_block2.cpp b/compiler-rt/test/tsan/signal_block2.cpp
new file mode 100644
--- /dev/null
+++ b/compiler-rt/test/tsan/signal_block2.cpp
@@ -0,0 +1,80 @@
+// RUN: %clang_tsan -O1 %s -o %t -DCASE_0 && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t -DCASE_1 && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t -DCASE_2 && %run %t 2>&1 | FileCheck %s
+
+#include "test.h"
+#include <signal.h>
+#include <string.h>
+#include <sys/time.h>
+
+int done;
+pthread_t main_thread = (pthread_t)NULL;
+pthread_mutex_t mutex;
+pthread_cond_t cond;
+
+void timer_handler(int signum) {
+  static int signals_handled = 0;
+  write(2, "timer_handler\n", strlen("timer_handler\n"));
+  if (++signals_handled < 10)
+    return;
+#if defined(CASE_1)
+  __atomic_store_n(&done, 1, __ATOMIC_RELEASE);
+  (void)pthread_kill(main_thread, SIGUSR1);
+#elif defined(CASE_2)
+  // Case 2: not working with pthread_cond_wait
+  if (pthread_mutex_trylock(&mutex) == 0) {
+    __atomic_store_n(&done, 1, __ATOMIC_RELEASE);
+    pthread_cond_signal(&cond);
+    pthread_mutex_unlock(&mutex);
+  }
+#else
+  // Working with just done
+  __atomic_store_n(&done, 1, __ATOMIC_RELEASE);
+#endif
+}
+
+int main(int argc, char **argv) {
+  main_thread = pthread_self();
+  pthread_mutex_init(&mutex, 0);
+  pthread_cond_init(&cond, 0);
+
+  sigset_t sigset;
+  sigemptyset(&sigset);
+  sigaddset(&sigset, SIGUSR1);
+  if (sigprocmask(SIG_BLOCK, &sigset, NULL))
+    exit((perror("sigprocmask"), 1));
+
+  struct sigaction sa;
+  memset(&sa, 0, sizeof(sa));
+  sa.sa_handler = &timer_handler;
+  if (sigaction(SIGALRM, &sa, NULL))
+    exit((perror("setitimer"), 1));
+
+  struct itimerval timer;
+  timer.it_value.tv_sec = 0;
+  timer.it_value.tv_usec = 50000;
+  timer.it_interval = timer.it_value;
+  if (setitimer(ITIMER_REAL, &timer, NULL))
+    exit((perror("setitimer"), 1));
+
+#if defined(CASE_1)
+  while (__atomic_load_n(&done, __ATOMIC_ACQUIRE) == 0) {
+    int signum;
+    sigwait(&sigset, &signum);
+    write(2, "sigwait\n", strlen("sigwait\n"));
+  }
+#elif defined(CASE_2)
+  pthread_mutex_lock(&mutex);
+  while (__atomic_load_n(&done, __ATOMIC_ACQUIRE) == 0) {
+    pthread_cond_wait(&cond, &mutex);
+    write(2, "pthread_cond_wait\n", strlen("pthread_cond_wait\n"));
+  }
+  pthread_mutex_unlock(&mutex);
+#else
+  while (__atomic_load_n(&done, __ATOMIC_ACQUIRE) == 0) {
+  }
+#endif
+  fprintf(stderr, "DONE\n");
+}
+
+// CHECK: DONE