maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[X32][CET] Fix size and alignment of .note.gnu.property section 

X32 uses 32-bit ELF object files with 32-bit alignment, so the
.note.gnu.property section needs to be emitted as it is for X86.

Reviewed By: MaskRay

Differential Revision: https://reviews.llvm.org/D101689
This commit is contained in:
Harald van Dijk 2021-05-01 22:17:04 +01:00
parent db9d00c5e7
commit f30500632b
No known key found for this signature in database
GPG Key ID: 7D71BB318A5BD56D
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/Target/X86/X86AsmPrinter.cpp
View File

@ -643,7 +643,8 @@ void X86AsmPrinter::emitStartOfAsmFile(Module &M) {
OutStreamer->SwitchSection(Nt);
// Emitting note header.
int WordSize = TT.isArch64Bit() ? 8 : 4;
const int WordSize =
TT.isArch64Bit() && TT.getEnvironment() != Triple::GNUX32 ? 8 : 4;
emitAlignment(WordSize == 4 ? Align(4) : Align(8));
OutStreamer->emitIntValue(4, 4 /*size*/); // data size for "GNU\0"
OutStreamer->emitIntValue(8 + WordSize, 4 /*size*/); // Elf_Prop size

1
llvm/test/CodeGen/X86/note-cet-property.ll
View File

@ -1,5 +1,6 @@
; RUN: llc -mtriple i686-pc-linux < %s | FileCheck %s --check-prefix=X86
; RUN: llc -mtriple x86_64-pc-linux < %s | FileCheck %s --check-prefix=X86_64
; RUN: llc -mtriple x86_64-pc-linux-gnux32 < %s | FileCheck %s --check-prefix=X86
; This test checks that the compiler emits a .note.gnu.property section for
; modules with "cf-protection" module flags.