BaseTools: Update GenFw to support 4K alignment.

[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 25b90e2f7b51089526bf1cbcad8a64b0a0b65f9b..d2becf165f5501a331ef7e08ed91ec1ae239ac54 100644 (file)
--- a/BaseTools/Source/C/GenFw/Elf64Convert.c
+++ b/BaseTools/Source/C/GenFw/Elf64Convert.c
@@ -97,7 +97,7 @@ STATIC Elf_Phdr *mPhdrBase;
 //\r
 // Coff information\r
 //\r
-STATIC const UINT32 mCoffAlignment = 0x20;\r
+STATIC UINT32 mCoffAlignment = 0x20;\r
 \r
 //\r
 // PE section alignment.\r
@@ -285,6 +285,20 @@ ScanSections64 (
   mTableOffset = mCoffOffset;\r
   mCoffOffset += mCoffNbrSections * sizeof(EFI_IMAGE_SECTION_HEADER);\r
 \r
+  //\r
+  // Set mCoffAlignment to the maximum alignment of the input sections\r
+  // we care about\r
+  //\r
+  for (i = 0; i < mEhdr->e_shnum; i++) {\r
+    Elf_Shdr *shdr = GetShdrByIndex(i);\r
+    if (shdr->sh_addralign <= mCoffAlignment) {\r
+      continue;\r
+    }\r
+    if (IsTextShdr(shdr) || IsDataShdr(shdr) || IsHiiRsrcShdr(shdr)) {\r
+      mCoffAlignment = (UINT32)shdr->sh_addralign;\r
+    }\r
+  }\r
+\r
   //\r
   // First text sections.\r
   //\r