Skip to content

Commit b62bce1

Browse files
Cody Tapscottgiordano
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 8588f45 commit b62bce1

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

llvm/lib/MC/MCObjectFileInfo.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,11 @@ void MCObjectFileInfo::initMachOMCObjectFileInfo(const Triple &T) {
6565
MachO::S_ATTR_STRIP_STATIC_SYMS | MachO::S_ATTR_LIVE_SUPPORT,
6666
SectionKind::getReadOnly());
6767

68-
if (T.isOSDarwin() &&
69-
(T.getArch() == Triple::aarch64 || T.getArch() == Triple::aarch64_32 ||
70-
T.isSimulatorEnvironment()))
71-
SupportsCompactUnwindWithoutEHFrame = true;
68+
// Disabled for now, since we need to emit EH Frames for stack unwinding in the JIT
69+
//if (T.isOSDarwin() &&
70+
// (T.getArch() == Triple::aarch64 || T.getArch() == Triple::aarch64_32 ||
71+
// T.isSimulatorEnvironment()))
72+
// SupportsCompactUnwindWithoutEHFrame = true;
7273

7374
switch (Ctx->emitDwarfUnwindInfo()) {
7475
case EmitDwarfUnwindType::Always:

0 commit comments

Comments
 (0)