From 7b0e132551ee3036fb3115c4caad7971adaa0d39 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Thu, 4 Apr 2013 09:03:56 +0000 Subject: [PATCH] [sanitizer] Use ucontext_t instead of "struct ucontext". Fixes Mac build. llvm-svn: 178755 --- compiler-rt/lib/msan/msan_interceptors.cc | 2 +- .../lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 2 +- .../lib/sanitizer_common/sanitizer_platform_limits_posix.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler-rt/lib/msan/msan_interceptors.cc b/compiler-rt/lib/msan/msan_interceptors.cc index 00c54f2a5e93..0ed00f658d10 100644 --- a/compiler-rt/lib/msan/msan_interceptors.cc +++ b/compiler-rt/lib/msan/msan_interceptors.cc @@ -836,7 +836,7 @@ static void SignalHandler(int signo) { static void SignalAction(int signo, void *si, void *uc) { __msan_unpoison(si, __sanitizer::struct_sigaction_sz); - __msan_unpoison(uc, __sanitizer::struct_ucontext_sz); + __msan_unpoison(uc, __sanitizer::ucontext_t_sz); typedef void (*sigaction_cb)(int, void *, void *); sigaction_cb cb = (sigaction_cb)sigactions[signo]; diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc index fd39cb2848e5..8363ea5d56ff 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -45,9 +45,9 @@ namespace __sanitizer { unsigned struct_tm_sz = sizeof(struct tm); unsigned struct_passwd_sz = sizeof(struct passwd); unsigned struct_sigaction_sz = sizeof(struct sigaction); - unsigned struct_ucontext_sz = sizeof(struct ucontext); unsigned struct_itimerval_sz = sizeof(struct itimerval); unsigned pthread_t_sz = sizeof(pthread_t); + unsigned ucontext_t_sz = sizeof(ucontext_t); #if SANITIZER_LINUX unsigned struct_rlimit_sz = sizeof(struct rlimit); diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h index bdec8e5c21c4..6f516c6dfbcb 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h @@ -25,9 +25,9 @@ namespace __sanitizer { extern unsigned struct_tm_sz; extern unsigned struct_passwd_sz; extern unsigned struct_sigaction_sz; - extern unsigned struct_ucontext_sz; extern unsigned struct_itimerval_sz; extern unsigned pthread_t_sz; + extern unsigned ucontext_t_sz; #if SANITIZER_LINUX extern unsigned struct_rlimit_sz;