<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Sun, Jan 26, 2014 at 8:07 PM, Shankar Easwaran <span dir="ltr"><<a href="mailto:shankare@codeaurora.org" target="_blank">shankare@codeaurora.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">On 1/26/2014 9:53 PM, Rui Ueyama wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: ruiu<br>
Date: Sun Jan 26 21:53:26 2014<br>
New Revision: 200184<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=200184&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=200184&view=rev</a><br>
Log:<br>
[PECOFF] Fix PE/COFF optional header size for PE32+.<br>
<br>
The optional header for PE32+ is a bit larger than PE32 because some of<br>
its fields are extended to 8 bytes.<br>
<br>
Modified:<br>
lld/trunk/lib/ReaderWriter/<u></u>PECOFF/WriterPECOFF.cpp<br>
lld/trunk/test/pecoff/peplus.<u></u>test<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/<u></u>PECOFF/WriterPECOFF.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp?rev=200184&r1=200183&r2=200184&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/lld/trunk/lib/<u></u>ReaderWriter/PECOFF/<u></u>WriterPECOFF.cpp?rev=200184&<u></u>r1=200183&r2=200184&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- lld/trunk/lib/ReaderWriter/<u></u>PECOFF/WriterPECOFF.cpp (original)<br>
+++ lld/trunk/lib/ReaderWriter/<u></u>PECOFF/WriterPECOFF.cpp Sun Jan 26 21:53:26 2014<br>
@@ -322,8 +322,8 @@ PEHeaderChunk<PEHeader>::<u></u>PEHeaderChunk(c<br>
_coffHeader.Machine = ctx.getMachineType();<br>
_coffHeader.TimeDateStamp = time(nullptr);<br>
- // The size of PE header including optional data directory is always 224.<br>
- _coffHeader.<u></u>SizeOfOptionalHeader = 224;<br>
+ // The size of PE header including optional data directory.<br>
+ _coffHeader.<u></u>SizeOfOptionalHeader = ctx.is64Bit() ? 240 : 224;<br>
</blockquote></div>
I think this should be defined in the PECOFFLinkingContext that return 240 vs 224 (or) in a header file.</blockquote><div><br></div><div>I'd think it should be computed using sizeof(). Will do in a followup patch.</div>
<div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
// Attributes of the executable.<br>
uint16_t characteristics = llvm::COFF::IMAGE_FILE_32BIT_<u></u>MACHINE |<br>
<br>
Modified: lld/trunk/test/pecoff/peplus.<u></u>test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/peplus.test?rev=200184&r1=200183&r2=200184&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/lld/trunk/test/pecoff/<u></u>peplus.test?rev=200184&r1=<u></u>200183&r2=200184&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- lld/trunk/test/pecoff/peplus.<u></u>test (original)<br>
+++ lld/trunk/test/pecoff/peplus.<u></u>test Sun Jan 26 21:53:26 2014<br>
@@ -11,7 +11,7 @@ CHECK-NEXT: SectionCount: 3<br>
CHECK-NEXT: TimeDateStamp:<br>
CHECK-NEXT: PointerToSymbolTable: 0x0<br>
CHECK-NEXT: SymbolCount: 0<br>
-CHECK-NEXT: OptionalHeaderSize: 224<br>
+CHECK-NEXT: OptionalHeaderSize: 240<br>
CHECK-NEXT: Characteristics [ (0x102)<br>
CHECK-NEXT: IMAGE_FILE_32BIT_MACHINE (0x100)<br>
CHECK-NEXT: IMAGE_FILE_EXECUTABLE_IMAGE (0x2)<br>
<br>
<br>
______________________________<u></u>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/<u></u>mailman/listinfo/llvm-commits</a><br>
<br>
<br>
</blockquote>
<br>
<br></div></div><span class="HOEnZb"><font color="#888888">
-- <br>
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by the Linux Foundation<br>
<br>
</font></span></blockquote></div><br></div></div>