From f44db24e1fd948c75c87aea017646f16553d3361 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 17 Dec 2015 16:22:06 +0000 Subject: Avoid explicit relocation sorting most of the time. These days relocations are created and stored in a deterministic way. The order they are created is also suitable for the .o file, so we don't need an explicit sort. The last remaining exception is MIPS. llvm-svn: 255902 --- .../SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp') diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp index 2f19127d686..ee1af023769 100644 --- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp +++ b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp @@ -26,8 +26,6 @@ protected: // Override MCELFObjectTargetWriter. unsigned GetRelocType(const MCValue &Target, const MCFixup &Fixup, bool IsPCRel) const override; - void sortRelocs(const MCAssembler &Asm, - std::vector &Relocs) override; }; } // end anonymous namespace @@ -154,20 +152,6 @@ unsigned SystemZObjectWriter::GetRelocType(const MCValue &Target, } } -void SystemZObjectWriter::sortRelocs(const MCAssembler &Asm, - std::vector &Relocs) { - // This is OK for SystemZ, except for R_390_TLS_GDCALL/LDCALL relocs. - // There is typically another reloc, a R_390_PLT32DBL, on the same - // instruction. This other reloc must come *before* the GDCALL reloc, - // or else the TLS linker optimization may generate incorrect code. - for (unsigned i = 0, e = Relocs.size(); i + 1 < e; ++i) { - if ((Relocs[i + 1].Type == ELF::R_390_TLS_GDCALL || - Relocs[i + 1].Type == ELF::R_390_TLS_LDCALL) && - Relocs[i].Offset == Relocs[i + 1].Offset + 2) - std::swap(Relocs[i], Relocs[i + 1]); - } -} - MCObjectWriter *llvm::createSystemZObjectWriter(raw_pwrite_stream &OS, uint8_t OSABI) { MCELFObjectTargetWriter *MOTW = new SystemZObjectWriter(OSABI); -- cgit v1.2.3