Skip to content

Commit a142d1b

Browse files
Cody TapscottZentrik
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) (cherry picked from commit b62bce1) (cherry picked from commit e2adfc2) (cherry picked from commit 702f88a) (cherry picked from commit 195b3ad)
1 parent fb6e11a commit a142d1b

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
@@ -70,10 +70,11 @@ void MCObjectFileInfo::initMachOMCObjectFileInfo(const Triple &T) {
7070
MachO::S_ATTR_STRIP_STATIC_SYMS | MachO::S_ATTR_LIVE_SUPPORT,
7171
SectionKind::getReadOnly());
7272

73-
if (T.isOSDarwin() &&
74-
(T.getArch() == Triple::aarch64 || T.getArch() == Triple::aarch64_32 ||
75-
T.isSimulatorEnvironment()))
76-
SupportsCompactUnwindWithoutEHFrame = true;
73+
// Disabled for now, since we need to emit EH Frames for stack unwinding in the JIT
74+
//if (T.isOSDarwin() &&
75+
// (T.getArch() == Triple::aarch64 || T.getArch() == Triple::aarch64_32 ||
76+
// T.isSimulatorEnvironment()))
77+
// SupportsCompactUnwindWithoutEHFrame = true;
7778

7879
switch (Ctx->emitDwarfUnwindInfo()) {
7980
case EmitDwarfUnwindType::Always:

0 commit comments

Comments
 (0)