[PATCH] D101689: [X32][CET] Fix .note.gnu.property section
Harald van Dijk via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Sat May 1 05:33:27 PDT 2021
hvdijk created this revision.
hvdijk added reviewers: craig.topper, MaskRay.
Herald added subscribers: pengfei, hiraditya.
hvdijk requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
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.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D101689
Files:
llvm/lib/Target/X86/X86AsmPrinter.cpp
llvm/test/CodeGen/X86/note-cet-property.ll
Index: llvm/test/CodeGen/X86/note-cet-property.ll
===================================================================
--- llvm/test/CodeGen/X86/note-cet-property.ll
+++ llvm/test/CodeGen/X86/note-cet-property.ll
@@ -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.
Index: llvm/lib/Target/X86/X86AsmPrinter.cpp
===================================================================
--- llvm/lib/Target/X86/X86AsmPrinter.cpp
+++ llvm/lib/Target/X86/X86AsmPrinter.cpp
@@ -643,7 +643,8 @@
OutStreamer->SwitchSection(Nt);
// Emitting note header.
- int WordSize = TT.isArch64Bit() ? 8 : 4;
+ 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D101689.342139.patch
Type: text/x-patch
Size: 1237 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210501/f74c72b8/attachment.bin>
More information about the llvm-commits
mailing list