Skip to content

Commit 9e0d057

Browse files
Cody Tapscottvchuravy
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) (cherry picked from commit 6275013)
1 parent 504ee9f commit 9e0d057

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

llvm/lib/MC/MCObjectFileInfo.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,10 @@ void MCObjectFileInfo::initMachOMCObjectFileInfo(const Triple &T) {
6161
MachO::S_ATTR_STRIP_STATIC_SYMS | MachO::S_ATTR_LIVE_SUPPORT,
6262
SectionKind::getReadOnly());
6363

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

6869
switch (Ctx->emitDwarfUnwindInfo()) {
6970
case EmitDwarfUnwindType::Always:

0 commit comments

Comments
 (0)