diff options
| author | Vyacheslav Zakharin <vyacheslav.p.zakharin@intel.com> | 2019-01-04 21:25:01 +0000 |
|---|---|---|
| committer | Vyacheslav Zakharin <vyacheslav.p.zakharin@intel.com> | 2019-01-04 21:25:01 +0000 |
| commit | 0a6f86c54b4ea263959c627ce3f9c0932dd298f3 (patch) | |
| tree | 27b0f5d3e51e81a687763b59bd1d74df8cfbcbca | |
| parent | 6658fce4fcf3547c66e3273d07a12e266d4c4e01 (diff) | |
| download | bcm5719-llvm-0a6f86c54b4ea263959c627ce3f9c0932dd298f3.tar.gz bcm5719-llvm-0a6f86c54b4ea263959c627ce3f9c0932dd298f3.zip | |
Update the pr_datasz of .note.gnu.property section.
Patch by Xiang Zhang.
Differential Revision: https://reviews.llvm.org/D56080
llvm-svn: 350436
| -rw-r--r-- | llvm/lib/Target/X86/X86AsmPrinter.cpp | 6 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/note-cet-property.ll | 4 |
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} |
