]> git.proxmox.com Git - mirror_edk2.git/blobdiff - BaseTools/Source/C/GenFw/Elf32Convert.c
Sync BaseTool trunk (version r2649) into EDKII BaseTools.
[mirror_edk2.git] / BaseTools / Source / C / GenFw / Elf32Convert.c
index 58ac333888dcfdd65ba88c352698a4aa4fc35efa..97c9380c8dc21cbbc1c56230abf7816c8f81887f 100644 (file)
-/** @file
-
-Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
-Portions copyright (c) 2013, ARM Ltd. All rights reserved.<BR>
-
-This program and the accompanying materials are licensed and made available
-under the terms and conditions of the BSD License which accompanies this
-distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include "WinNtInclude.h"
-
-#ifndef __GNUC__
-#include <windows.h>
-#include <io.h>
-#endif
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <ctype.h>
-
-#include <Common/UefiBaseTypes.h>
-#include <IndustryStandard/PeImage.h>
-
-#include "PeCoffLib.h"
-#include "EfiUtilityMsgs.h"
-
-#include "GenFw.h"
-#include "ElfConvert.h"
-#include "Elf32Convert.h"
-
-STATIC
-VOID
-ScanSections32 (
-  VOID
-  );
-
-STATIC
-BOOLEAN
-WriteSections32 (
-  SECTION_FILTER_TYPES  FilterType
-  );
-
-STATIC
-VOID
-WriteRelocations32 (
-  VOID
-  );
-
-STATIC
-VOID
-WriteDebug32 (
-  VOID
-  );
-
-STATIC
-VOID
-SetImageSize32 (
-  VOID
-  );
-
-STATIC
-VOID
-CleanUp32 (
-  VOID
-  );
-
-//
-// Rename ELF32 strucutres to common names to help when porting to ELF64.
-//
-typedef Elf32_Shdr Elf_Shdr;
-typedef Elf32_Ehdr Elf_Ehdr;
-typedef Elf32_Rel Elf_Rel;
-typedef Elf32_Sym Elf_Sym;
-typedef Elf32_Phdr Elf_Phdr;
-typedef Elf32_Dyn Elf_Dyn;
-#define ELFCLASS ELFCLASS32
-#define ELF_R_TYPE(r) ELF32_R_TYPE(r)
-#define ELF_R_SYM(r) ELF32_R_SYM(r)
-
-//
-// Well known ELF structures.
-//
-STATIC Elf_Ehdr *mEhdr;
-STATIC Elf_Shdr *mShdrBase;
-STATIC Elf_Phdr *mPhdrBase;
-
-//
-// Coff information
-//
-STATIC const UINT32 mCoffAlignment = 0x20;
-
-//
-// PE section alignment.
-//
-STATIC const UINT16 mCoffNbrSections = 5;
-
-//
-// ELF sections to offset in Coff file.
-//
-STATIC UINT32 *mCoffSectionsOffset = NULL;
-
-//
-// Offsets in COFF file
-//
-STATIC UINT32 mNtHdrOffset;
-STATIC UINT32 mTextOffset;
-STATIC UINT32 mDataOffset;
-STATIC UINT32 mHiiRsrcOffset;
-STATIC UINT32 mRelocOffset;
-
-//
-// Initialization Function
-//
-BOOLEAN
-InitializeElf32 (
-  UINT8               *FileBuffer,
-  ELF_FUNCTION_TABLE  *ElfFunctions
-  )
-{
-  //
-  // Initialize data pointer and structures.
-  //
-  mEhdr = (Elf_Ehdr*) FileBuffer;  
-
-  //
-  // Check the ELF32 specific header information.
-  //
-  if (mEhdr->e_ident[EI_CLASS] != ELFCLASS32) {
-    Error (NULL, 0, 3000, "Unsupported", "ELF EI_DATA not ELFCLASS32");
-    return FALSE;
-  }
-  if (mEhdr->e_ident[EI_DATA] != ELFDATA2LSB) {
-    Error (NULL, 0, 3000, "Unsupported", "ELF EI_DATA not ELFDATA2LSB");
-    return FALSE;
-  }  
-  if ((mEhdr->e_type != ET_EXEC) && (mEhdr->e_type != ET_DYN)) {
-    Error (NULL, 0, 3000, "Unsupported", "ELF e_type not ET_EXEC or ET_DYN");
-    return FALSE;
-  }
-  if (!((mEhdr->e_machine == EM_386) || (mEhdr->e_machine == EM_ARM))) { 
-    Error (NULL, 0, 3000, "Unsupported", "ELF e_machine not EM_386 or EM_ARM");
-    return FALSE;
-  }
-  if (mEhdr->e_version != EV_CURRENT) {
-    Error (NULL, 0, 3000, "Unsupported", "ELF e_version (%u) not EV_CURRENT (%d)", (unsigned) mEhdr->e_version, EV_CURRENT);
-    return FALSE;
-  }
-  
-  //
-  // Update section header pointers
-  //
-  mShdrBase  = (Elf_Shdr *)((UINT8 *)mEhdr + mEhdr->e_shoff);
-  mPhdrBase = (Elf_Phdr *)((UINT8 *)mEhdr + mEhdr->e_phoff);
-  
-  //
-  // Create COFF Section offset buffer and zero.
-  //
-  mCoffSectionsOffset = (UINT32 *)malloc(mEhdr->e_shnum * sizeof (UINT32));
-  memset(mCoffSectionsOffset, 0, mEhdr->e_shnum * sizeof(UINT32));
-
-  //
-  // Fill in function pointers.
-  //
-  ElfFunctions->ScanSections = ScanSections32;
-  ElfFunctions->WriteSections = WriteSections32;
-  ElfFunctions->WriteRelocations = WriteRelocations32;
-  ElfFunctions->WriteDebug = WriteDebug32;
-  ElfFunctions->SetImageSize = SetImageSize32;
-  ElfFunctions->CleanUp = CleanUp32;
-
-  return TRUE;
-}
-
-
-//
-// Header by Index functions
-//
-STATIC
-Elf_Shdr*
-GetShdrByIndex (
-  UINT32 Num
-  )
-{
-  if (Num >= mEhdr->e_shnum)
-    return NULL;
-  return (Elf_Shdr*)((UINT8*)mShdrBase + Num * mEhdr->e_shentsize);
-}
-
-STATIC
-Elf_Phdr*
-GetPhdrByIndex (
-  UINT32 num
-  )
-{
-  if (num >= mEhdr->e_phnum) {
-    return NULL;
-  }
-
-  return (Elf_Phdr *)((UINT8*)mPhdrBase + num * mEhdr->e_phentsize);
-}
-
-STATIC
-UINT32
-CoffAlign (
-  UINT32 Offset
-  )
-{
-  return (Offset + mCoffAlignment - 1) & ~(mCoffAlignment - 1);
-}
-
-//
-// filter functions
-//
-STATIC
-BOOLEAN
-IsTextShdr (
-  Elf_Shdr *Shdr
-  )
-{
-  return (BOOLEAN) ((Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) == SHF_ALLOC);
-}
-
-STATIC
-BOOLEAN
-IsHiiRsrcShdr (
-  Elf_Shdr *Shdr
-  )
-{
-  Elf_Shdr *Namedr = GetShdrByIndex(mEhdr->e_shstrndx);
-
-  return (BOOLEAN) (strcmp((CHAR8*)mEhdr + Namedr->sh_offset + Shdr->sh_name, ELF_HII_SECTION_NAME) == 0);
-}
-
-STATIC
-BOOLEAN
-IsDataShdr (
-  Elf_Shdr *Shdr
-  )
-{
-  if (IsHiiRsrcShdr(Shdr)) {
-    return FALSE;
-  }
-  return (BOOLEAN) (Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) == (SHF_ALLOC | SHF_WRITE);
-}
-
-//
-// Elf functions interface implementation
-//
-
-STATIC
-VOID
-ScanSections32 (
-  VOID
-  )
-{
-  UINT32                          i;
-  EFI_IMAGE_DOS_HEADER            *DosHdr;
-  EFI_IMAGE_OPTIONAL_HEADER_UNION *NtHdr;
-  UINT32                          CoffEntry;
-  UINT32                          SectionCount;
-  BOOLEAN                         FoundText;
-
-  CoffEntry = 0;
-  mCoffOffset = 0;
-  mTextOffset = 0;
-  FoundText = FALSE;
-
-  //
-  // Coff file start with a DOS header.
-  //
-  mCoffOffset = sizeof(EFI_IMAGE_DOS_HEADER) + 0x40;
-  mNtHdrOffset = mCoffOffset;
-  switch (mEhdr->e_machine) {
-  case EM_386:
-  case EM_ARM:
-    mCoffOffset += sizeof (EFI_IMAGE_NT_HEADERS32);
-  break;
-  default:
-    VerboseMsg ("%s unknown e_machine type. Assume IA-32", (UINTN)mEhdr->e_machine);
-    mCoffOffset += sizeof (EFI_IMAGE_NT_HEADERS32);
-  break;
-  }
-
-  mTableOffset = mCoffOffset;
-  mCoffOffset += mCoffNbrSections * sizeof(EFI_IMAGE_SECTION_HEADER);
-
-  //
-  // First text sections.
-  //
-  mCoffOffset = CoffAlign(mCoffOffset);
-  SectionCount = 0;
-  for (i = 0; i < mEhdr->e_shnum; i++) {
-    Elf_Shdr *shdr = GetShdrByIndex(i);
-    if (IsTextShdr(shdr)) {
-      if ((shdr->sh_addralign != 0) && (shdr->sh_addralign != 1)) {
-        // the alignment field is valid
-        if ((shdr->sh_addr & (shdr->sh_addralign - 1)) == 0) {
-          // if the section address is aligned we must align PE/COFF
-          mCoffOffset = (mCoffOffset + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1);
-        } else if ((shdr->sh_addr % shdr->sh_addralign) != (mCoffOffset % shdr->sh_addralign)) {
-          // ARM RVCT tools have behavior outside of the ELF specification to try
-          // and make images smaller.  If sh_addr is not aligned to sh_addralign
-          // then the section needs to preserve sh_addr MOD sh_addralign.
-          // Normally doing nothing here works great.
-          Error (NULL, 0, 3000, "Invalid", "Unsupported section alignment.");
-        }
-      }
-
-      /* Relocate entry.  */
-      if ((mEhdr->e_entry >= shdr->sh_addr) &&
-          (mEhdr->e_entry < shdr->sh_addr + shdr->sh_size)) {
-        CoffEntry = mCoffOffset + mEhdr->e_entry - shdr->sh_addr;
-      }
-
-      //
-      // Set mTextOffset with the offset of the first '.text' section
-      //
-      if (!FoundText) {
-        mTextOffset = mCoffOffset;
-        FoundText = TRUE;
-      }
-
-      mCoffSectionsOffset[i] = mCoffOffset;
-      mCoffOffset += shdr->sh_size;
-      SectionCount ++;
-    }
-  }
-
-  if (!FoundText) {
-    Error (NULL, 0, 3000, "Invalid", "Did not find any '.text' section.");
-    assert (FALSE);
-  }
-
-  if (mEhdr->e_machine != EM_ARM) {
-    mCoffOffset = CoffAlign(mCoffOffset);
-  }
-
-  if (SectionCount > 1 && mOutImageType == FW_EFI_IMAGE) {
-    Warning (NULL, 0, 0, NULL, "Mulitple sections in %s are merged into 1 text section. Source level debug might not work correctly.", mInImageName);
-  }
-
-  //
-  //  Then data sections.
-  //
-  mDataOffset = mCoffOffset;
-  SectionCount = 0;
-  for (i = 0; i < mEhdr->e_shnum; i++) {
-    Elf_Shdr *shdr = GetShdrByIndex(i);
-    if (IsDataShdr(shdr)) {
-      if ((shdr->sh_addralign != 0) && (shdr->sh_addralign != 1)) {
-        // the alignment field is valid
-        if ((shdr->sh_addr & (shdr->sh_addralign - 1)) == 0) {
-          // if the section address is aligned we must align PE/COFF
-          mCoffOffset = (mCoffOffset + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1);
-        } else if ((shdr->sh_addr % shdr->sh_addralign) != (mCoffOffset % shdr->sh_addralign)) {
-          // ARM RVCT tools have behavior outside of the ELF specification to try
-          // and make images smaller.  If sh_addr is not aligned to sh_addralign
-          // then the section needs to preserve sh_addr MOD sh_addralign.
-          // Normally doing nothing here works great.
-          Error (NULL, 0, 3000, "Invalid", "Unsupported section alignment.");
-        }
-      }
-      mCoffSectionsOffset[i] = mCoffOffset;
-      mCoffOffset += shdr->sh_size;
-      SectionCount ++;
-    }
-  }
-  mCoffOffset = CoffAlign(mCoffOffset);
-
-  if (SectionCount > 1 && mOutImageType == FW_EFI_IMAGE) {
-    Warning (NULL, 0, 0, NULL, "Mulitple sections in %s are merged into 1 data section. Source level debug might not work correctly.", mInImageName);
-  }
-
-  //
-  //  The HII resource sections.
-  //
-  mHiiRsrcOffset = mCoffOffset;
-  for (i = 0; i < mEhdr->e_shnum; i++) {
-    Elf_Shdr *shdr = GetShdrByIndex(i);
-    if (IsHiiRsrcShdr(shdr)) {
-      if ((shdr->sh_addralign != 0) && (shdr->sh_addralign != 1)) {
-        // the alignment field is valid
-        if ((shdr->sh_addr & (shdr->sh_addralign - 1)) == 0) {
-          // if the section address is aligned we must align PE/COFF
-          mCoffOffset = (mCoffOffset + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1);
-        } else if ((shdr->sh_addr % shdr->sh_addralign) != (mCoffOffset % shdr->sh_addralign)) {
-          // ARM RVCT tools have behavior outside of the ELF specification to try
-          // and make images smaller.  If sh_addr is not aligned to sh_addralign
-          // then the section needs to preserve sh_addr MOD sh_addralign.
-          // Normally doing nothing here works great.
-          Error (NULL, 0, 3000, "Invalid", "Unsupported section alignment.");
-        }
-      }
-      if (shdr->sh_size != 0) {
-        mCoffSectionsOffset[i] = mCoffOffset;
-        mCoffOffset += shdr->sh_size;
-        mCoffOffset = CoffAlign(mCoffOffset);
-        SetHiiResourceHeader ((UINT8*) mEhdr + shdr->sh_offset, mHiiRsrcOffset);
-      }
-      break;
-    }
-  }
-
-  mRelocOffset = mCoffOffset;
-
-  //
-  // Allocate base Coff file.  Will be expanded later for relocations.
-  //
-  mCoffFile = (UINT8 *)malloc(mCoffOffset);
-  memset(mCoffFile, 0, mCoffOffset);
-
-  //
-  // Fill headers.
-  //
-  DosHdr = (EFI_IMAGE_DOS_HEADER *)mCoffFile;
-  DosHdr->e_magic = EFI_IMAGE_DOS_SIGNATURE;
-  DosHdr->e_lfanew = mNtHdrOffset;
-
-  NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION*)(mCoffFile + mNtHdrOffset);
-
-  NtHdr->Pe32.Signature = EFI_IMAGE_NT_SIGNATURE;
-
-  switch (mEhdr->e_machine) {
-  case EM_386:
-    NtHdr->Pe32.FileHeader.Machine = EFI_IMAGE_MACHINE_IA32;
-    NtHdr->Pe32.OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;
-    break;
-  case EM_ARM:
-    NtHdr->Pe32.FileHeader.Machine = EFI_IMAGE_MACHINE_ARMT;
-    NtHdr->Pe32.OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;
-    break;
-  default:
-    VerboseMsg ("%s unknown e_machine type. Assume IA-32", (UINTN)mEhdr->e_machine);
-    NtHdr->Pe32.FileHeader.Machine = EFI_IMAGE_MACHINE_IA32;
-    NtHdr->Pe32.OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;
-  }
-
-  NtHdr->Pe32.FileHeader.NumberOfSections = mCoffNbrSections;
-  NtHdr->Pe32.FileHeader.TimeDateStamp = (UINT32) time(NULL);
-  mImageTimeStamp = NtHdr->Pe32.FileHeader.TimeDateStamp;
-  NtHdr->Pe32.FileHeader.PointerToSymbolTable = 0;
-  NtHdr->Pe32.FileHeader.NumberOfSymbols = 0;
-  NtHdr->Pe32.FileHeader.SizeOfOptionalHeader = sizeof(NtHdr->Pe32.OptionalHeader);
-  NtHdr->Pe32.FileHeader.Characteristics = EFI_IMAGE_FILE_EXECUTABLE_IMAGE
-    | EFI_IMAGE_FILE_LINE_NUMS_STRIPPED
-    | EFI_IMAGE_FILE_LOCAL_SYMS_STRIPPED
-    | EFI_IMAGE_FILE_32BIT_MACHINE;
-
-  NtHdr->Pe32.OptionalHeader.SizeOfCode = mDataOffset - mTextOffset;
-  NtHdr->Pe32.OptionalHeader.SizeOfInitializedData = mRelocOffset - mDataOffset;
-  NtHdr->Pe32.OptionalHeader.SizeOfUninitializedData = 0;
-  NtHdr->Pe32.OptionalHeader.AddressOfEntryPoint = CoffEntry;
-
-  NtHdr->Pe32.OptionalHeader.BaseOfCode = mTextOffset;
-
-  NtHdr->Pe32.OptionalHeader.BaseOfData = mDataOffset;
-  NtHdr->Pe32.OptionalHeader.ImageBase = 0;
-  NtHdr->Pe32.OptionalHeader.SectionAlignment = mCoffAlignment;
-  NtHdr->Pe32.OptionalHeader.FileAlignment = mCoffAlignment;
-  NtHdr->Pe32.OptionalHeader.SizeOfImage = 0;
-
-  NtHdr->Pe32.OptionalHeader.SizeOfHeaders = mTextOffset;
-  NtHdr->Pe32.OptionalHeader.NumberOfRvaAndSizes = EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES;
-
-  //
-  // Section headers.
-  //
-  if ((mDataOffset - mTextOffset) > 0) {
-    CreateSectionHeader (".text", mTextOffset, mDataOffset - mTextOffset,
-            EFI_IMAGE_SCN_CNT_CODE
-            | EFI_IMAGE_SCN_MEM_EXECUTE
-            | EFI_IMAGE_SCN_MEM_READ);
-  } else {
-    // Don't make a section of size 0.
-    NtHdr->Pe32.FileHeader.NumberOfSections--;
-  }
-
-  if ((mHiiRsrcOffset - mDataOffset) > 0) {
-    CreateSectionHeader (".data", mDataOffset, mHiiRsrcOffset - mDataOffset,
-            EFI_IMAGE_SCN_CNT_INITIALIZED_DATA
-            | EFI_IMAGE_SCN_MEM_WRITE
-            | EFI_IMAGE_SCN_MEM_READ);
-  } else {
-    // Don't make a section of size 0.
-    NtHdr->Pe32.FileHeader.NumberOfSections--;
-  }
-
-  if ((mRelocOffset - mHiiRsrcOffset) > 0) {
-    CreateSectionHeader (".rsrc", mHiiRsrcOffset, mRelocOffset - mHiiRsrcOffset,
-            EFI_IMAGE_SCN_CNT_INITIALIZED_DATA
-            | EFI_IMAGE_SCN_MEM_READ);
-
-    NtHdr->Pe32.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = mRelocOffset - mHiiRsrcOffset;
-    NtHdr->Pe32.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = mHiiRsrcOffset;
-  } else {
-    // Don't make a section of size 0.
-    NtHdr->Pe32.FileHeader.NumberOfSections--;
-  }
-
-}
-
-STATIC
-BOOLEAN
-WriteSections32 (
-  SECTION_FILTER_TYPES  FilterType
-  )
-{
-  UINT32      Idx;
-  Elf_Shdr    *SecShdr;
-  UINT32      SecOffset;
-  BOOLEAN     (*Filter)(Elf_Shdr *);
-
-  //
-  // Initialize filter pointer
-  //
-  switch (FilterType) {
-    case SECTION_TEXT:
-      Filter = IsTextShdr;
-      break;
-    case SECTION_HII:
-      Filter = IsHiiRsrcShdr;
-      break;
-    case SECTION_DATA:
-      Filter = IsDataShdr;
-      break;
-    default:
-      return FALSE;
-  }
-
-  //
-  // First: copy sections.
-  //
-  for (Idx = 0; Idx < mEhdr->e_shnum; Idx++) {
-    Elf_Shdr *Shdr = GetShdrByIndex(Idx);
-    if ((*Filter)(Shdr)) {
-      switch (Shdr->sh_type) {
-      case SHT_PROGBITS:
-        /* Copy.  */
-        memcpy(mCoffFile + mCoffSectionsOffset[Idx],
-              (UINT8*)mEhdr + Shdr->sh_offset,
-              Shdr->sh_size);
-        break;
-
-      case SHT_NOBITS:
-        memset(mCoffFile + mCoffSectionsOffset[Idx], 0, Shdr->sh_size);
-        break;
-
-      default:
-        //
-        //  Ignore for unkown section type.
-        //
-        VerboseMsg ("%s unknown section type %x. We directly copy this section into Coff file", mInImageName, (unsigned)Shdr->sh_type);
-        break;
-      }
-    }
-  }
-
-  //
-  // Second: apply relocations.
-  //
-  for (Idx = 0; Idx < mEhdr->e_shnum; Idx++) {
-    //
-    // Determine if this is a relocation section.
-    //
-    Elf_Shdr *RelShdr = GetShdrByIndex(Idx);
-    if ((RelShdr->sh_type != SHT_REL) && (RelShdr->sh_type != SHT_RELA)) {
-      continue;
-    }
-    
-    //
-    // Relocation section found.  Now extract section information that the relocations
-    // apply to in the ELF data and the new COFF data.
-    //
-    SecShdr = GetShdrByIndex(RelShdr->sh_info);
-    SecOffset = mCoffSectionsOffset[RelShdr->sh_info];
-    
-    //
-    // Only process relocations for the current filter type.
-    //
-    if (RelShdr->sh_type == SHT_REL && (*Filter)(SecShdr)) {
-      UINT32 RelOffset;
-      
-      //
-      // Determine the symbol table referenced by the relocation data.
-      //
-      Elf_Shdr *SymtabShdr = GetShdrByIndex(RelShdr->sh_link);
-      UINT8 *Symtab = (UINT8*)mEhdr + SymtabShdr->sh_offset;
-
-      //
-      // Process all relocation entries for this section.
-      //
-      for (RelOffset = 0; RelOffset < RelShdr->sh_size; RelOffset += RelShdr->sh_entsize) {
-        //
-        // Set pointer to relocation entry
-        //
-        Elf_Rel *Rel = (Elf_Rel *)((UINT8*)mEhdr + RelShdr->sh_offset + RelOffset);
-        
-        //
-        // Set pointer to symbol table entry associated with the relocation entry.
-        //
-        Elf_Sym *Sym = (Elf_Sym *)(Symtab + ELF_R_SYM(Rel->r_info) * SymtabShdr->sh_entsize);
-        
-        Elf_Shdr *SymShdr;
-        UINT8 *Targ;
-        UINT16 Address;
-
-        //
-        // Check section header index found in symbol table and get the section 
-        // header location.
-        //
-        if (Sym->st_shndx == SHN_UNDEF
-            || Sym->st_shndx == SHN_ABS
-            || Sym->st_shndx > mEhdr->e_shnum) {
-          Error (NULL, 0, 3000, "Invalid", "%s bad symbol definition.", mInImageName);
-        }
-        SymShdr = GetShdrByIndex(Sym->st_shndx);
-
-        //
-        // Convert the relocation data to a pointer into the coff file.
-        //
-        // Note: 
-        //   r_offset is the virtual address of the storage unit to be relocated.
-        //   sh_addr is the virtual address for the base of the section.
-        //
-        Targ = mCoffFile + SecOffset + (Rel->r_offset - SecShdr->sh_addr);
-
-        //
-        // Determine how to handle each relocation type based on the machine type.
-        //
-        if (mEhdr->e_machine == EM_386) {
-          switch (ELF_R_TYPE(Rel->r_info)) {
-          case R_386_NONE:
-            break;
-          case R_386_32:
-            //
-            // Absolute relocation.
-            //  Converts Targ from a absolute virtual address to the absolute
-            //  COFF address.
-            //
-            *(UINT32 *)Targ = *(UINT32 *)Targ - SymShdr->sh_addr
-              + mCoffSectionsOffset[Sym->st_shndx];
-            break;
-          case R_386_PC32:
-            //
-            // Relative relocation: Symbol - Ip + Addend
-            //
-            *(UINT32 *)Targ = *(UINT32 *)Targ
-              + (mCoffSectionsOffset[Sym->st_shndx] - SymShdr->sh_addr)
-              - (SecOffset - SecShdr->sh_addr);
-            break;
-          default:
-            Error (NULL, 0, 3000, "Invalid", "%s unsupported ELF EM_386 relocation 0x%x.", mInImageName, (unsigned) ELF_R_TYPE(Rel->r_info));
-          }
-        } else if (mEhdr->e_machine == EM_ARM) {
-          switch (ELF32_R_TYPE(Rel->r_info)) {
-          case R_ARM_RBASE:
-            // No relocation - no action required
-            // break skipped
-
-          case R_ARM_PC24:
-          case R_ARM_XPC25:
-          case R_ARM_THM_PC22:
-          case R_ARM_THM_JUMP19:
-          case R_ARM_CALL:
-          case R_ARM_JMP24:
-          case R_ARM_THM_JUMP24:  
-          case R_ARM_PREL31:  
-          case R_ARM_MOVW_PREL_NC:  
-          case R_ARM_MOVT_PREL:
-          case R_ARM_THM_MOVW_PREL_NC:
-          case R_ARM_THM_MOVT_PREL:
-          case R_ARM_THM_JMP6:
-          case R_ARM_THM_ALU_PREL_11_0:
-          case R_ARM_THM_PC12:
-          case R_ARM_REL32_NOI:
-          case R_ARM_ALU_PC_G0_NC:
-          case R_ARM_ALU_PC_G0:
-          case R_ARM_ALU_PC_G1_NC:
-          case R_ARM_ALU_PC_G1:
-          case R_ARM_ALU_PC_G2:
-          case R_ARM_LDR_PC_G1:
-          case R_ARM_LDR_PC_G2:
-          case R_ARM_LDRS_PC_G0:
-          case R_ARM_LDRS_PC_G1:
-          case R_ARM_LDRS_PC_G2:
-          case R_ARM_LDC_PC_G0:
-          case R_ARM_LDC_PC_G1:
-          case R_ARM_LDC_PC_G2:
-          case R_ARM_GOT_PREL:
-          case R_ARM_THM_JUMP11:
-          case R_ARM_THM_JUMP8:
-          case R_ARM_TLS_GD32:
-          case R_ARM_TLS_LDM32:
-          case R_ARM_TLS_IE32:
-            // Thease are all PC-relative relocations and don't require modification
-            // GCC does not seem to have the concept of a application that just needs to get relocated.
-            break;
-
-          case R_ARM_THM_MOVW_ABS_NC:
-            // MOVW is only lower 16-bits of the addres
-            Address = (UINT16)(Sym->st_value - SymShdr->sh_addr + mCoffSectionsOffset[Sym->st_shndx]);
-            ThumbMovtImmediatePatch ((UINT16 *)Targ, Address);
-            break;
-
-          case R_ARM_THM_MOVT_ABS:
-            // MOVT is only upper 16-bits of the addres
-            Address = (UINT16)((Sym->st_value - SymShdr->sh_addr + mCoffSectionsOffset[Sym->st_shndx]) >> 16);
-            ThumbMovtImmediatePatch ((UINT16 *)Targ, Address);
-            break;
-
-          case R_ARM_ABS32:
-          case R_ARM_RABS32:
-            //
-            // Absolute relocation.
-            //
-            *(UINT32 *)Targ = *(UINT32 *)Targ - SymShdr->sh_addr + mCoffSectionsOffset[Sym->st_shndx];
-            break;
-
-          default:
-            Error (NULL, 0, 3000, "Invalid", "WriteSections (): %s unsupported ELF EM_ARM relocation 0x%x.", mInImageName, (unsigned) ELF32_R_TYPE(Rel->r_info));
-          }
-        }
-      }
-    }
-  }
-
-  return TRUE;
-}
-
-UINTN gMovwOffset = 0;
-
-STATIC
-VOID
-WriteRelocations32 (
-  VOID
-  )
-{
-  UINT32                           Index;
-  EFI_IMAGE_OPTIONAL_HEADER_UNION  *NtHdr;
-  EFI_IMAGE_DATA_DIRECTORY         *Dir;
-  BOOLEAN                          FoundRelocations;
-  Elf_Dyn                          *Dyn;
-  Elf_Rel                          *Rel;
-  UINTN                            RelElementSize;
-  UINTN                            RelSize;
-  UINTN                            RelOffset;
-  UINTN                            K;
-  UINT8                            *Targ;
-  Elf32_Phdr                       *DynamicSegment;
-  Elf32_Phdr                       *TargetSegment;
-
-  for (Index = 0, FoundRelocations = FALSE; Index < mEhdr->e_shnum; Index++) {
-    Elf_Shdr *RelShdr = GetShdrByIndex(Index);
-    if ((RelShdr->sh_type == SHT_REL) || (RelShdr->sh_type == SHT_RELA)) {
-      Elf_Shdr *SecShdr = GetShdrByIndex (RelShdr->sh_info);
-      if (IsTextShdr(SecShdr) || IsDataShdr(SecShdr)) {
-        UINT32 RelIdx;
-
-        FoundRelocations = TRUE;
-        for (RelIdx = 0; RelIdx < RelShdr->sh_size; RelIdx += RelShdr->sh_entsize) {
-          Elf_Rel  *Rel = (Elf_Rel *)((UINT8*)mEhdr + RelShdr->sh_offset + RelIdx);
-
-          if (mEhdr->e_machine == EM_386) { 
-            switch (ELF_R_TYPE(Rel->r_info)) {
-            case R_386_NONE:
-            case R_386_PC32:
-              //
-              // No fixup entry required.
-              //
-              break;
-            case R_386_32:
-              //
-              // Creates a relative relocation entry from the absolute entry.
-              //
-              CoffAddFixup(mCoffSectionsOffset[RelShdr->sh_info]
-              + (Rel->r_offset - SecShdr->sh_addr),
-              EFI_IMAGE_REL_BASED_HIGHLOW);
-              break;
-            default:
-              Error (NULL, 0, 3000, "Invalid", "%s unsupported ELF EM_386 relocation 0x%x.", mInImageName, (unsigned) ELF_R_TYPE(Rel->r_info));
-            }
-          } else if (mEhdr->e_machine == EM_ARM) {
-            switch (ELF32_R_TYPE(Rel->r_info)) {
-            case R_ARM_RBASE:
-              // No relocation - no action required
-              // break skipped
-
-            case R_ARM_PC24:
-            case R_ARM_XPC25:
-            case R_ARM_THM_PC22:
-            case R_ARM_THM_JUMP19:
-            case R_ARM_CALL:
-            case R_ARM_JMP24:
-            case R_ARM_THM_JUMP24:  
-            case R_ARM_PREL31:  
-            case R_ARM_MOVW_PREL_NC:  
-            case R_ARM_MOVT_PREL:
-            case R_ARM_THM_MOVW_PREL_NC:
-            case R_ARM_THM_MOVT_PREL:
-            case R_ARM_THM_JMP6:
-            case R_ARM_THM_ALU_PREL_11_0:
-            case R_ARM_THM_PC12:
-            case R_ARM_REL32_NOI:
-            case R_ARM_ALU_PC_G0_NC:
-            case R_ARM_ALU_PC_G0:
-            case R_ARM_ALU_PC_G1_NC:
-            case R_ARM_ALU_PC_G1:
-            case R_ARM_ALU_PC_G2:
-            case R_ARM_LDR_PC_G1:
-            case R_ARM_LDR_PC_G2:
-            case R_ARM_LDRS_PC_G0:
-            case R_ARM_LDRS_PC_G1:
-            case R_ARM_LDRS_PC_G2:
-            case R_ARM_LDC_PC_G0:
-            case R_ARM_LDC_PC_G1:
-            case R_ARM_LDC_PC_G2:
-            case R_ARM_GOT_PREL:
-            case R_ARM_THM_JUMP11:
-            case R_ARM_THM_JUMP8:
-            case R_ARM_TLS_GD32:
-            case R_ARM_TLS_LDM32:
-            case R_ARM_TLS_IE32:
-              // Thease are all PC-relative relocations and don't require modification
-              break;
-
-            case R_ARM_THM_MOVW_ABS_NC:
-              CoffAddFixup (
-                mCoffSectionsOffset[RelShdr->sh_info]
-                + (Rel->r_offset - SecShdr->sh_addr),
-                EFI_IMAGE_REL_BASED_ARM_MOV32T
-                );
-
-              // PE/COFF treats MOVW/MOVT relocation as single 64-bit instruction
-              // Track this address so we can log an error for unsupported sequence of MOVW/MOVT
-              gMovwOffset = mCoffSectionsOffset[RelShdr->sh_info] + (Rel->r_offset - SecShdr->sh_addr);
-              break;
-
-            case R_ARM_THM_MOVT_ABS:
-              if ((gMovwOffset + 4) !=  (mCoffSectionsOffset[RelShdr->sh_info] + (Rel->r_offset - SecShdr->sh_addr))) {
-                Error (NULL, 0, 3000, "Not Supported", "PE/COFF requires MOVW+MOVT instruction sequence %x +4 != %x.", gMovwOffset, mCoffSectionsOffset[RelShdr->sh_info] + (Rel->r_offset - SecShdr->sh_addr));
-              }
-              break;
-
-            case R_ARM_ABS32:
-            case R_ARM_RABS32:
-              CoffAddFixup (
-                mCoffSectionsOffset[RelShdr->sh_info]
-                + (Rel->r_offset - SecShdr->sh_addr),
-                EFI_IMAGE_REL_BASED_HIGHLOW
-                );
-              break;
-
-           default:
-              Error (NULL, 0, 3000, "Invalid", "WriteRelocations(): %s unsupported ELF EM_ARM relocation 0x%x.", mInImageName, (unsigned) ELF32_R_TYPE(Rel->r_info));
-            }
-          } else {
-            Error (NULL, 0, 3000, "Not Supported", "This tool does not support relocations for ELF with e_machine %u (processor type).", (unsigned) mEhdr->e_machine);
-          }
-        }
-      }
-    }
-  }
-
-  if (!FoundRelocations && (mEhdr->e_machine == EM_ARM)) {
-    /* Try again, but look for PT_DYNAMIC instead of SHT_REL */
-
-    for (Index = 0; Index < mEhdr->e_phnum; Index++) {
-      RelElementSize = 0;
-      RelSize = 0;
-      RelOffset = 0;
-
-      DynamicSegment = GetPhdrByIndex (Index);
-
-      if (DynamicSegment->p_type == PT_DYNAMIC) {
-        Dyn = (Elf32_Dyn *) ((UINT8 *)mEhdr + DynamicSegment->p_offset);
-
-        while (Dyn->d_tag != DT_NULL) {
-          switch (Dyn->d_tag) {
-            case  DT_REL:
-              RelOffset = Dyn->d_un.d_val;
-              break;
-
-            case  DT_RELSZ:
-              RelSize = Dyn->d_un.d_val;
-              break;
-
-            case  DT_RELENT:
-              RelElementSize = Dyn->d_un.d_val;
-              break;
-
-            default:
-              break;
-          }
-          Dyn++;
-        }
-        if (( RelOffset == 0 ) || ( RelSize == 0 ) || ( RelElementSize == 0 )) {
-          Error (NULL, 0, 3000, "Invalid", "%s bad ARM dynamic relocations.", mInImageName);
-        }
-
-        for (K = 0; K < RelSize; K += RelElementSize) {
-
-          if (DynamicSegment->p_paddr == 0) {
-            // Older versions of the ARM ELF (SWS ESPC 0003 B-02) specification define DT_REL
-            // as an offset in the dynamic segment. p_paddr is defined to be zero for ARM tools
-            Rel = (Elf32_Rel *) ((UINT8 *) mEhdr + DynamicSegment->p_offset + RelOffset + K);
-          } else {
-            // This is how it reads in the generic ELF specification
-            Rel = (Elf32_Rel *) ((UINT8 *) mEhdr + RelOffset + K);
-          }
-
-          switch (ELF32_R_TYPE (Rel->r_info)) {
-          case  R_ARM_RBASE:
-            break;
-
-          case  R_ARM_RABS32:
-            TargetSegment = GetPhdrByIndex (ELF32_R_SYM (Rel->r_info) - 1);
-
-            // Note: r_offset in a memory address.  Convert it to a pointer in the coff file.
-            Targ = mCoffFile + mCoffSectionsOffset[ ELF32_R_SYM( Rel->r_info ) ] + Rel->r_offset - TargetSegment->p_vaddr;
-
-            *(UINT32 *)Targ = *(UINT32 *)Targ + mCoffSectionsOffset [ELF32_R_SYM( Rel->r_info )];
-
-            CoffAddFixup (mCoffSectionsOffset[ELF32_R_SYM (Rel->r_info)] + (Rel->r_offset - TargetSegment->p_vaddr), EFI_IMAGE_REL_BASED_HIGHLOW);
-            break;
-          
-          default:
-            Error (NULL, 0, 3000, "Invalid", "%s bad ARM dynamic relocations, unkown type %d.", mInImageName, ELF32_R_TYPE (Rel->r_info));
-            break;
-          }
-        }
-        break;
-      }
-    }
-  }
-
-  //
-  // Pad by adding empty entries.
-  //
-  while (mCoffOffset & (mCoffAlignment - 1)) {
-    CoffAddFixupEntry(0);
-  }
-
-  NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset);
-  Dir = &NtHdr->Pe32.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC];
-  Dir->Size = mCoffOffset - mRelocOffset;
-  if (Dir->Size == 0) {
-    // If no relocations, null out the directory entry and don't add the .reloc section
-    Dir->VirtualAddress = 0;
-    NtHdr->Pe32.FileHeader.NumberOfSections--;
-  } else {
-    Dir->VirtualAddress = mRelocOffset;
-    CreateSectionHeader (".reloc", mRelocOffset, mCoffOffset - mRelocOffset,
-            EFI_IMAGE_SCN_CNT_INITIALIZED_DATA
-            | EFI_IMAGE_SCN_MEM_DISCARDABLE
-            | EFI_IMAGE_SCN_MEM_READ);
-  }
-
-}
-
-STATIC
-VOID
-WriteDebug32 (
-  VOID
-  )
-{
-  UINT32                              Len;
-  UINT32                              DebugOffset;
-  EFI_IMAGE_OPTIONAL_HEADER_UNION     *NtHdr;
-  EFI_IMAGE_DATA_DIRECTORY            *DataDir;
-  EFI_IMAGE_DEBUG_DIRECTORY_ENTRY     *Dir;
-  EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10;
-
-  Len = strlen(mInImageName) + 1;
-  DebugOffset = mCoffOffset;
-
-  mCoffOffset += sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY)
-    + sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY)
-    + Len;
-  mCoffOffset = CoffAlign(mCoffOffset);
-
-  mCoffFile = realloc(mCoffFile, mCoffOffset);
-  memset(mCoffFile + DebugOffset, 0, mCoffOffset - DebugOffset);
-
-  Dir = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY*)(mCoffFile + DebugOffset);
-  Dir->Type = EFI_IMAGE_DEBUG_TYPE_CODEVIEW;
-  Dir->SizeOfData = sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) + Len;
-  Dir->RVA = DebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);
-  Dir->FileOffset = DebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);
-
-  Nb10 = (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY*)(Dir + 1);
-  Nb10->Signature = CODEVIEW_SIGNATURE_NB10;
-  strcpy ((char *)(Nb10 + 1), mInImageName);
-
-
-  NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset);
-  DataDir = &NtHdr->Pe32.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG];
-  DataDir->VirtualAddress = DebugOffset;
-  DataDir->Size = mCoffOffset - DebugOffset;
-  if (DataDir->Size == 0) {
-    // If no debug, null out the directory entry and don't add the .debug section
-    DataDir->VirtualAddress = 0;
-    NtHdr->Pe32.FileHeader.NumberOfSections--;
-  } else {
-    DataDir->VirtualAddress = DebugOffset;
-    CreateSectionHeader (".debug", DebugOffset, mCoffOffset - DebugOffset,
-            EFI_IMAGE_SCN_CNT_INITIALIZED_DATA
-            | EFI_IMAGE_SCN_MEM_DISCARDABLE
-            | EFI_IMAGE_SCN_MEM_READ);
-
-  }
-}
-
-STATIC
-VOID
-SetImageSize32 (
-  VOID
-  )
-{
-  EFI_IMAGE_OPTIONAL_HEADER_UNION *NtHdr;
-  
-  //
-  // Set image size
-  //
-  NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset);
-  NtHdr->Pe32.OptionalHeader.SizeOfImage = mCoffOffset;
-}
-
-STATIC
-VOID
-CleanUp32 (
-  VOID
-  )
-{
-  if (mCoffSectionsOffset != NULL) {
-    free (mCoffSectionsOffset);
-  }
-}
-
-
+/** @file\r
+\r
+Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Portions copyright (c) 2013, ARM Ltd. All rights reserved.<BR>\r
+\r
+This program and the accompanying materials are licensed and made available\r
+under the terms and conditions of the BSD License which accompanies this\r
+distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+**/\r
+\r
+#include "WinNtInclude.h"\r
+\r
+#ifndef __GNUC__\r
+#include <windows.h>\r
+#include <io.h>\r
+#endif\r
+#include <assert.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <string.h>\r
+#include <time.h>\r
+#include <ctype.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <IndustryStandard/PeImage.h>\r
+\r
+#include "PeCoffLib.h"\r
+#include "EfiUtilityMsgs.h"\r
+\r
+#include "GenFw.h"\r
+#include "ElfConvert.h"\r
+#include "Elf32Convert.h"\r
+\r
+STATIC\r
+VOID\r
+ScanSections32 (\r
+  VOID\r
+  );\r
+\r
+STATIC\r
+BOOLEAN\r
+WriteSections32 (\r
+  SECTION_FILTER_TYPES  FilterType\r
+  );\r
+\r
+STATIC\r
+VOID\r
+WriteRelocations32 (\r
+  VOID\r
+  );\r
+\r
+STATIC\r
+VOID\r
+WriteDebug32 (\r
+  VOID\r
+  );\r
+\r
+STATIC\r
+VOID\r
+SetImageSize32 (\r
+  VOID\r
+  );\r
+\r
+STATIC\r
+VOID\r
+CleanUp32 (\r
+  VOID\r
+  );\r
+\r
+//\r
+// Rename ELF32 strucutres to common names to help when porting to ELF64.\r
+//\r
+typedef Elf32_Shdr Elf_Shdr;\r
+typedef Elf32_Ehdr Elf_Ehdr;\r
+typedef Elf32_Rel Elf_Rel;\r
+typedef Elf32_Sym Elf_Sym;\r
+typedef Elf32_Phdr Elf_Phdr;\r
+typedef Elf32_Dyn Elf_Dyn;\r
+#define ELFCLASS ELFCLASS32\r
+#define ELF_R_TYPE(r) ELF32_R_TYPE(r)\r
+#define ELF_R_SYM(r) ELF32_R_SYM(r)\r
+\r
+//\r
+// Well known ELF structures.\r
+//\r
+STATIC Elf_Ehdr *mEhdr;\r
+STATIC Elf_Shdr *mShdrBase;\r
+STATIC Elf_Phdr *mPhdrBase;\r
+\r
+//\r
+// Coff information\r
+//\r
+STATIC const UINT32 mCoffAlignment = 0x20;\r
+\r
+//\r
+// PE section alignment.\r
+//\r
+STATIC const UINT16 mCoffNbrSections = 5;\r
+\r
+//\r
+// ELF sections to offset in Coff file.\r
+//\r
+STATIC UINT32 *mCoffSectionsOffset = NULL;\r
+\r
+//\r
+// Offsets in COFF file\r
+//\r
+STATIC UINT32 mNtHdrOffset;\r
+STATIC UINT32 mTextOffset;\r
+STATIC UINT32 mDataOffset;\r
+STATIC UINT32 mHiiRsrcOffset;\r
+STATIC UINT32 mRelocOffset;\r
+\r
+//\r
+// Initialization Function\r
+//\r
+BOOLEAN\r
+InitializeElf32 (\r
+  UINT8               *FileBuffer,\r
+  ELF_FUNCTION_TABLE  *ElfFunctions\r
+  )\r
+{\r
+  //\r
+  // Initialize data pointer and structures.\r
+  //\r
+  mEhdr = (Elf_Ehdr*) FileBuffer;  \r
+\r
+  //\r
+  // Check the ELF32 specific header information.\r
+  //\r
+  if (mEhdr->e_ident[EI_CLASS] != ELFCLASS32) {\r
+    Error (NULL, 0, 3000, "Unsupported", "ELF EI_DATA not ELFCLASS32");\r
+    return FALSE;\r
+  }\r
+  if (mEhdr->e_ident[EI_DATA] != ELFDATA2LSB) {\r
+    Error (NULL, 0, 3000, "Unsupported", "ELF EI_DATA not ELFDATA2LSB");\r
+    return FALSE;\r
+  }  \r
+  if ((mEhdr->e_type != ET_EXEC) && (mEhdr->e_type != ET_DYN)) {\r
+    Error (NULL, 0, 3000, "Unsupported", "ELF e_type not ET_EXEC or ET_DYN");\r
+    return FALSE;\r
+  }\r
+  if (!((mEhdr->e_machine == EM_386) || (mEhdr->e_machine == EM_ARM))) { \r
+    Error (NULL, 0, 3000, "Unsupported", "ELF e_machine not EM_386 or EM_ARM");\r
+    return FALSE;\r
+  }\r
+  if (mEhdr->e_version != EV_CURRENT) {\r
+    Error (NULL, 0, 3000, "Unsupported", "ELF e_version (%u) not EV_CURRENT (%d)", (unsigned) mEhdr->e_version, EV_CURRENT);\r
+    return FALSE;\r
+  }\r
+  \r
+  //\r
+  // Update section header pointers\r
+  //\r
+  mShdrBase  = (Elf_Shdr *)((UINT8 *)mEhdr + mEhdr->e_shoff);\r
+  mPhdrBase = (Elf_Phdr *)((UINT8 *)mEhdr + mEhdr->e_phoff);\r
+  \r
+  //\r
+  // Create COFF Section offset buffer and zero.\r
+  //\r
+  mCoffSectionsOffset = (UINT32 *)malloc(mEhdr->e_shnum * sizeof (UINT32));\r
+  memset(mCoffSectionsOffset, 0, mEhdr->e_shnum * sizeof(UINT32));\r
+\r
+  //\r
+  // Fill in function pointers.\r
+  //\r
+  ElfFunctions->ScanSections = ScanSections32;\r
+  ElfFunctions->WriteSections = WriteSections32;\r
+  ElfFunctions->WriteRelocations = WriteRelocations32;\r
+  ElfFunctions->WriteDebug = WriteDebug32;\r
+  ElfFunctions->SetImageSize = SetImageSize32;\r
+  ElfFunctions->CleanUp = CleanUp32;\r
+\r
+  return TRUE;\r
+}\r
+\r
+\r
+//\r
+// Header by Index functions\r
+//\r
+STATIC\r
+Elf_Shdr*\r
+GetShdrByIndex (\r
+  UINT32 Num\r
+  )\r
+{\r
+  if (Num >= mEhdr->e_shnum)\r
+    return NULL;\r
+  return (Elf_Shdr*)((UINT8*)mShdrBase + Num * mEhdr->e_shentsize);\r
+}\r
+\r
+STATIC\r
+Elf_Phdr*\r
+GetPhdrByIndex (\r
+  UINT32 num\r
+  )\r
+{\r
+  if (num >= mEhdr->e_phnum) {\r
+    return NULL;\r
+  }\r
+\r
+  return (Elf_Phdr *)((UINT8*)mPhdrBase + num * mEhdr->e_phentsize);\r
+}\r
+\r
+STATIC\r
+UINT32\r
+CoffAlign (\r
+  UINT32 Offset\r
+  )\r
+{\r
+  return (Offset + mCoffAlignment - 1) & ~(mCoffAlignment - 1);\r
+}\r
+\r
+//\r
+// filter functions\r
+//\r
+STATIC\r
+BOOLEAN\r
+IsTextShdr (\r
+  Elf_Shdr *Shdr\r
+  )\r
+{\r
+  return (BOOLEAN) ((Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) == SHF_ALLOC);\r
+}\r
+\r
+STATIC\r
+BOOLEAN\r
+IsHiiRsrcShdr (\r
+  Elf_Shdr *Shdr\r
+  )\r
+{\r
+  Elf_Shdr *Namedr = GetShdrByIndex(mEhdr->e_shstrndx);\r
+\r
+  return (BOOLEAN) (strcmp((CHAR8*)mEhdr + Namedr->sh_offset + Shdr->sh_name, ELF_HII_SECTION_NAME) == 0);\r
+}\r
+\r
+STATIC\r
+BOOLEAN\r
+IsDataShdr (\r
+  Elf_Shdr *Shdr\r
+  )\r
+{\r
+  if (IsHiiRsrcShdr(Shdr)) {\r
+    return FALSE;\r
+  }\r
+  return (BOOLEAN) (Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) == (SHF_ALLOC | SHF_WRITE);\r
+}\r
+\r
+//\r
+// Elf functions interface implementation\r
+//\r
+\r
+STATIC\r
+VOID\r
+ScanSections32 (\r
+  VOID\r
+  )\r
+{\r
+  UINT32                          i;\r
+  EFI_IMAGE_DOS_HEADER            *DosHdr;\r
+  EFI_IMAGE_OPTIONAL_HEADER_UNION *NtHdr;\r
+  UINT32                          CoffEntry;\r
+  UINT32                          SectionCount;\r
+  BOOLEAN                         FoundText;\r
+\r
+  CoffEntry = 0;\r
+  mCoffOffset = 0;\r
+  mTextOffset = 0;\r
+  FoundText = FALSE;\r
+\r
+  //\r
+  // Coff file start with a DOS header.\r
+  //\r
+  mCoffOffset = sizeof(EFI_IMAGE_DOS_HEADER) + 0x40;\r
+  mNtHdrOffset = mCoffOffset;\r
+  switch (mEhdr->e_machine) {\r
+  case EM_386:\r
+  case EM_ARM:\r
+    mCoffOffset += sizeof (EFI_IMAGE_NT_HEADERS32);\r
+  break;\r
+  default:\r
+    VerboseMsg ("%s unknown e_machine type. Assume IA-32", (UINTN)mEhdr->e_machine);\r
+    mCoffOffset += sizeof (EFI_IMAGE_NT_HEADERS32);\r
+  break;\r
+  }\r
+\r
+  mTableOffset = mCoffOffset;\r
+  mCoffOffset += mCoffNbrSections * sizeof(EFI_IMAGE_SECTION_HEADER);\r
+\r
+  //\r
+  // First text sections.\r
+  //\r
+  mCoffOffset = CoffAlign(mCoffOffset);\r
+  SectionCount = 0;\r
+  for (i = 0; i < mEhdr->e_shnum; i++) {\r
+    Elf_Shdr *shdr = GetShdrByIndex(i);\r
+    if (IsTextShdr(shdr)) {\r
+      if ((shdr->sh_addralign != 0) && (shdr->sh_addralign != 1)) {\r
+        // the alignment field is valid\r
+        if ((shdr->sh_addr & (shdr->sh_addralign - 1)) == 0) {\r
+          // if the section address is aligned we must align PE/COFF\r
+          mCoffOffset = (mCoffOffset + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1);\r
+        } else if ((shdr->sh_addr % shdr->sh_addralign) != (mCoffOffset % shdr->sh_addralign)) {\r
+          // ARM RVCT tools have behavior outside of the ELF specification to try\r
+          // and make images smaller.  If sh_addr is not aligned to sh_addralign\r
+          // then the section needs to preserve sh_addr MOD sh_addralign.\r
+          // Normally doing nothing here works great.\r
+          Error (NULL, 0, 3000, "Invalid", "Unsupported section alignment.");\r
+        }\r
+      }\r
+\r
+      /* Relocate entry.  */\r
+      if ((mEhdr->e_entry >= shdr->sh_addr) &&\r
+          (mEhdr->e_entry < shdr->sh_addr + shdr->sh_size)) {\r
+        CoffEntry = mCoffOffset + mEhdr->e_entry - shdr->sh_addr;\r
+      }\r
+\r
+      //\r
+      // Set mTextOffset with the offset of the first '.text' section\r
+      //\r
+      if (!FoundText) {\r
+        mTextOffset = mCoffOffset;\r
+        FoundText = TRUE;\r
+      }\r
+\r
+      mCoffSectionsOffset[i] = mCoffOffset;\r
+      mCoffOffset += shdr->sh_size;\r
+      SectionCount ++;\r
+    }\r
+  }\r
+\r
+  if (!FoundText) {\r
+    Error (NULL, 0, 3000, "Invalid", "Did not find any '.text' section.");\r
+    assert (FALSE);\r
+  }\r
+\r
+  if (mEhdr->e_machine != EM_ARM) {\r
+    mCoffOffset = CoffAlign(mCoffOffset);\r
+  }\r
+\r
+  if (SectionCount > 1 && mOutImageType == FW_EFI_IMAGE) {\r
+    Warning (NULL, 0, 0, NULL, "Mulitple sections in %s are merged into 1 text section. Source level debug might not work correctly.", mInImageName);\r
+  }\r
+\r
+  //\r
+  //  Then data sections.\r
+  //\r
+  mDataOffset = mCoffOffset;\r
+  SectionCount = 0;\r
+  for (i = 0; i < mEhdr->e_shnum; i++) {\r
+    Elf_Shdr *shdr = GetShdrByIndex(i);\r
+    if (IsDataShdr(shdr)) {\r
+      if ((shdr->sh_addralign != 0) && (shdr->sh_addralign != 1)) {\r
+        // the alignment field is valid\r
+        if ((shdr->sh_addr & (shdr->sh_addralign - 1)) == 0) {\r
+          // if the section address is aligned we must align PE/COFF\r
+          mCoffOffset = (mCoffOffset + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1);\r
+        } else if ((shdr->sh_addr % shdr->sh_addralign) != (mCoffOffset % shdr->sh_addralign)) {\r
+          // ARM RVCT tools have behavior outside of the ELF specification to try\r
+          // and make images smaller.  If sh_addr is not aligned to sh_addralign\r
+          // then the section needs to preserve sh_addr MOD sh_addralign.\r
+          // Normally doing nothing here works great.\r
+          Error (NULL, 0, 3000, "Invalid", "Unsupported section alignment.");\r
+        }\r
+      }\r
+      mCoffSectionsOffset[i] = mCoffOffset;\r
+      mCoffOffset += shdr->sh_size;\r
+      SectionCount ++;\r
+    }\r
+  }\r
+  mCoffOffset = CoffAlign(mCoffOffset);\r
+\r
+  if (SectionCount > 1 && mOutImageType == FW_EFI_IMAGE) {\r
+    Warning (NULL, 0, 0, NULL, "Mulitple sections in %s are merged into 1 data section. Source level debug might not work correctly.", mInImageName);\r
+  }\r
+\r
+  //\r
+  //  The HII resource sections.\r
+  //\r
+  mHiiRsrcOffset = mCoffOffset;\r
+  for (i = 0; i < mEhdr->e_shnum; i++) {\r
+    Elf_Shdr *shdr = GetShdrByIndex(i);\r
+    if (IsHiiRsrcShdr(shdr)) {\r
+      if ((shdr->sh_addralign != 0) && (shdr->sh_addralign != 1)) {\r
+        // the alignment field is valid\r
+        if ((shdr->sh_addr & (shdr->sh_addralign - 1)) == 0) {\r
+          // if the section address is aligned we must align PE/COFF\r
+          mCoffOffset = (mCoffOffset + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1);\r
+        } else if ((shdr->sh_addr % shdr->sh_addralign) != (mCoffOffset % shdr->sh_addralign)) {\r
+          // ARM RVCT tools have behavior outside of the ELF specification to try\r
+          // and make images smaller.  If sh_addr is not aligned to sh_addralign\r
+          // then the section needs to preserve sh_addr MOD sh_addralign.\r
+          // Normally doing nothing here works great.\r
+          Error (NULL, 0, 3000, "Invalid", "Unsupported section alignment.");\r
+        }\r
+      }\r
+      if (shdr->sh_size != 0) {\r
+        mCoffSectionsOffset[i] = mCoffOffset;\r
+        mCoffOffset += shdr->sh_size;\r
+        mCoffOffset = CoffAlign(mCoffOffset);\r
+        SetHiiResourceHeader ((UINT8*) mEhdr + shdr->sh_offset, mHiiRsrcOffset);\r
+      }\r
+      break;\r
+    }\r
+  }\r
+\r
+  mRelocOffset = mCoffOffset;\r
+\r
+  //\r
+  // Allocate base Coff file.  Will be expanded later for relocations.\r
+  //\r
+  mCoffFile = (UINT8 *)malloc(mCoffOffset);\r
+  memset(mCoffFile, 0, mCoffOffset);\r
+\r
+  //\r
+  // Fill headers.\r
+  //\r
+  DosHdr = (EFI_IMAGE_DOS_HEADER *)mCoffFile;\r
+  DosHdr->e_magic = EFI_IMAGE_DOS_SIGNATURE;\r
+  DosHdr->e_lfanew = mNtHdrOffset;\r
+\r
+  NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION*)(mCoffFile + mNtHdrOffset);\r
+\r
+  NtHdr->Pe32.Signature = EFI_IMAGE_NT_SIGNATURE;\r
+\r
+  switch (mEhdr->e_machine) {\r
+  case EM_386:\r
+    NtHdr->Pe32.FileHeader.Machine = EFI_IMAGE_MACHINE_IA32;\r
+    NtHdr->Pe32.OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;\r
+    break;\r
+  case EM_ARM:\r
+    NtHdr->Pe32.FileHeader.Machine = EFI_IMAGE_MACHINE_ARMT;\r
+    NtHdr->Pe32.OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;\r
+    break;\r
+  default:\r
+    VerboseMsg ("%s unknown e_machine type. Assume IA-32", (UINTN)mEhdr->e_machine);\r
+    NtHdr->Pe32.FileHeader.Machine = EFI_IMAGE_MACHINE_IA32;\r
+    NtHdr->Pe32.OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;\r
+  }\r
+\r
+  NtHdr->Pe32.FileHeader.NumberOfSections = mCoffNbrSections;\r
+  NtHdr->Pe32.FileHeader.TimeDateStamp = (UINT32) time(NULL);\r
+  mImageTimeStamp = NtHdr->Pe32.FileHeader.TimeDateStamp;\r
+  NtHdr->Pe32.FileHeader.PointerToSymbolTable = 0;\r
+  NtHdr->Pe32.FileHeader.NumberOfSymbols = 0;\r
+  NtHdr->Pe32.FileHeader.SizeOfOptionalHeader = sizeof(NtHdr->Pe32.OptionalHeader);\r
+  NtHdr->Pe32.FileHeader.Characteristics = EFI_IMAGE_FILE_EXECUTABLE_IMAGE\r
+    | EFI_IMAGE_FILE_LINE_NUMS_STRIPPED\r
+    | EFI_IMAGE_FILE_LOCAL_SYMS_STRIPPED\r
+    | EFI_IMAGE_FILE_32BIT_MACHINE;\r
+\r
+  NtHdr->Pe32.OptionalHeader.SizeOfCode = mDataOffset - mTextOffset;\r
+  NtHdr->Pe32.OptionalHeader.SizeOfInitializedData = mRelocOffset - mDataOffset;\r
+  NtHdr->Pe32.OptionalHeader.SizeOfUninitializedData = 0;\r
+  NtHdr->Pe32.OptionalHeader.AddressOfEntryPoint = CoffEntry;\r
+\r
+  NtHdr->Pe32.OptionalHeader.BaseOfCode = mTextOffset;\r
+\r
+  NtHdr->Pe32.OptionalHeader.BaseOfData = mDataOffset;\r
+  NtHdr->Pe32.OptionalHeader.ImageBase = 0;\r
+  NtHdr->Pe32.OptionalHeader.SectionAlignment = mCoffAlignment;\r
+  NtHdr->Pe32.OptionalHeader.FileAlignment = mCoffAlignment;\r
+  NtHdr->Pe32.OptionalHeader.SizeOfImage = 0;\r
+\r
+  NtHdr->Pe32.OptionalHeader.SizeOfHeaders = mTextOffset;\r
+  NtHdr->Pe32.OptionalHeader.NumberOfRvaAndSizes = EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES;\r
+\r
+  //\r
+  // Section headers.\r
+  //\r
+  if ((mDataOffset - mTextOffset) > 0) {\r
+    CreateSectionHeader (".text", mTextOffset, mDataOffset - mTextOffset,\r
+            EFI_IMAGE_SCN_CNT_CODE\r
+            | EFI_IMAGE_SCN_MEM_EXECUTE\r
+            | EFI_IMAGE_SCN_MEM_READ);\r
+  } else {\r
+    // Don't make a section of size 0.\r
+    NtHdr->Pe32.FileHeader.NumberOfSections--;\r
+  }\r
+\r
+  if ((mHiiRsrcOffset - mDataOffset) > 0) {\r
+    CreateSectionHeader (".data", mDataOffset, mHiiRsrcOffset - mDataOffset,\r
+            EFI_IMAGE_SCN_CNT_INITIALIZED_DATA\r
+            | EFI_IMAGE_SCN_MEM_WRITE\r
+            | EFI_IMAGE_SCN_MEM_READ);\r
+  } else {\r
+    // Don't make a section of size 0.\r
+    NtHdr->Pe32.FileHeader.NumberOfSections--;\r
+  }\r
+\r
+  if ((mRelocOffset - mHiiRsrcOffset) > 0) {\r
+    CreateSectionHeader (".rsrc", mHiiRsrcOffset, mRelocOffset - mHiiRsrcOffset,\r
+            EFI_IMAGE_SCN_CNT_INITIALIZED_DATA\r
+            | EFI_IMAGE_SCN_MEM_READ);\r
+\r
+    NtHdr->Pe32.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = mRelocOffset - mHiiRsrcOffset;\r
+    NtHdr->Pe32.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = mHiiRsrcOffset;\r
+  } else {\r
+    // Don't make a section of size 0.\r
+    NtHdr->Pe32.FileHeader.NumberOfSections--;\r
+  }\r
+\r
+}\r
+\r
+STATIC\r
+BOOLEAN\r
+WriteSections32 (\r
+  SECTION_FILTER_TYPES  FilterType\r
+  )\r
+{\r
+  UINT32      Idx;\r
+  Elf_Shdr    *SecShdr;\r
+  UINT32      SecOffset;\r
+  BOOLEAN     (*Filter)(Elf_Shdr *);\r
+\r
+  //\r
+  // Initialize filter pointer\r
+  //\r
+  switch (FilterType) {\r
+    case SECTION_TEXT:\r
+      Filter = IsTextShdr;\r
+      break;\r
+    case SECTION_HII:\r
+      Filter = IsHiiRsrcShdr;\r
+      break;\r
+    case SECTION_DATA:\r
+      Filter = IsDataShdr;\r
+      break;\r
+    default:\r
+      return FALSE;\r
+  }\r
+\r
+  //\r
+  // First: copy sections.\r
+  //\r
+  for (Idx = 0; Idx < mEhdr->e_shnum; Idx++) {\r
+    Elf_Shdr *Shdr = GetShdrByIndex(Idx);\r
+    if ((*Filter)(Shdr)) {\r
+      switch (Shdr->sh_type) {\r
+      case SHT_PROGBITS:\r
+        /* Copy.  */\r
+        memcpy(mCoffFile + mCoffSectionsOffset[Idx],\r
+              (UINT8*)mEhdr + Shdr->sh_offset,\r
+              Shdr->sh_size);\r
+        break;\r
+\r
+      case SHT_NOBITS:\r
+        memset(mCoffFile + mCoffSectionsOffset[Idx], 0, Shdr->sh_size);\r
+        break;\r
+\r
+      default:\r
+        //\r
+        //  Ignore for unkown section type.\r
+        //\r
+        VerboseMsg ("%s unknown section type %x. We directly copy this section into Coff file", mInImageName, (unsigned)Shdr->sh_type);\r
+        break;\r
+      }\r
+    }\r
+  }\r
+\r
+  //\r
+  // Second: apply relocations.\r
+  //\r
+  for (Idx = 0; Idx < mEhdr->e_shnum; Idx++) {\r
+    //\r
+    // Determine if this is a relocation section.\r
+    //\r
+    Elf_Shdr *RelShdr = GetShdrByIndex(Idx);\r
+    if ((RelShdr->sh_type != SHT_REL) && (RelShdr->sh_type != SHT_RELA)) {\r
+      continue;\r
+    }\r
+    \r
+    //\r
+    // Relocation section found.  Now extract section information that the relocations\r
+    // apply to in the ELF data and the new COFF data.\r
+    //\r
+    SecShdr = GetShdrByIndex(RelShdr->sh_info);\r
+    SecOffset = mCoffSectionsOffset[RelShdr->sh_info];\r
+    \r
+    //\r
+    // Only process relocations for the current filter type.\r
+    //\r
+    if (RelShdr->sh_type == SHT_REL && (*Filter)(SecShdr)) {\r
+      UINT32 RelOffset;\r
+      \r
+      //\r
+      // Determine the symbol table referenced by the relocation data.\r
+      //\r
+      Elf_Shdr *SymtabShdr = GetShdrByIndex(RelShdr->sh_link);\r
+      UINT8 *Symtab = (UINT8*)mEhdr + SymtabShdr->sh_offset;\r
+\r
+      //\r
+      // Process all relocation entries for this section.\r
+      //\r
+      for (RelOffset = 0; RelOffset < RelShdr->sh_size; RelOffset += RelShdr->sh_entsize) {\r
+        //\r
+        // Set pointer to relocation entry\r
+        //\r
+        Elf_Rel *Rel = (Elf_Rel *)((UINT8*)mEhdr + RelShdr->sh_offset + RelOffset);\r
+        \r
+        //\r
+        // Set pointer to symbol table entry associated with the relocation entry.\r
+        //\r
+        Elf_Sym *Sym = (Elf_Sym *)(Symtab + ELF_R_SYM(Rel->r_info) * SymtabShdr->sh_entsize);\r
+        \r
+        Elf_Shdr *SymShdr;\r
+        UINT8 *Targ;\r
+        UINT16 Address;\r
+\r
+        //\r
+        // Check section header index found in symbol table and get the section \r
+        // header location.\r
+        //\r
+        if (Sym->st_shndx == SHN_UNDEF\r
+            || Sym->st_shndx == SHN_ABS\r
+            || Sym->st_shndx > mEhdr->e_shnum) {\r
+          Error (NULL, 0, 3000, "Invalid", "%s bad symbol definition.", mInImageName);\r
+        }\r
+        SymShdr = GetShdrByIndex(Sym->st_shndx);\r
+\r
+        //\r
+        // Convert the relocation data to a pointer into the coff file.\r
+        //\r
+        // Note: \r
+        //   r_offset is the virtual address of the storage unit to be relocated.\r
+        //   sh_addr is the virtual address for the base of the section.\r
+        //\r
+        Targ = mCoffFile + SecOffset + (Rel->r_offset - SecShdr->sh_addr);\r
+\r
+        //\r
+        // Determine how to handle each relocation type based on the machine type.\r
+        //\r
+        if (mEhdr->e_machine == EM_386) {\r
+          switch (ELF_R_TYPE(Rel->r_info)) {\r
+          case R_386_NONE:\r
+            break;\r
+          case R_386_32:\r
+            //\r
+            // Absolute relocation.\r
+            //  Converts Targ from a absolute virtual address to the absolute\r
+            //  COFF address.\r
+            //\r
+            *(UINT32 *)Targ = *(UINT32 *)Targ - SymShdr->sh_addr\r
+              + mCoffSectionsOffset[Sym->st_shndx];\r
+            break;\r
+          case R_386_PC32:\r
+            //\r
+            // Relative relocation: Symbol - Ip + Addend\r
+            //\r
+            *(UINT32 *)Targ = *(UINT32 *)Targ\r
+              + (mCoffSectionsOffset[Sym->st_shndx] - SymShdr->sh_addr)\r
+              - (SecOffset - SecShdr->sh_addr);\r
+            break;\r
+          default:\r
+            Error (NULL, 0, 3000, "Invalid", "%s unsupported ELF EM_386 relocation 0x%x.", mInImageName, (unsigned) ELF_R_TYPE(Rel->r_info));\r
+          }\r
+        } else if (mEhdr->e_machine == EM_ARM) {\r
+          switch (ELF32_R_TYPE(Rel->r_info)) {\r
+          case R_ARM_RBASE:\r
+            // No relocation - no action required\r
+            // break skipped\r
+\r
+          case R_ARM_PC24:\r
+          case R_ARM_XPC25:\r
+          case R_ARM_THM_PC22:\r
+          case R_ARM_THM_JUMP19:\r
+          case R_ARM_CALL:\r
+          case R_ARM_JMP24:\r
+          case R_ARM_THM_JUMP24:  \r
+          case R_ARM_PREL31:  \r
+          case R_ARM_MOVW_PREL_NC:  \r
+          case R_ARM_MOVT_PREL:\r
+          case R_ARM_THM_MOVW_PREL_NC:\r
+          case R_ARM_THM_MOVT_PREL:\r
+          case R_ARM_THM_JMP6:\r
+          case R_ARM_THM_ALU_PREL_11_0:\r
+          case R_ARM_THM_PC12:\r
+          case R_ARM_REL32_NOI:\r
+          case R_ARM_ALU_PC_G0_NC:\r
+          case R_ARM_ALU_PC_G0:\r
+          case R_ARM_ALU_PC_G1_NC:\r
+          case R_ARM_ALU_PC_G1:\r
+          case R_ARM_ALU_PC_G2:\r
+          case R_ARM_LDR_PC_G1:\r
+          case R_ARM_LDR_PC_G2:\r
+          case R_ARM_LDRS_PC_G0:\r
+          case R_ARM_LDRS_PC_G1:\r
+          case R_ARM_LDRS_PC_G2:\r
+          case R_ARM_LDC_PC_G0:\r
+          case R_ARM_LDC_PC_G1:\r
+          case R_ARM_LDC_PC_G2:\r
+          case R_ARM_GOT_PREL:\r
+          case R_ARM_THM_JUMP11:\r
+          case R_ARM_THM_JUMP8:\r
+          case R_ARM_TLS_GD32:\r
+          case R_ARM_TLS_LDM32:\r
+          case R_ARM_TLS_IE32:\r
+            // Thease are all PC-relative relocations and don't require modification\r
+            // GCC does not seem to have the concept of a application that just needs to get relocated.\r
+            break;\r
+\r
+          case R_ARM_THM_MOVW_ABS_NC:\r
+            // MOVW is only lower 16-bits of the addres\r
+            Address = (UINT16)(Sym->st_value - SymShdr->sh_addr + mCoffSectionsOffset[Sym->st_shndx]);\r
+            ThumbMovtImmediatePatch ((UINT16 *)Targ, Address);\r
+            break;\r
+\r
+          case R_ARM_THM_MOVT_ABS:\r
+            // MOVT is only upper 16-bits of the addres\r
+            Address = (UINT16)((Sym->st_value - SymShdr->sh_addr + mCoffSectionsOffset[Sym->st_shndx]) >> 16);\r
+            ThumbMovtImmediatePatch ((UINT16 *)Targ, Address);\r
+            break;\r
+\r
+          case R_ARM_ABS32:\r
+          case R_ARM_RABS32:\r
+            //\r
+            // Absolute relocation.\r
+            //\r
+            *(UINT32 *)Targ = *(UINT32 *)Targ - SymShdr->sh_addr + mCoffSectionsOffset[Sym->st_shndx];\r
+            break;\r
+\r
+          default:\r
+            Error (NULL, 0, 3000, "Invalid", "WriteSections (): %s unsupported ELF EM_ARM relocation 0x%x.", mInImageName, (unsigned) ELF32_R_TYPE(Rel->r_info));\r
+          }\r
+        }\r
+      }\r
+    }\r
+  }\r
+\r
+  return TRUE;\r
+}\r
+\r
+UINTN gMovwOffset = 0;\r
+\r
+STATIC\r
+VOID\r
+WriteRelocations32 (\r
+  VOID\r
+  )\r
+{\r
+  UINT32                           Index;\r
+  EFI_IMAGE_OPTIONAL_HEADER_UNION  *NtHdr;\r
+  EFI_IMAGE_DATA_DIRECTORY         *Dir;\r
+  BOOLEAN                          FoundRelocations;\r
+  Elf_Dyn                          *Dyn;\r
+  Elf_Rel                          *Rel;\r
+  UINTN                            RelElementSize;\r
+  UINTN                            RelSize;\r
+  UINTN                            RelOffset;\r
+  UINTN                            K;\r
+  UINT8                            *Targ;\r
+  Elf32_Phdr                       *DynamicSegment;\r
+  Elf32_Phdr                       *TargetSegment;\r
+\r
+  for (Index = 0, FoundRelocations = FALSE; Index < mEhdr->e_shnum; Index++) {\r
+    Elf_Shdr *RelShdr = GetShdrByIndex(Index);\r
+    if ((RelShdr->sh_type == SHT_REL) || (RelShdr->sh_type == SHT_RELA)) {\r
+      Elf_Shdr *SecShdr = GetShdrByIndex (RelShdr->sh_info);\r
+      if (IsTextShdr(SecShdr) || IsDataShdr(SecShdr)) {\r
+        UINT32 RelIdx;\r
+\r
+        FoundRelocations = TRUE;\r
+        for (RelIdx = 0; RelIdx < RelShdr->sh_size; RelIdx += RelShdr->sh_entsize) {\r
+          Elf_Rel  *Rel = (Elf_Rel *)((UINT8*)mEhdr + RelShdr->sh_offset + RelIdx);\r
+\r
+          if (mEhdr->e_machine == EM_386) { \r
+            switch (ELF_R_TYPE(Rel->r_info)) {\r
+            case R_386_NONE:\r
+            case R_386_PC32:\r
+              //\r
+              // No fixup entry required.\r
+              //\r
+              break;\r
+            case R_386_32:\r
+              //\r
+              // Creates a relative relocation entry from the absolute entry.\r
+              //\r
+              CoffAddFixup(mCoffSectionsOffset[RelShdr->sh_info]\r
+              + (Rel->r_offset - SecShdr->sh_addr),\r
+              EFI_IMAGE_REL_BASED_HIGHLOW);\r
+              break;\r
+            default:\r
+              Error (NULL, 0, 3000, "Invalid", "%s unsupported ELF EM_386 relocation 0x%x.", mInImageName, (unsigned) ELF_R_TYPE(Rel->r_info));\r
+            }\r
+          } else if (mEhdr->e_machine == EM_ARM) {\r
+            switch (ELF32_R_TYPE(Rel->r_info)) {\r
+            case R_ARM_RBASE:\r
+              // No relocation - no action required\r
+              // break skipped\r
+\r
+            case R_ARM_PC24:\r
+            case R_ARM_XPC25:\r
+            case R_ARM_THM_PC22:\r
+            case R_ARM_THM_JUMP19:\r
+            case R_ARM_CALL:\r
+            case R_ARM_JMP24:\r
+            case R_ARM_THM_JUMP24:  \r
+            case R_ARM_PREL31:  \r
+            case R_ARM_MOVW_PREL_NC:  \r
+            case R_ARM_MOVT_PREL:\r
+            case R_ARM_THM_MOVW_PREL_NC:\r
+            case R_ARM_THM_MOVT_PREL:\r
+            case R_ARM_THM_JMP6:\r
+            case R_ARM_THM_ALU_PREL_11_0:\r
+            case R_ARM_THM_PC12:\r
+            case R_ARM_REL32_NOI:\r
+            case R_ARM_ALU_PC_G0_NC:\r
+            case R_ARM_ALU_PC_G0:\r
+            case R_ARM_ALU_PC_G1_NC:\r
+            case R_ARM_ALU_PC_G1:\r
+            case R_ARM_ALU_PC_G2:\r
+            case R_ARM_LDR_PC_G1:\r
+            case R_ARM_LDR_PC_G2:\r
+            case R_ARM_LDRS_PC_G0:\r
+            case R_ARM_LDRS_PC_G1:\r
+            case R_ARM_LDRS_PC_G2:\r
+            case R_ARM_LDC_PC_G0:\r
+            case R_ARM_LDC_PC_G1:\r
+            case R_ARM_LDC_PC_G2:\r
+            case R_ARM_GOT_PREL:\r
+            case R_ARM_THM_JUMP11:\r
+            case R_ARM_THM_JUMP8:\r
+            case R_ARM_TLS_GD32:\r
+            case R_ARM_TLS_LDM32:\r
+            case R_ARM_TLS_IE32:\r
+              // Thease are all PC-relative relocations and don't require modification\r
+              break;\r
+\r
+            case R_ARM_THM_MOVW_ABS_NC:\r
+              CoffAddFixup (\r
+                mCoffSectionsOffset[RelShdr->sh_info]\r
+                + (Rel->r_offset - SecShdr->sh_addr),\r
+                EFI_IMAGE_REL_BASED_ARM_MOV32T\r
+                );\r
+\r
+              // PE/COFF treats MOVW/MOVT relocation as single 64-bit instruction\r
+              // Track this address so we can log an error for unsupported sequence of MOVW/MOVT\r
+              gMovwOffset = mCoffSectionsOffset[RelShdr->sh_info] + (Rel->r_offset - SecShdr->sh_addr);\r
+              break;\r
+\r
+            case R_ARM_THM_MOVT_ABS:\r
+              if ((gMovwOffset + 4) !=  (mCoffSectionsOffset[RelShdr->sh_info] + (Rel->r_offset - SecShdr->sh_addr))) {\r
+                Error (NULL, 0, 3000, "Not Supported", "PE/COFF requires MOVW+MOVT instruction sequence %x +4 != %x.", gMovwOffset, mCoffSectionsOffset[RelShdr->sh_info] + (Rel->r_offset - SecShdr->sh_addr));\r
+              }\r
+              break;\r
+\r
+            case R_ARM_ABS32:\r
+            case R_ARM_RABS32:\r
+              CoffAddFixup (\r
+                mCoffSectionsOffset[RelShdr->sh_info]\r
+                + (Rel->r_offset - SecShdr->sh_addr),\r
+                EFI_IMAGE_REL_BASED_HIGHLOW\r
+                );\r
+              break;\r
+\r
+           default:\r
+              Error (NULL, 0, 3000, "Invalid", "WriteRelocations(): %s unsupported ELF EM_ARM relocation 0x%x.", mInImageName, (unsigned) ELF32_R_TYPE(Rel->r_info));\r
+            }\r
+          } else {\r
+            Error (NULL, 0, 3000, "Not Supported", "This tool does not support relocations for ELF with e_machine %u (processor type).", (unsigned) mEhdr->e_machine);\r
+          }\r
+        }\r
+      }\r
+    }\r
+  }\r
+\r
+  if (!FoundRelocations && (mEhdr->e_machine == EM_ARM)) {\r
+    /* Try again, but look for PT_DYNAMIC instead of SHT_REL */\r
+\r
+    for (Index = 0; Index < mEhdr->e_phnum; Index++) {\r
+      RelElementSize = 0;\r
+      RelSize = 0;\r
+      RelOffset = 0;\r
+\r
+      DynamicSegment = GetPhdrByIndex (Index);\r
+\r
+      if (DynamicSegment->p_type == PT_DYNAMIC) {\r
+        Dyn = (Elf32_Dyn *) ((UINT8 *)mEhdr + DynamicSegment->p_offset);\r
+\r
+        while (Dyn->d_tag != DT_NULL) {\r
+          switch (Dyn->d_tag) {\r
+            case  DT_REL:\r
+              RelOffset = Dyn->d_un.d_val;\r
+              break;\r
+\r
+            case  DT_RELSZ:\r
+              RelSize = Dyn->d_un.d_val;\r
+              break;\r
+\r
+            case  DT_RELENT:\r
+              RelElementSize = Dyn->d_un.d_val;\r
+              break;\r
+\r
+            default:\r
+              break;\r
+          }\r
+          Dyn++;\r
+        }\r
+        if (( RelOffset == 0 ) || ( RelSize == 0 ) || ( RelElementSize == 0 )) {\r
+          Error (NULL, 0, 3000, "Invalid", "%s bad ARM dynamic relocations.", mInImageName);\r
+        }\r
+\r
+        for (K = 0; K < RelSize; K += RelElementSize) {\r
+\r
+          if (DynamicSegment->p_paddr == 0) {\r
+            // Older versions of the ARM ELF (SWS ESPC 0003 B-02) specification define DT_REL\r
+            // as an offset in the dynamic segment. p_paddr is defined to be zero for ARM tools\r
+            Rel = (Elf32_Rel *) ((UINT8 *) mEhdr + DynamicSegment->p_offset + RelOffset + K);\r
+          } else {\r
+            // This is how it reads in the generic ELF specification\r
+            Rel = (Elf32_Rel *) ((UINT8 *) mEhdr + RelOffset + K);\r
+          }\r
+\r
+          switch (ELF32_R_TYPE (Rel->r_info)) {\r
+          case  R_ARM_RBASE:\r
+            break;\r
+\r
+          case  R_ARM_RABS32:\r
+            TargetSegment = GetPhdrByIndex (ELF32_R_SYM (Rel->r_info) - 1);\r
+\r
+            // Note: r_offset in a memory address.  Convert it to a pointer in the coff file.\r
+            Targ = mCoffFile + mCoffSectionsOffset[ ELF32_R_SYM( Rel->r_info ) ] + Rel->r_offset - TargetSegment->p_vaddr;\r
+\r
+            *(UINT32 *)Targ = *(UINT32 *)Targ + mCoffSectionsOffset [ELF32_R_SYM( Rel->r_info )];\r
+\r
+            CoffAddFixup (mCoffSectionsOffset[ELF32_R_SYM (Rel->r_info)] + (Rel->r_offset - TargetSegment->p_vaddr), EFI_IMAGE_REL_BASED_HIGHLOW);\r
+            break;\r
+          \r
+          default:\r
+            Error (NULL, 0, 3000, "Invalid", "%s bad ARM dynamic relocations, unkown type %d.", mInImageName, ELF32_R_TYPE (Rel->r_info));\r
+            break;\r
+          }\r
+        }\r
+        break;\r
+      }\r
+    }\r
+  }\r
+\r
+  //\r
+  // Pad by adding empty entries.\r
+  //\r
+  while (mCoffOffset & (mCoffAlignment - 1)) {\r
+    CoffAddFixupEntry(0);\r
+  }\r
+\r
+  NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset);\r
+  Dir = &NtHdr->Pe32.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC];\r
+  Dir->Size = mCoffOffset - mRelocOffset;\r
+  if (Dir->Size == 0) {\r
+    // If no relocations, null out the directory entry and don't add the .reloc section\r
+    Dir->VirtualAddress = 0;\r
+    NtHdr->Pe32.FileHeader.NumberOfSections--;\r
+  } else {\r
+    Dir->VirtualAddress = mRelocOffset;\r
+    CreateSectionHeader (".reloc", mRelocOffset, mCoffOffset - mRelocOffset,\r
+            EFI_IMAGE_SCN_CNT_INITIALIZED_DATA\r
+            | EFI_IMAGE_SCN_MEM_DISCARDABLE\r
+            | EFI_IMAGE_SCN_MEM_READ);\r
+  }\r
+\r
+}\r
+\r
+STATIC\r
+VOID\r
+WriteDebug32 (\r
+  VOID\r
+  )\r
+{\r
+  UINT32                              Len;\r
+  UINT32                              DebugOffset;\r
+  EFI_IMAGE_OPTIONAL_HEADER_UNION     *NtHdr;\r
+  EFI_IMAGE_DATA_DIRECTORY            *DataDir;\r
+  EFI_IMAGE_DEBUG_DIRECTORY_ENTRY     *Dir;\r
+  EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10;\r
+\r
+  Len = strlen(mInImageName) + 1;\r
+  DebugOffset = mCoffOffset;\r
+\r
+  mCoffOffset += sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY)\r
+    + sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY)\r
+    + Len;\r
+  mCoffOffset = CoffAlign(mCoffOffset);\r
+\r
+  mCoffFile = realloc(mCoffFile, mCoffOffset);\r
+  memset(mCoffFile + DebugOffset, 0, mCoffOffset - DebugOffset);\r
+\r
+  Dir = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY*)(mCoffFile + DebugOffset);\r
+  Dir->Type = EFI_IMAGE_DEBUG_TYPE_CODEVIEW;\r
+  Dir->SizeOfData = sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) + Len;\r
+  Dir->RVA = DebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);\r
+  Dir->FileOffset = DebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);\r
+\r
+  Nb10 = (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY*)(Dir + 1);\r
+  Nb10->Signature = CODEVIEW_SIGNATURE_NB10;\r
+  strcpy ((char *)(Nb10 + 1), mInImageName);\r
+\r
+\r
+  NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset);\r
+  DataDir = &NtHdr->Pe32.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG];\r
+  DataDir->VirtualAddress = DebugOffset;\r
+  DataDir->Size = mCoffOffset - DebugOffset;\r
+  if (DataDir->Size == 0) {\r
+    // If no debug, null out the directory entry and don't add the .debug section\r
+    DataDir->VirtualAddress = 0;\r
+    NtHdr->Pe32.FileHeader.NumberOfSections--;\r
+  } else {\r
+    DataDir->VirtualAddress = DebugOffset;\r
+    CreateSectionHeader (".debug", DebugOffset, mCoffOffset - DebugOffset,\r
+            EFI_IMAGE_SCN_CNT_INITIALIZED_DATA\r
+            | EFI_IMAGE_SCN_MEM_DISCARDABLE\r
+            | EFI_IMAGE_SCN_MEM_READ);\r
+\r
+  }\r
+}\r
+\r
+STATIC\r
+VOID\r
+SetImageSize32 (\r
+  VOID\r
+  )\r
+{\r
+  EFI_IMAGE_OPTIONAL_HEADER_UNION *NtHdr;\r
+  \r
+  //\r
+  // Set image size\r
+  //\r
+  NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset);\r
+  NtHdr->Pe32.OptionalHeader.SizeOfImage = mCoffOffset;\r
+}\r
+\r
+STATIC\r
+VOID\r
+CleanUp32 (\r
+  VOID\r
+  )\r
+{\r
+  if (mCoffSectionsOffset != NULL) {\r
+    free (mCoffSectionsOffset);\r
+  }\r
+}\r
+\r
+\r