summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--llvm/lib/Target/X86/X86AsmPrinter.cpp6
-rw-r--r--llvm/test/CodeGen/X86/note-cet-property.ll4
2 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/Target/X86/X86AsmPrinter.cpp b/llvm/lib/Target/X86/X86AsmPrinter.cpp
index b4be9edf166..36cef98a1ef 100644
--- a/llvm/lib/Target/X86/X86AsmPrinter.cpp
+++ b/llvm/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/llvm/test/CodeGen/X86/note-cet-property.ll b/llvm/test/CodeGen/X86/note-cet-property.ll
index 2b7dbbeb38c..f3cc32b65dc 100644
--- a/llvm/test/CodeGen/X86/note-cet-property.ll
+++ b/llvm/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}
OpenPOWER on IntegriCloud