BaseTools/GenFw: move PE/COFF header closer to payload

[mirror_edk2.git] / BaseTools / Source / C / GenFw / Elf64Convert.c

diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c
index 7650afe54cfc90fc17546463e38d654413b484b6..1c0f4a4dc87cc15b042d3e5ab71808be49d4cc19 100644 (file)
--- a/BaseTools/Source/C/GenFw/Elf64Convert.c
+++ b/BaseTools/Source/C/GenFw/Elf64Convert.c
@@ -300,6 +300,16 @@ ScanSections64 (
     }\r
   }\r
 \r
+  //\r
+  // Move the PE/COFF header right before the first section. This will help us\r
+  // save space when converting to TE.\r
+  //\r
+  if (mCoffAlignment > mCoffOffset) {\r
+    mNtHdrOffset += mCoffAlignment - mCoffOffset;\r
+    mTableOffset += mCoffAlignment - mCoffOffset;\r
+    mCoffOffset = mCoffAlignment;\r
+  }\r
+\r
   //\r
   // First text sections.\r
   //\r