Index: llvm/trunk/lib/Target/X86/X86AsmPrinter.cpp
===================================================================
--- llvm/trunk/lib/Target/X86/X86AsmPrinter.cpp
+++ llvm/trunk/lib/Target/X86/X86AsmPrinter.cpp
@@ -572,9 +572,9 @@
 
       // 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);
Index: llvm/trunk/test/CodeGen/X86/note-cet-property.ll
===================================================================
--- llvm/trunk/test/CodeGen/X86/note-cet-property.ll
+++ llvm/trunk/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}