<div><div dir="auto">Hans,</div><div dir="auto"><br></div><div dir="auto">Can we get this merged to the 5.0 branch as well?  This corresponds to the libunwind fix for the alignment of the exception type.</div><div dir="auto"><br></div><div dir="auto">Thanks!</div><br><div class="gmail_quote"><div>On Wed, Aug 23, 2017 at 8:36 AM Saleem Abdulrasool via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: compnerd<br>
Date: Wed Aug 23 08:35:33 2017<br>
New Revision: 311563<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=311563&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=311563&view=rev</a><br>
Log:<br>
Headers: give _Unwind_Control_Block double-word alignment<br>
<br>
The C++ ABI requires that the exception object (which under AEABI is the<br>
`_Unwind_Control_Block`) is double-word aligned.  The attribute was<br>
applied to the `_Unwind_Exception` type, but not the<br>
`_Unwind_Control_Block`.  This should fix the libunwind test for the<br>
alignment of the exception type.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Headers/unwind.h<br>
<br>
Modified: cfe/trunk/lib/Headers/unwind.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/unwind.h?rev=311563&r1=311562&r2=311563&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/unwind.h?rev=311563&r1=311562&r2=311563&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Headers/unwind.h (original)<br>
+++ cfe/trunk/lib/Headers/unwind.h Wed Aug 23 08:35:33 2017<br>
@@ -149,7 +149,7 @@ struct _Unwind_Control_Block {<br>
     uint32_t reserved1;<br>
   } pr_cache;<br>
   long long int : 0; /* force alignment of next item to 8-byte boundary */<br>
-};<br>
+} __attribute__((__aligned__));<br>
 #else<br>
 struct _Unwind_Exception {<br>
   _Unwind_Exception_Class exception_class;<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div></div><div dir="ltr">-- <br></div><div class="gmail_signature" data-smartmail="gmail_signature">Saleem Abdulrasool<br>compnerd (at) compnerd (dot) org</div>