Merging r339865:
------------------------------------------------------------------------
r339865 | yroux | 2018-08-16 13:38:09 +0200 (Thu, 16 Aug 2018) | 7 lines
[libcxxabi] Fix test_exception_address_alignment test for ARM
Check _LIBCXXABI_ARM_EHABI macro instead of libunwind version.
Fixes PR34182
Differential revision: https://reviews.llvm.org/D50170
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/branches/release_70@339881 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/test_exception_address_alignment.pass.cpp b/test/test_exception_address_alignment.pass.cpp
index 138fb4d..5d36659 100644
--- a/test/test_exception_address_alignment.pass.cpp
+++ b/test/test_exception_address_alignment.pass.cpp
@@ -20,6 +20,7 @@
#include <cstdint>
#include <cassert>
+#include <__cxxabi_config.h>
#include <unwind.h>
@@ -27,7 +28,7 @@
// EHABI : 8-byte aligned
// Itanium: Largest supported alignment for the system
-#if defined(_LIBUNWIND_ARM_EHABI)
+#if defined(_LIBCXXABI_ARM_EHABI)
# define EXPECTED_ALIGNMENT 8
#else
# define EXPECTED_ALIGNMENT alignof(AlignedType)