Index: ELF/Arch/ARM.cpp =================================================================== --- ELF/Arch/ARM.cpp +++ ELF/Arch/ARM.cpp @@ -26,6 +26,7 @@ class ARM final : public TargetInfo { public: ARM(); + uint32_t calcEFlags() const override; RelExpr getRelExpr(RelType Type, const SymbolBody &S, const uint8_t *Loc) const override; bool isPicRel(RelType Type) const override; @@ -64,6 +65,13 @@ NeedsThunks = true; } +uint32_t ARM::calcEFlags() const { + // We don't currently use any features incompatible with EF_ARM_EABI_VER5, + // but we don't have any firm guarantees of conformance. Linux AArch64 + // kernels (as of 2016) require an EABI version to be set. + return EF_ARM_EABI_VER5; +} + RelExpr ARM::getRelExpr(RelType Type, const SymbolBody &S, const uint8_t *Loc) const { switch (Type) { Index: ELF/Arch/Mips.cpp =================================================================== --- ELF/Arch/Mips.cpp +++ ELF/Arch/Mips.cpp @@ -28,6 +28,7 @@ template class MIPS final : public TargetInfo { public: MIPS(); + uint32_t calcEFlags() const override; RelExpr getRelExpr(RelType Type, const SymbolBody &S, const uint8_t *Loc) const override; int64_t getImplicitAddend(const uint8_t *Buf, RelType Type) const override; @@ -70,6 +71,11 @@ } template +uint32_t MIPS::calcEFlags() const { + return calcMipsEFlags(); +} + +template RelExpr MIPS::getRelExpr(RelType Type, const SymbolBody &S, const uint8_t *Loc) const { // See comment in the calculateMipsRelChain. @@ -236,7 +242,7 @@ write16(Loc, Data); } -static bool isMicroMips() { return Config->MipsEFlags & EF_MIPS_MICROMIPS; } +static bool isMicroMips() { return Config->EFlags & EF_MIPS_MICROMIPS; } template void MIPS::writePltHeader(uint8_t *Buf) const { const endianness E = ELFT::TargetEndianness; Index: ELF/Arch/MipsArchTree.cpp =================================================================== --- ELF/Arch/MipsArchTree.cpp +++ ELF/Arch/MipsArchTree.cpp @@ -365,7 +365,7 @@ } bool elf::isMipsR6() { - uint32_t Arch = Config->MipsEFlags & EF_MIPS_ARCH; + uint32_t Arch = Config->EFlags & EF_MIPS_ARCH; return Arch == EF_MIPS_ARCH_32R6 || Arch == EF_MIPS_ARCH_64R6; } Index: ELF/Config.h =================================================================== --- ELF/Config.h +++ ELF/Config.h @@ -202,11 +202,8 @@ // if that's true.) bool IsMips64EL; - // Holds set of ELF header flags for MIPS targets. The set calculated - // by the `elf::calcMipsEFlags` function and cached in this field. For - // the calculation we iterate over all input object files and combine - // their ELF flags. - uint32_t MipsEFlags = 0; + // Holds set of ELF header flags for the target. + uint32_t EFlags = 0; // The ELF spec defines two types of relocation table entries, RELA and // REL. RELA is a triplet of (offset, info, addend) while REL is a Index: ELF/Driver.cpp =================================================================== --- ELF/Driver.cpp +++ ELF/Driver.cpp @@ -1087,8 +1087,7 @@ for (InputSectionBase *S : F->getSections()) InputSections.push_back(cast(S)); - if (Config->EMachine == EM_MIPS) - Config->MipsEFlags = calcMipsEFlags(); + Config->EFlags = Target->calcEFlags(); // This adds a .comment section containing a version string. We have to add it // before decompressAndMergeSections because the .comment section is a Index: ELF/Target.h =================================================================== --- ELF/Target.h +++ ELF/Target.h @@ -23,6 +23,7 @@ class TargetInfo { public: + virtual uint32_t calcEFlags() const { return 0; } virtual bool isPicRel(RelType Type) const { return true; } virtual RelType getDynRel(RelType Type) const { return Type; } virtual void writeGotPltHeader(uint8_t *Buf) const {} Index: ELF/Writer.cpp =================================================================== --- ELF/Writer.cpp +++ ELF/Writer.cpp @@ -1776,20 +1776,13 @@ EHdr->e_version = EV_CURRENT; EHdr->e_entry = getEntryAddr(); EHdr->e_shoff = SectionHeaderOff; + EHdr->e_flags = Config->EFlags; EHdr->e_ehsize = sizeof(Elf_Ehdr); EHdr->e_phnum = Phdrs.size(); EHdr->e_shentsize = sizeof(Elf_Shdr); EHdr->e_shnum = OutputSections.size() + 1; EHdr->e_shstrndx = InX::ShStrTab->getParent()->SectionIndex; - if (Config->EMachine == EM_ARM) - // We don't currently use any features incompatible with EF_ARM_EABI_VER5, - // but we don't have any firm guarantees of conformance. Linux AArch64 - // kernels (as of 2016) require an EABI version to be set. - EHdr->e_flags = EF_ARM_EABI_VER5; - else if (Config->EMachine == EM_MIPS) - EHdr->e_flags = Config->MipsEFlags; - if (!Config->Relocatable) { EHdr->e_phoff = sizeof(Elf_Ehdr); EHdr->e_phentsize = sizeof(Elf_Phdr);