[lld] r263385 - ELF: Set e_flags header only when MIPS.

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Sun Mar 13 12:29:17 PDT 2016


Author: ruiu
Date: Sun Mar 13 14:29:17 2016
New Revision: 263385

URL: http://llvm.org/viewvc/llvm-project?rev=263385&view=rev
Log:
ELF: Set e_flags header only when MIPS.

The field is zero by default, so this is NFC.

Modified:
    lld/trunk/ELF/Writer.cpp

Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=263385&r1=263384&r2=263385&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Sun Mar 13 14:29:17 2016
@@ -1425,9 +1425,7 @@ template <class ELFT> void Writer<ELFT>:
   }
 }
 
-static uint32_t getELFFlags() {
-  if (Config->EMachine != EM_MIPS)
-    return 0;
+static uint32_t getMipsEFlags() {
   // FIXME: In fact ELF flags depends on ELF flags of input object files
   // and selected emulation. For now just use hard coded values.
   uint32_t V = EF_MIPS_ABI_O32 | EF_MIPS_CPIC | EF_MIPS_ARCH_32R2;
@@ -1505,13 +1503,15 @@ template <class ELFT> void Writer<ELFT>:
   EHdr->e_version = EV_CURRENT;
   EHdr->e_entry = getEntryAddr<ELFT>();
   EHdr->e_shoff = SectionHeaderOff;
-  EHdr->e_flags = getELFFlags();
   EHdr->e_ehsize = sizeof(Elf_Ehdr);
   EHdr->e_phnum = Phdrs.size();
   EHdr->e_shentsize = sizeof(Elf_Shdr);
   EHdr->e_shnum = getNumSections();
   EHdr->e_shstrndx = Out<ELFT>::ShStrTab->SectionIndex;
 
+  if (Config->EMachine == EM_MIPS)
+    EHdr->e_flags = getMipsEFlags();
+
   if (!Config->Relocatable) {
     EHdr->e_phoff = sizeof(Elf_Ehdr);
     EHdr->e_phentsize = sizeof(Elf_Phdr);




More information about the llvm-commits mailing list