git: 9097e3cbcac4 - main - Partially revert libcxxrt changes to avoid _Unwind_Exception change

[Dimitry Andric]

On 13 Mar 2021, at 18:38, Tijl Coosemans <tijl at FreeBSD.org> wrote:
> 
> On Sat, 13 Mar 2021 13:54:49 GMT Dimitry Andric <dim at FreeBSD.org> wrote:
>> The branch main has been updated by dim:
>> 
>> URL: https://cgit.FreeBSD.org/src/commit/?id=9097e3cbcac455eb0dedd097d8d5548c72568d0a
>> 
>> commit 9097e3cbcac455eb0dedd097d8d5548c72568d0a
>> Author:     Dimitry Andric <dim at FreeBSD.org>
>> AuthorDate: 2021-03-13 13:54:24 +0000
>> Commit:     Dimitry Andric <dim at FreeBSD.org>
>> CommitDate: 2021-03-13 13:54:24 +0000
>> 
>>    Partially revert libcxxrt changes to avoid _Unwind_Exception change
...
>> --- a/contrib/libcxxrt/unwind-itanium.h
>> +++ b/contrib/libcxxrt/unwind-itanium.h
>> @@ -79,12 +79,9 @@ struct _Unwind_Exception
>>   {
>>     uint64_t exception_class;
>>     _Unwind_Exception_Cleanup_Fn exception_cleanup;
>> -    uintptr_t private_1;
>> -    uintptr_t private_2;
>> -#if __SIZEOF_POINTER__ == 4
>> -    uint32_t reserved[3];
>> -#endif
>> -  } __attribute__((__aligned__));
>> +    unsigned long private_1;
>> +    unsigned long private_2;
>> +  } ;
> 
> Shouldn't these definitions be the same as the ones in GCC?

If you want to keep the ABI compatible with what it was, no. Otherwise, you could consider it. But for what gain?

-Dimitry

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 223 bytes
Desc: Message signed with OpenPGP
URL: <http://lists.freebsd.org/pipermail/dev-commits-src-main/attachments/20210314/ef3f6c37/attachment.sig>