HomeFreeBSD
Diffusion FreeBSD src repository d2b3fadf2db5

Revert 3c4fd2463bb2 since upstream libcxxrt fixed it in another way
d2b3fadf2db5
Actions

Description

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

Details

Provenance
dimAuthored on Feb 19 2021, 6:18 PM
Reviewer
arichardson
Differential Revision
D28799: Revert 3c4fd2463bb2 since upstream libcxxrt fixed it in another way
Parents
rGf9e1cd6c9920: Fix arp/ndp deletion broken by 2fe5a79425c7.
Branches
Unknown
Tags
Unknown
Reverts
rG3c4fd2463bb2: libcxxrt: add padding in __cxa_allocate_* to fix alignment

Event Timeline

dim committed rGd2b3fadf2db5: Revert 3c4fd2463bb2 since upstream libcxxrt fixed it in another way (authored by dim).Feb 19 2021, 9:18 PM
dim added a reverted change: rG3c4fd2463bb2: libcxxrt: add padding in __cxa_allocate_* to fix alignment.
dim added an edge: D28799: Revert 3c4fd2463bb2 since upstream libcxxrt fixed it in another way.
dim mentioned this in rGaeb00dca0d03: Revert 3c4fd2463bb2 since upstream libcxxrt fixed it in another way.Feb 20 2021, 8:03 PM
dim mentioned this in rG9e86d1669765: Revert 3c4fd2463bb2 since upstream libcxxrt fixed it in another way.
dim mentioned this in rG49e7d3fee6ac: Revert 3c4fd2463bb2 since upstream libcxxrt fixed it in another way.
dim mentioned this in rGd4a0c102a237: Merge libcxxrt master 8049924686b8414d8e652cbd2a52c763b48e8456.Feb 21 2021, 12:01 PM
dim mentioned this in rG72b20d2aa973: Merge libcxxrt master 8049924686b8414d8e652cbd2a52c763b48e8456.
dim mentioned this in rG0aa8c6552ff5: Merge libcxxrt master 8049924686b8414d8e652cbd2a52c763b48e8456.
dim mentioned this in rG3ef7b71f3b77: Partially revert libcxxrt changes to avoid _Unwind_Exception change.Mar 10 2021, 9:51 PM
dim mentioned this in rG3a5074327da0: Partially revert libcxxrt changes to avoid _Unwind_Exception change.Mar 10 2021, 9:53 PM
dim mentioned this in rG9097e3cbcac4: Partially revert libcxxrt changes to avoid _Unwind_Exception change.Mar 13 2021, 1:55 PM
dim mentioned this in rG0b45290603b9: Partially revert libcxxrt changes to avoid _Unwind_Exception change.

Changes (1)

PathSize
contrib/
libcxxrt/

rGd2b3fadf2db5

View Options

contrib/libcxxrt/exception.cc

Loading...