summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--compiler-rt/lib/msan/msan.cc2
-rw-r--r--compiler-rt/test/msan/signal_stress_test.cc3
2 files changed, 1 insertions, 4 deletions
diff --git a/compiler-rt/lib/msan/msan.cc b/compiler-rt/lib/msan/msan.cc
index b64dcb6ffeb..9949db4c13a 100644
--- a/compiler-rt/lib/msan/msan.cc
+++ b/compiler-rt/lib/msan/msan.cc
@@ -55,7 +55,7 @@ SANITIZER_INTERFACE_ATTRIBUTE
THREADLOCAL u32 __msan_retval_origin_tls;
SANITIZER_INTERFACE_ATTRIBUTE
-THREADLOCAL u64 __msan_va_arg_tls[kMsanParamTlsSize / sizeof(u64)];
+ALIGNED(16) THREADLOCAL u64 __msan_va_arg_tls[kMsanParamTlsSize / sizeof(u64)];
SANITIZER_INTERFACE_ATTRIBUTE
THREADLOCAL u64 __msan_va_arg_overflow_size_tls;
diff --git a/compiler-rt/test/msan/signal_stress_test.cc b/compiler-rt/test/msan/signal_stress_test.cc
index d25bf820ffa..5bc6f59213b 100644
--- a/compiler-rt/test/msan/signal_stress_test.cc
+++ b/compiler-rt/test/msan/signal_stress_test.cc
@@ -1,8 +1,5 @@
// RUN: %clangxx_msan -std=c++11 -O0 %s -o %t && %run %t
//
-// AArch64 lacks var args instrumentation.
-// XFAIL: aarch64
-
// Test that va_arg shadow from a signal handler does not leak outside.
#include <signal.h>
OpenPOWER on IntegriCloud