Skip to content

Commit

Permalink
[X86] Do not end 'note.gnu.property' section with -fcf-protection (ll…
Browse files Browse the repository at this point in the history
…vm#79360)

The glibc now adds the required minimum ISA level for libc-nonshared.a
(linked on all programs) and this is done with an inline asm along with
.note.gnu.property and .pushsection/.popsection. However, the x86
backend always ends the 'note.gnu.property' section when building with
-fcf-protection, leading to assert failure:

llvm/llvm-project-git/llvm/lib/MC/MCStreamer.cpp:1251: virtual void
llvm::MCStreamer::switchSection(llvm::MCSection*, const llvm::MCExpr*):
Assertion `!Section->hasEnded() && "Section already ended"' failed.

[1]
https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/x86/isa-level.c;h=3f1b269848a52f994275bab6f60dded3ded6b144;hb=HEAD

(cherry picked from commit a58c62f)
  • Loading branch information
zatrazz authored and tstellar committed Feb 14, 2024
1 parent bfd07d1 commit 9412858
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
1 change: 0 additions & 1 deletion llvm/lib/Target/X86/X86AsmPrinter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,6 @@ void X86AsmPrinter::emitStartOfAsmFile(Module &M) {
OutStreamer->emitInt32(FeatureFlagsAnd); // data
emitAlignment(WordSize == 4 ? Align(4) : Align(8)); // padding

OutStreamer->endSection(Nt);
OutStreamer->switchSection(Cur);
}
}
Expand Down
30 changes: 30 additions & 0 deletions llvm/test/CodeGen/X86/note-cet-property-inlineasm.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
; RUN: llc -mtriple x86_64-unknown-linux-gnu %s -o %t.o -filetype=obj
; RUN: llvm-readobj -n %t.o | FileCheck %s

module asm ".pushsection \22.note.gnu.property\22,\22a\22,@note"
module asm " .p2align 3"
module asm " .long 1f - 0f"
module asm " .long 4f - 1f"
module asm " .long 5"
module asm "0: .asciz \22GNU\22"
module asm "1: .p2align 3"
module asm " .long 0xc0008002"
module asm " .long 3f - 2f"
module asm "2: .long ((1U << 0) | 0 | 0 | 0)"
module asm "3: .p2align 3"
module asm "4:"
module asm " .popsection"

!llvm.module.flags = !{!0, !1}

!0 = !{i32 4, !"cf-protection-return", i32 1}
!1 = !{i32 4, !"cf-protection-branch", i32 1}

; CHECK: Type: NT_GNU_PROPERTY_TYPE_0
; CHECK-NEXT: Property [
; CHECK-NEXT: x86 feature: IBT, SHSTK
; CHECK-NEXT: ]
; CHECK: Type: NT_GNU_PROPERTY_TYPE_0
; CHECK-NEXT: Property [
; CHECK-NEXT: x86 ISA needed: x86-64-baseline
; CHECK-NEXT: ]

0 comments on commit 9412858

Please sign in to comment.