From: Vyacheslav Zakharin <vyacheslav.p.zakharin@intel.com>
Date: Fri, 4 Jan 2019 21:25:01 +0000 (+0000)
Subject: Update the pr_datasz of .note.gnu.property section.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3c5a5113ba7aaffe57fd33045cefb17db4a8619;p=llvm

Update the pr_datasz of .note.gnu.property section.
Patch by Xiang Zhang.

Differential Revision: https://reviews.llvm.org/D56080


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@350436 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/X86/X86AsmPrinter.cpp b/lib/Target/X86/X86AsmPrinter.cpp
index b4be9edf166..36cef98a1ef 100644
--- a/lib/Target/X86/X86AsmPrinter.cpp
+++ b/lib/Target/X86/X86AsmPrinter.cpp
@@ -572,9 +572,9 @@ void X86AsmPrinter::EmitStartOfAsmFile(Module &M) {
 
       // 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
-      EmitAlignment(WordSize == 4 ? 2 : 3);                 // padding
+      OutStreamer->EmitIntValue(4, 4);               // data size
+      OutStreamer->EmitIntValue(FeatureFlagsAnd, 4); // data
+      EmitAlignment(WordSize == 4 ? 2 : 3);          // padding
 
       OutStreamer->endSection(Nt);
       OutStreamer->SwitchSection(Cur);
diff --git a/test/CodeGen/X86/note-cet-property.ll b/test/CodeGen/X86/note-cet-property.ll
index 2b7dbbeb38c..f3cc32b65dc 100644
--- a/test/CodeGen/X86/note-cet-property.ll
+++ b/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}