diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2018-08-16 11:38:09 +0000 |
|---|---|---|
| committer | Peter Collingbourne <pcc@google.com> | 2018-12-04 18:19:15 -0800 |
| commit | 775d7b5f71e84550012d00686dd7b005789ae117 (patch) | |
| tree | 29266e2453ac92f0a4185430ec7002c7c61b7106 | |
| parent | 4957d0c49893f69fb8a80f63257e7e0e417b9207 (diff) | |
| download | libcxxabi-775d7b5f71e84550012d00686dd7b005789ae117.tar.gz | |
Fix test_exception_address_alignment test for ARMandroid-wear-8.0.0_r2
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/trunk@339865 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit bd80f6625dec55d43bab409ab0b71b94472eff28)
Bug: 120510768
Change-Id: I9f95ec334742429a6995bd6a47a8841dc57f0175
| -rw-r--r-- | test/test_exception_address_alignment.pass.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ struct __attribute__((aligned)) AlignedType {}; // 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) |