]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Revert 3c4fd2463bb2 since upstream libcxxrt fixed it in another way
authorDimitry Andric <dim@FreeBSD.org>
Fri, 19 Feb 2021 18:18:22 +0000 (19:18 +0100)
committerDimitry Andric <dim@FreeBSD.org>
Fri, 19 Feb 2021 21:18:02 +0000 (22:18 +0100)
commitd2b3fadf2db56131376a71b0597876b591a6aee4
treed10b2220d26e58f337a2bfb71e740b5f269658c2
parentf9e1cd6c99200846b324a8b65f7f31ded74013bd
Revert 3c4fd2463bb2 since upstream libcxxrt fixed it in another way

In 0ee0dbfb0d26cf4bc37f24f12e76c7f532b0f368 I imported a more recent
libcxxrt snapshot, which includes an upstream fix for the padding of
struct _Unwind_Exception:

https://github.com/libcxxrt/libcxxrt/commit/e458560b7e22fff59af643dba363544b393bd8db

However, we also had a similar fix in our tree as:
https://cgit.freebsd.org/src/commit/?id=3c4fd2463bb29f65ef1404011fcb31e508cdf2e2

Since having both fixes makes the struct too large again, it leads to
SIGBUSes when throwing exceptions on amd64 (or other LP64 arches). This
is most easily tested by running kyua without any arguments.

It looks like our fix is no longer needed now, so revert it to reduce
diffs against upstream.

PR: 253226
Reviewed by: arichardson, kp
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D28799
contrib/libcxxrt/exception.cc