summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAkira Hatanaka <ahatanaka@apple.com>2017-05-11 06:17:49 +0000
committerAkira Hatanaka <ahatanaka@apple.com>2017-05-11 06:17:49 +0000
commita8ac1e119e8d0cf8d4078f89603a597fea31f667 (patch)
treef1f34ba54ddb05752e4d04168d51d91de3a888f4 /src
parente8b16fa9d547942f8d68af852fb1b25aae85f2a5 (diff)
Revert "[libcxxabi] Align unwindHeader on a double-word boundary."
This reverts commit r302763. The commit caused bot failures. git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@302764 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'src')
-rw-r--r--src/cxa_exception.hpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/cxa_exception.hpp b/src/cxa_exception.hpp
index 2d34698..c009db4 100644
--- a/src/cxa_exception.hpp
+++ b/src/cxa_exception.hpp
@@ -61,13 +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 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.
- _Unwind_Exception unwindHeader __attribute__((aligned));
+ _Unwind_Exception unwindHeader;
};
// http://sourcery.mentor.com/archives/cxx-abi-dev/msg01924.html
@@ -102,9 +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.
- _Unwind_Exception unwindHeader __attribute__((aligned));
+ _Unwind_Exception unwindHeader;
};
struct _LIBCXXABI_HIDDEN __cxa_eh_globals {