Skip to content

Commit ec43ccb

Browse files
committed
drop support for ifunc ptrauth tail. we'll stick the revert of this on the upstreaming branch
1 parent 492d65f commit ec43ccb

File tree

2 files changed

+0
-36
lines changed

2 files changed

+0
-36
lines changed

llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2621,37 +2621,6 @@ void AArch64AsmPrinter::emitMachOIFuncStubHelperBody(Module &M,
26212621
.addImm(2),
26222622
*STI);
26232623

2624-
if (TM.getTargetTriple().isArm64e()) {
2625-
// autibsp
2626-
// eor x17, lr, lr, lsl #1
2627-
// tbz x17, #62, Lgoodsig
2628-
// brk #0xc741
2629-
// Lgoodsig:
2630-
2631-
OutStreamer->emitInstruction(MCInstBuilder(AArch64::AUTIBSP), *STI);
2632-
2633-
OutStreamer->emitInstruction(MCInstBuilder(AArch64::EORXrs)
2634-
.addReg(AArch64::X17)
2635-
.addReg(AArch64::LR)
2636-
.addReg(AArch64::LR)
2637-
.addImm(1),
2638-
*STI);
2639-
2640-
MCContext &Ctx = OutStreamer->getContext();
2641-
MCSymbol *GoodSigSym = Ctx.createTempSymbol();
2642-
const MCExpr *GoodSig = MCSymbolRefExpr::create(GoodSigSym, Ctx);
2643-
OutStreamer->emitInstruction(MCInstBuilder(AArch64::TBZX)
2644-
.addReg(AArch64::X17)
2645-
.addImm(62)
2646-
.addExpr(GoodSig),
2647-
*STI);
2648-
2649-
OutStreamer->emitInstruction(MCInstBuilder(AArch64::BRK).addImm(0xc471),
2650-
*STI);
2651-
2652-
OutStreamer->emitLabel(GoodSigSym);
2653-
}
2654-
26552624
OutStreamer->emitInstruction(MCInstBuilder(TM.getTargetTriple().isArm64e()
26562625
? AArch64::BRAAZ
26572626
: AArch64::BR)

llvm/test/CodeGen/AArch64/ifunc-asm.ll

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ entry:
6262
; MACHO-NEXT: ldp x3, x2, [sp], #16
6363
; MACHO-NEXT: ldp x1, x0, [sp], #16
6464
; MACHO-NEXT: ldp x29, x30, [sp], #16
65-
; PAUTH-NEXT: autibsp
66-
; PAUTH-NEXT: eor x17, x30, x30, lsl #1
67-
; PAUTH-NEXT: tbz x17, #62, [[GOOD_SIG:Ltmp[0-9]+]]
68-
; PAUTH-NEXT: brk #0xc471
69-
; PAUTH-NEXT: [[GOOD_SIG]]:
7065
; ARM64-NEXT: br x16
7166
; PAUTH-NEXT: braaz x16
7267

0 commit comments

Comments
 (0)