diff options
| author | Hans Wennborg <hans@hanshq.net> | 2018-08-16 14:49:38 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2018-08-16 14:49:38 +0000 |
| commit | ada3e3cdb3470886e2e683d5f35305a049ec6e2e (patch) | |
| tree | 38d526441bb0755d5ff11e6cde724e3a666dd00d | |
| parent | 4f88bfa0ee994f12b7ee203b48f625628d58c73e (diff) | |
| download | bcm5719-llvm-ada3e3cdb3470886e2e683d5f35305a049ec6e2e.tar.gz bcm5719-llvm-ada3e3cdb3470886e2e683d5f35305a049ec6e2e.zip | |
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
------------------------------------------------------------------------
llvm-svn: 339881
| -rw-r--r-- | libcxxabi/test/test_exception_address_alignment.pass.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libcxxabi/test/test_exception_address_alignment.pass.cpp b/libcxxabi/test/test_exception_address_alignment.pass.cpp index 138fb4daf46..5d36659f4ae 100644 --- a/libcxxabi/test/test_exception_address_alignment.pass.cpp +++ b/libcxxabi/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) |
