summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2014-02-20 06:02:09 +0000
committerRui Ueyama <ruiu@google.com>2014-02-20 06:02:09 +0000
commit81e59b583ff2fe29a8ed3f49cdf880a89a31bb6e (patch)
treea7b1ee765a2bf362f935c4f8f5dc37ee0ecc48a1
parent78554867a279f3d293ce86c18c626d8b16248e34 (diff)
downloadllvm-81e59b583ff2fe29a8ed3f49cdf880a89a31bb6e.tar.gz
llvm-81e59b583ff2fe29a8ed3f49cdf880a89a31bb6e.tar.bz2
llvm-81e59b583ff2fe29a8ed3f49cdf880a89a31bb6e.tar.xz
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
-rw-r--r--include/llvm/Object/COFF.h2
-rw-r--r--test/tools/llvm-objdump/coff-private-headers.test6
2 files changed, 4 insertions, 4 deletions
diff --git a/include/llvm/Object/COFF.h b/include/llvm/Object/COFF.h
index 6ce5490606..a7a112a864 100644
--- 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 24d1b96cfc..cd186a44b5 100644
--- 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