[llvm-branch-commits] [libcxxabi] r339881 - Merging r339865:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Aug 16 07:49:38 2018
New Revision: 339881

URL: http://llvm.org/viewvc/llvm-project?rev=339881&view=rev
Log:
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
------------------------------------------------------------------------

Modified:
    libcxxabi/branches/release_70/   (props changed)
    libcxxabi/branches/release_70/test/test_exception_address_alignment.pass.cpp

Propchange: libcxxabi/branches/release_70/
------------------------------------------------------------------------------
    svn:mergeinfo = /libcxxabi/trunk:339865

Modified: libcxxabi/branches/release_70/test/test_exception_address_alignment.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/branches/release_70/test/test_exception_address_alignment.pass.cpp?rev=339881&r1=339880&r2=339881&view=diff
==============================================================================
--- libcxxabi/branches/release_70/test/test_exception_address_alignment.pass.cpp (original)
+++ libcxxabi/branches/release_70/test/test_exception_address_alignment.pass.cpp Thu Aug 16 07:49:38 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)