Index: compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
+++ compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
@@ -113,6 +113,7 @@
 #define setitimer __setitimer50
 #define setlocale __setlocale50
 #define shmctl __shmctl50
+#define sigaltstack __sigaltstack14
 #define sigemptyset __sigemptyset14
 #define sigfillset __sigfillset14
 #define sigpending __sigpending14
Index: compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
@@ -53,6 +53,7 @@
 extern unsigned struct_tms_sz;
 extern unsigned struct_itimerspec_sz;
 extern unsigned struct_sigevent_sz;
+extern unsigned struct_stack_t_sz;
 extern unsigned struct_sched_param_sz;
 extern unsigned struct_statfs64_sz;
 extern unsigned struct_statfs_sz;
Index: compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.cpp
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.cpp
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.cpp
@@ -100,6 +100,7 @@
   unsigned struct_group_sz = sizeof(struct group);
   unsigned siginfo_t_sz = sizeof(siginfo_t);
   unsigned struct_sigaction_sz = sizeof(struct sigaction);
+  unsigned struct_stack_t_sz = sizeof(stack_t);
   unsigned struct_itimerval_sz = sizeof(struct itimerval);
   unsigned pthread_t_sz = sizeof(pthread_t);
   unsigned pthread_mutex_t_sz = sizeof(pthread_mutex_t);
Index: compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
@@ -48,6 +48,7 @@
 extern unsigned struct_tms_sz;
 extern unsigned struct_itimerspec_sz;
 extern unsigned struct_sigevent_sz;
+extern unsigned struct_stack_t_sz;
 extern unsigned struct_sched_param_sz;
 extern unsigned struct_statfs_sz;
 extern unsigned struct_sockaddr_sz;
Index: compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp
@@ -269,6 +269,7 @@
 unsigned struct_group_sz = sizeof(struct group);
 unsigned siginfo_t_sz = sizeof(siginfo_t);
 unsigned struct_sigaction_sz = sizeof(struct sigaction);
+unsigned struct_stack_t_sz = sizeof(stack_t);
 unsigned struct_itimerval_sz = sizeof(struct itimerval);
 unsigned pthread_t_sz = sizeof(pthread_t);
 unsigned pthread_mutex_t_sz = sizeof(pthread_mutex_t);
Index: compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_openbsd.h
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_openbsd.h
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_openbsd.h
@@ -50,6 +50,7 @@
 extern unsigned struct_tms_sz;
 extern unsigned struct_itimerspec_sz;
 extern unsigned struct_sigevent_sz;
+extern unsigned struct_stack_t_sz;
 extern unsigned struct_statfs_sz;
 extern unsigned struct_sockaddr_sz;
 
Index: compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_openbsd.cpp
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_openbsd.cpp
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_openbsd.cpp
@@ -72,6 +72,7 @@
 unsigned struct_group_sz = sizeof(struct group);
 unsigned siginfo_t_sz = sizeof(siginfo_t);
 unsigned struct_sigaction_sz = sizeof(struct sigaction);
+unsigned struct_stack_t_sz = sizeof(stack_t);
 unsigned struct_itimerval_sz = sizeof(struct itimerval);
 unsigned pthread_t_sz = sizeof(pthread_t);
 unsigned pthread_mutex_t_sz = sizeof(pthread_mutex_t);
Index: compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.h
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.h
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.h
@@ -38,6 +38,7 @@
 extern unsigned struct_tms_sz;
 extern unsigned struct_itimerspec_sz;
 extern unsigned struct_sigevent_sz;
+extern unsigned struct_stack_t_sz;
 extern unsigned struct_sched_param_sz;
 extern unsigned struct_statfs64_sz;
 extern unsigned struct_statfs_sz;
Index: compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.cpp
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.cpp
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.cpp
@@ -72,6 +72,7 @@
   unsigned struct_group_sz = sizeof(struct group);
   unsigned siginfo_t_sz = sizeof(siginfo_t);
   unsigned struct_sigaction_sz = sizeof(struct sigaction);
+  unsigned struct_stack_t_sz = sizeof(stack_t);
   unsigned struct_itimerval_sz = sizeof(struct itimerval);
   unsigned pthread_t_sz = sizeof(pthread_t);
   unsigned pthread_mutex_t_sz = sizeof(pthread_mutex_t);