diff options
| author | Akira Hatanaka <ahatanaka@apple.com> | 2017-05-14 18:46:19 +0000 |
|---|---|---|
| committer | Akira Hatanaka <ahatanaka@apple.com> | 2017-05-14 18:46:19 +0000 |
| commit | fa4e00b737b2c91a3f4e7b676ee196792e06b3af (patch) | |
| tree | 5f8e3a76547325ad85a7f677e1738ca10729d8b7 /src | |
| parent | 9f5f78e16a741d487eb3725122a42b028cfc8129 (diff) | |
Revert r302978 and r302981.
Revert the two commits to understand why the following aarch64 bot is
failing.
http://lab.llvm.org:8011/builders/libcxx-libcxxabi-libunwind-aarch64-linux
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@303016 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'src')
| -rw-r--r-- | src/cxa_exception.hpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/cxa_exception.hpp b/src/cxa_exception.hpp index b9f74e3..c009db4 100644 --- a/src/cxa_exception.hpp +++ b/src/cxa_exception.hpp @@ -61,21 +61,7 @@ struct _LIBCXXABI_HIDDEN __cxa_exception { size_t referenceCount; #endif - // This field is annotated with attribute aligned so that the exception - // object following the field is sufficiently aligned and there is no - // gap between the field and the exception object. r276215 made a change to - // annotate _Unwind_Exception in unwind.h with __attribute__((aligned)), but - // we cannot incorporate the fix on Darwin since it is an ABI-breaking - // change, which is why we need the attribute on this field. - // - // For ARM EHABI, we do not align this field since _Unwind_Exception is an - // alias of _Unwind_Control_Block, which is not annotated with - // __attribute__((aligned). -#if defined(_LIBCXXABI_ARM_EHABI) _Unwind_Exception unwindHeader; -#else - _Unwind_Exception unwindHeader __attribute__((aligned)); -#endif }; // http://sourcery.mentor.com/archives/cxx-abi-dev/msg01924.html @@ -110,13 +96,7 @@ struct _LIBCXXABI_HIDDEN __cxa_dependent_exception { void* primaryException; #endif - // See the comment in __cxa_exception as to why this field has attribute - // aligned. -#if defined(_LIBCXXABI_ARM_EHABI) _Unwind_Exception unwindHeader; -#else - _Unwind_Exception unwindHeader __attribute__((aligned)); -#endif }; struct _LIBCXXABI_HIDDEN __cxa_eh_globals { |