Merged to 7.0 in r339881.
On Thu, Aug 16, 2018 at 1:38 PM, Yvan Roux via cfe-commits <cfe-commits@lists.llvm.org> wrote: > Author: yroux > Date: Thu Aug 16 04:38:09 2018 > New Revision: 339865 > > URL: http://llvm.org/viewvc/llvm-project?rev=339865&view=rev > Log: > [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 > > Modified: > libcxxabi/trunk/test/test_exception_address_alignment.pass.cpp > > Modified: libcxxabi/trunk/test/test_exception_address_alignment.pass.cpp > URL: > http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/test_exception_address_alignment.pass.cpp?rev=339865&r1=339864&r2=339865&view=diff > ============================================================================== > --- libcxxabi/trunk/test/test_exception_address_alignment.pass.cpp (original) > +++ libcxxabi/trunk/test/test_exception_address_alignment.pass.cpp Thu Aug 16 > 04:38:09 2018 > @@ -20,6 +20,7 @@ > > #include <cstdint> > #include <cassert> > +#include <__cxxabi_config.h> > > #include <unwind.h> > > @@ -27,7 +28,7 @@ struct __attribute__((aligned)) AlignedT > > // 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) > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
