Commit 50564ca0 authored by Fangrui Song's avatar Fangrui Song
Browse files

[ELF] Rename adjustRelaxExpr to adjustTlsExpr and delete the unused `data` parameter. NFC 

Reviewed By: psmith

Differential Revision: https://reviews.llvm.org/D91995
parent 06654a53

lld/ELF/Arch/AArch64.cpp

+2 −4
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ public: 
  bool usesOnlyLowPageBits(RelType type) const override;

  void relocate(uint8_t *loc, const Relocation &rel,

                uint64_t val) const override;

  RelExpr adjustRelaxExpr(RelType type, const uint8_t *data,

                          RelExpr expr) const override;

  RelExpr adjustTlsExpr(RelType type, RelExpr expr) const override;

  void relaxTlsGdToLe(uint8_t *loc, const Relocation &rel,

                      uint64_t val) const override;

  void relaxTlsGdToIe(uint8_t *loc, const Relocation &rel,
@@ -159,8 +158,7 @@ RelExpr AArch64::getRelExpr(RelType type, const Symbol &s, 
  }

}



RelExpr AArch64::adjustRelaxExpr(RelType type, const uint8_t *data,

                                 RelExpr expr) const {

RelExpr AArch64::adjustTlsExpr(RelType type, RelExpr expr) const {

  if (expr == R_RELAX_TLS_GD_TO_IE) {

    if (type == R_AARCH64_TLSDESC_ADR_PAGE21)

      return R_AARCH64_RELAX_TLS_GD_TO_IE_PAGE_PC;

lld/ELF/Arch/PPC.cpp

+2 −4
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@ public: 
  bool inBranchRange(RelType type, uint64_t src, uint64_t dst) const override;

  void relocate(uint8_t *loc, const Relocation &rel,

                uint64_t val) const override;

  RelExpr adjustRelaxExpr(RelType type, const uint8_t *data,

                          RelExpr expr) const override;

  RelExpr adjustTlsExpr(RelType type, RelExpr expr) const override;

  int getTlsGdRelaxSkip(RelType type) const override;

  void relaxTlsGdToIe(uint8_t *loc, const Relocation &rel,

                      uint64_t val) const override;
@@ -360,8 +359,7 @@ void PPC::relocate(uint8_t *loc, const Relocation &rel, uint64_t val) const { 
  }

}



RelExpr PPC::adjustRelaxExpr(RelType type, const uint8_t *data,

                             RelExpr expr) const {

RelExpr PPC::adjustTlsExpr(RelType type, RelExpr expr) const {

  if (expr == R_RELAX_TLS_GD_TO_IE)

    return R_RELAX_TLS_GD_TO_IE_GOT_OFF;

  if (expr == R_RELAX_TLS_LD_TO_LE)

lld/ELF/Arch/PPC64.cpp

+2 −4
Original line number Diff line number Diff line
@@ -382,8 +382,7 @@ public: 
                  int64_t a) const override;

  uint32_t getThunkSectionSpacing() const override;

  bool inBranchRange(RelType type, uint64_t src, uint64_t dst) const override;

  RelExpr adjustRelaxExpr(RelType type, const uint8_t *data,

                          RelExpr expr) const override;

  RelExpr adjustTlsExpr(RelType type, RelExpr expr) const override;

  RelExpr adjustGotPcExpr(RelType type, int64_t addend,

                          const uint8_t *loc) const override;

  void relaxGot(uint8_t *loc, const Relocation &rel,
@@ -1392,8 +1391,7 @@ bool PPC64::inBranchRange(RelType type, uint64_t src, uint64_t dst) const { 
  llvm_unreachable("unsupported relocation type used in branch");

}



RelExpr PPC64::adjustRelaxExpr(RelType type, const uint8_t *data,

                               RelExpr expr) const {

RelExpr PPC64::adjustTlsExpr(RelType type, RelExpr expr) const {

  if (type != R_PPC64_GOT_TLSGD_PCREL34 && expr == R_RELAX_TLS_GD_TO_IE)

    return R_RELAX_TLS_GD_TO_IE_GOT_OFF;

  if (expr == R_RELAX_TLS_LD_TO_LE)

lld/ELF/Arch/X86.cpp

+2 −4
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ public: 
  void relocate(uint8_t *loc, const Relocation &rel,

                uint64_t val) const override;



  RelExpr adjustRelaxExpr(RelType type, const uint8_t *data,

                          RelExpr expr) const override;

  RelExpr adjustTlsExpr(RelType type, RelExpr expr) const override;

  void relaxTlsGdToIe(uint8_t *loc, const Relocation &rel,

                      uint64_t val) const override;

  void relaxTlsGdToLe(uint8_t *loc, const Relocation &rel,
@@ -161,8 +160,7 @@ RelExpr X86::getRelExpr(RelType type, const Symbol &s, 
  }

}



RelExpr X86::adjustRelaxExpr(RelType type, const uint8_t *data,

                             RelExpr expr) const {

RelExpr X86::adjustTlsExpr(RelType type, RelExpr expr) const {

  switch (expr) {

  default:

    return expr;

lld/ELF/Relocations.cpp

+8 −9
Original line number Diff line number Diff line
@@ -230,8 +230,8 @@ handleTlsRelocation(RelType type, Symbol &sym, InputSectionBase &c, 
    // Local-Dynamic relocs can be relaxed to Local-Exec.

    if (toExecRelax) {

      c.relocations.push_back(

          {target->adjustRelaxExpr(type, nullptr, R_RELAX_TLS_LD_TO_LE), type,

           offset, addend, &sym});

          {target->adjustTlsExpr(type, R_RELAX_TLS_LD_TO_LE), type, offset,

           addend, &sym});

      return target->getTlsGdRelaxSkip(type);

    }

    if (expr == R_TLSLD_HINT)
@@ -250,9 +250,8 @@ handleTlsRelocation(RelType type, Symbol &sym, InputSectionBase &c, 


  // Local-Dynamic relocs can be relaxed to Local-Exec.

  if (expr == R_DTPREL && toExecRelax) {

    c.relocations.push_back(

        {target->adjustRelaxExpr(type, nullptr, R_RELAX_TLS_LD_TO_LE), type,

         offset, addend, &sym});

    c.relocations.push_back({target->adjustTlsExpr(type, R_RELAX_TLS_LD_TO_LE),

                             type, offset, addend, &sym});

    return 1;

  }
@@ -300,8 +299,8 @@ handleTlsRelocation(RelType type, Symbol &sym, InputSectionBase &c, 
    // depending on the symbol being locally defined or not.

    if (sym.isPreemptible) {

      c.relocations.push_back(

          {target->adjustRelaxExpr(type, nullptr, R_RELAX_TLS_GD_TO_IE), type,

           offset, addend, &sym});

          {target->adjustTlsExpr(type, R_RELAX_TLS_GD_TO_IE), type, offset,

           addend, &sym});

      if (!sym.isInGot()) {

        in.got->addEntry(sym);

        mainPart->relaDyn->addReloc(target->tlsGotRel, in.got, sym.getGotOffset(),
@@ -309,8 +308,8 @@ handleTlsRelocation(RelType type, Symbol &sym, InputSectionBase &c, 
      }

    } else {

      c.relocations.push_back(

          {target->adjustRelaxExpr(type, nullptr, R_RELAX_TLS_GD_TO_LE), type,

           offset, addend, &sym});

          {target->adjustTlsExpr(type, R_RELAX_TLS_GD_TO_LE), type, offset,

           addend, &sym});

    }

    return target->getTlsGdRelaxSkip(type);

  }