Object/COFF: Fix padding between CSDVersion and EditList.

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

diff --git a/include/llvm/Object/COFF.h b/include/llvm/Object/COFF.h
index 6ce5490606889298b5deda94785325b92e177915..a7a112a8648b53ffe45069b70d50d9f00b0e9a61 100644 (file)
--- a/include/llvm/Object/COFF.h
+++ b/include/llvm/Object/COFF.h
@@ -260,7 +260,7 @@ struct coff_load_configuration32 {
   support::ulittle32_t ProcessAffinityMask;
   support::ulittle32_t ProcessHeapFlags;
   support::ulittle16_t CSDVersion;
-  char Reserved[4];
+  uint16_t Reserved;
   support::ulittle32_t EditList;
   support::ulittle32_t SecurityCookie;
   support::ulittle32_t SEHandlerTable;

diff --git a/test/tools/llvm-objdump/coff-private-headers.test b/test/tools/llvm-objdump/coff-private-headers.test
index 24d1b96cfc77ca02f94348b550430a37f1ff7cb8..cd186a44b5fcbf426aaf361d62ffaf91b3b5aa57 100644 (file)
--- a/test/tools/llvm-objdump/coff-private-headers.test
+++ b/test/tools/llvm-objdump/coff-private-headers.test
@@ -61,6 +61,6 @@ LOADCFG-NEXT:   Virtual Memory Threshold: 0
 LOADCFG-NEXT:   Process Affinity Mask: 0
 LOADCFG-NEXT:   Process Heap Flags: 0
 LOADCFG-NEXT:   CSD Version: 0
-LOADCFG-NEXT:   Security Cookie: 554696768
-LOADCFG-NEXT:   SEH Table: 65600
-LOADCFG-NEXT:   SEH Count: 0
+LOADCFG-NEXT:   Security Cookie: 4206616
+LOADCFG-NEXT:   SEH Table: 4202768
+LOADCFG-NEXT:   SEH Count: 1