Skip to content

Commit 6275013

Browse files
Cody Tapscottvchuravy
Cody Tapscott
authored andcommitted
Force .eh_frame emission on AArch64
We need to force the emission of the EH Frame section (currently done via SupportsCompactUnwindWithoutEHFrame in the MCObjectFileInfo for the target), since libunwind doesn't yet support dynamically registering compact unwind information at run-time. (cherry picked from commit 60e0418)
1 parent 9e892ea commit 6275013

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

llvm/lib/MC/MCObjectFileInfo.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@ void MCObjectFileInfo::initMachOMCObjectFileInfo(const Triple &T) {
5858
MachO::S_ATTR_STRIP_STATIC_SYMS | MachO::S_ATTR_LIVE_SUPPORT,
5959
SectionKind::getReadOnly());
6060

61-
if (T.isOSDarwin() &&
62-
(T.getArch() == Triple::aarch64 || T.getArch() == Triple::aarch64_32))
63-
SupportsCompactUnwindWithoutEHFrame = true;
61+
// Disabled for now, since we need to emit EH Frames for stack unwinding in the JIT
62+
// if (T.isOSDarwin() &&
63+
// (T.getArch() == Triple::aarch64 || T.getArch() == Triple::aarch64_32))
64+
// SupportsCompactUnwindWithoutEHFrame = true;
6465

6566
if (T.isWatchABI())
6667
OmitDwarfIfHaveCompactUnwind = true;

0 commit comments

Comments
 (0)