Skip to content

Commit 195b3ad

Browse files
Cody Tapscottgbaraldi
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)
1 parent 1bd7c1d commit 195b3ad

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

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

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

0 commit comments

Comments
 (0)