Add a WriteAddends config variable

[• espindola]

Summary

This is the same idea for having

Config->CopyRelocs = (Config->Relocatable || Config->EmitRelocs);

it is easier IMHO to read this closer to where the other Config variables are set then in the middle of the dynamic relocation processing code.

[ruiu]

LGTM

[ruiu]

ELF/Driver.cpp

824

I think you can now remove ApplyDynamicRelocs from Config because it's now being used only by the driver.

[• espindola]

r324271.

ELF/Config.h

struct Configuration {
   bool Static = false;
   bool SysvHash = false;
   bool Target1Rel;
   bool Trace;
   bool UndefinedVersion;
   bool Verbose;
   bool WarnCommon;
   bool WarnMissingEntry;
+  bool WriteAddends;
   bool ZCombreloc;
   bool ZExecstack;
   bool ZNocopyreloc;
   bool ZNodelete;
   bool ZNodlopen;
   bool ZNow;
   bool ZOrigin;
   bool ZRelro;

ELF/Driver.cpp

static void setConfigs() {
   Config->IsLE = (Kind == ELF32LEKind || Kind == ELF64LEKind);
   Config->Endianness =
       Config->IsLE ? support::endianness::little : support::endianness::big;
   Config->IsMips64EL = (Kind == ELF64LEKind && Machine == EM_MIPS);
   Config->IsRela =
       (Config->Is64 || IsX32 || Machine == EM_PPC) && Machine != EM_MIPS;
   Config->Pic = Config->Pie || Config->Shared;
   Config->Wordsize = Config->Is64 ? 8 : 4;
+  Config->WriteAddends = Config->ApplyDynamicRelocs || !Config->IsRela;
 }
 
 // Returns a value of "-format" option.
 static bool getBinaryOption(StringRef S) {
   if (S == "binary")
     return true;
   if (S == "elf" || S == "default")
     return false;

ELF/SyntheticSections.cpp

void RelocationBaseSection::addReloc(uint32_t DynType,
                                      InputSectionBase *InputSec,
                                      uint64_t OffsetInSec, bool UseSymVA,
                                      Symbol *Sym, int64_t Addend, RelExpr Expr,
                                      RelType Type) {
   // We store the addends for dynamic relocations for both REL and RELA
   // relocations for compatibility with GNU Linkers. There is some system
   // software such as the Bionic dynamic linker that uses the addend prior
   // to dynamic relocation resolution.
-  if ((!Config->IsRela || Config->ApplyDynamicRelocs) && UseSymVA)
+  if (Config->WriteAddends && UseSymVA)
     InputSec->Relocations.push_back({Expr, Type, OffsetInSec, Addend, Sym});
   addReloc({DynType, InputSec, OffsetInSec, UseSymVA, Sym, Addend});
 }
 
 void RelocationBaseSection::addReloc(const DynamicReloc &Reloc) {
   if (Reloc.Type == Target->RelativeRel)
     ++NumRelativeRelocs;
   Relocs.push_back(Reloc);