[PATCH] D56080: update the pr_datasz of .note.gnu.property section

[Xiang Zhang via Phabricator via llvm-commits]

xiangzhangllvm updated this revision to Diff 180178.
xiangzhangllvm added a comment.

Thank you Zakharin!
Could you please help me merge the patch to LLVM org?


Repository:
  rLLD LLVM Linker

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

https://reviews.llvm.org/D56080

Files:
  lib/Target/X86/X86AsmPrinter.cpp
  test/CodeGen/X86/note-cet-property.ll


Index: test/CodeGen/X86/note-cet-property.ll
===================================================================
--- test/CodeGen/X86/note-cet-property.ll
+++ test/CodeGen/X86/note-cet-property.ll
@@ -22,8 +22,8 @@
 ; X86_64-NEXT: .long    5
 ; X86_64-NEXT: .asciz   "GNU"
 ; X86_64-NEXT: .long    3221225474
-; X86_64-NEXT: .long    8
-; X86_64-NEXT: .quad    3
+; X86_64-NEXT: .long    4
+; X86_64-NEXT: .long    3
 ; X86_64-NEXT: .p2align 3
 
 !llvm.module.flags = !{!0, !1}
Index: lib/Target/X86/X86AsmPrinter.cpp
===================================================================
--- lib/Target/X86/X86AsmPrinter.cpp
+++ lib/Target/X86/X86AsmPrinter.cpp
@@ -572,8 +572,8 @@
 
       // Emitting an Elf_Prop for the CET properties.
       OutStreamer->EmitIntValue(ELF::GNU_PROPERTY_X86_FEATURE_1_AND, 4);
-      OutStreamer->EmitIntValue(WordSize, 4);               // data size
-      OutStreamer->EmitIntValue(FeatureFlagsAnd, WordSize); // data
+      OutStreamer->EmitIntValue(4, 4);               // data size
+      OutStreamer->EmitIntValue(FeatureFlagsAnd, 4); // data
       EmitAlignment(WordSize == 4 ? 2 : 3);                 // padding
 
       OutStreamer->endSection(Nt);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D56080.180178.patch
Type: text/x-patch
Size: 1193 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190104/bb854355/attachment.bin>