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

[Harald van Dijk via Phabricator via llvm-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGf30500632b29: [X32][CET] Fix size and alignment of .note.gnu.property section (authored by hvdijk).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D101689/new/

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;
+      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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D101689.342180.patch
Type: text/x-patch
Size: 1243 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210501/475c0e36/attachment.bin>