From 74dcb03fa912a4b3b32eda19eea57b4fa56f5cc7 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 27 Mar 2014 20:49:35 +0000 Subject: [PATCH] Remove another unused argument. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204961 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/MC/MCELFObjectWriter.h | 2 +- lib/MC/ELFObjectWriter.cpp | 9 +++------ .../AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp | 5 ++--- lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp | 5 ++--- lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp | 5 ++--- lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp | 5 ++--- lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp | 2 +- lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp | 6 +++--- .../SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp | 6 +++--- lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp | 5 ++--- 10 files changed, 21 insertions(+), 29 deletions(-) diff --git a/include/llvm/MC/MCELFObjectWriter.h b/include/llvm/MC/MCELFObjectWriter.h index 93bb7c4b4fe..78435e6f47f 100644 --- a/include/llvm/MC/MCELFObjectWriter.h +++ b/include/llvm/MC/MCELFObjectWriter.h @@ -72,7 +72,7 @@ public: virtual ~MCELFObjectTargetWriter() {} virtual unsigned GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel, bool IsRelocWithSymbol) const = 0; + bool IsPCRel) const = 0; virtual const MCSymbol *ExplicitRelSym(const MCAssembler &Asm, const MCValue &Target, const MCFragment &F, diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp index 0b35a921c07..4ebfc4de557 100644 --- a/lib/MC/ELFObjectWriter.cpp +++ b/lib/MC/ELFObjectWriter.cpp @@ -179,10 +179,8 @@ class ELFObjectWriter : public MCObjectWriter { return TargetObjectWriter->hasRelocationAddend(); } unsigned GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel, bool IsRelocWithSymbol, - int64_t Addend) const { - return TargetObjectWriter->GetRelocType(Target, Fixup, IsPCRel, - IsRelocWithSymbol); + bool IsPCRel) const { + return TargetObjectWriter->GetRelocType(Target, Fixup, IsPCRel); } public: @@ -839,8 +837,7 @@ void ELFObjectWriter::RecordRelocation(const MCAssembler &Asm, } FixedValue = Value; - unsigned Type = GetRelocType(Target, Fixup, IsPCRel, - (RelocSymbol != 0), Addend); + unsigned Type = GetRelocType(Target, Fixup, IsPCRel); MCSymbolRefExpr::VariantKind Modifier = Target.isAbsolute() ? MCSymbolRefExpr::VK_None : Target.getSymA()->getKind(); if (RelocNeedsGOT(Modifier)) diff --git a/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp b/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp index f2c067e03ec..a5fe9141e65 100644 --- a/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp +++ b/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp @@ -29,7 +29,7 @@ public: protected: unsigned GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel, bool IsRelocWithSymbol) const override; + bool IsPCRel) const override; private: }; @@ -45,8 +45,7 @@ AArch64ELFObjectWriter::~AArch64ELFObjectWriter() unsigned AArch64ELFObjectWriter::GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel, - bool IsRelocWithSymbol) const { + bool IsPCRel) const { unsigned Type; if (IsPCRel) { switch ((unsigned)Fixup.getKind()) { diff --git a/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp b/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp index b5bc4bd14b6..fb1380f8726 100644 --- a/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp +++ b/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp @@ -35,7 +35,7 @@ namespace { virtual ~ARMELFObjectWriter(); unsigned GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel, bool IsRelocWithSymbol) const override; + bool IsPCRel) const override; const MCSymbol *ExplicitRelSym(const MCAssembler &Asm, const MCValue &Target, const MCFragment &F, const MCFixup &Fixup, @@ -141,8 +141,7 @@ const MCSymbol *ARMELFObjectWriter::ExplicitRelSym(const MCAssembler &Asm, // offset unsigned ARMELFObjectWriter::GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel, - bool IsRelocWithSymbol) const { + bool IsPCRel) const { return GetRelocTypeInner(Target, Fixup, IsPCRel); } diff --git a/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp b/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp index dd41ddf6c98..ce763367e29 100644 --- a/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp +++ b/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp @@ -40,7 +40,7 @@ namespace { virtual ~MipsELFObjectWriter(); unsigned GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel, bool IsRelocWithSymbol) const override; + bool IsPCRel) const override; virtual const MCSymbol *ExplicitRelSym(const MCAssembler &Asm, const MCValue &Target, const MCFragment &F, @@ -76,8 +76,7 @@ const MCSymbol *MipsELFObjectWriter::ExplicitRelSym(const MCAssembler &Asm, unsigned MipsELFObjectWriter::GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel, - bool IsRelocWithSymbol) const { + bool IsPCRel) const { // determine the type of the relocation unsigned Type = (unsigned)ELF::R_MIPS_NONE; unsigned Kind = (unsigned)Fixup.getKind(); diff --git a/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp b/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp index 00378f97c8a..b5c5e194fec 100644 --- a/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp +++ b/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp @@ -29,7 +29,7 @@ namespace { const MCFixup &Fixup, bool IsPCRel) const; unsigned GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel, bool IsRelocWithSymbol) const override; + bool IsPCRel) const override; virtual const MCSymbol *ExplicitRelSym(const MCAssembler &Asm, const MCValue &Target, const MCFragment &F, @@ -382,8 +382,7 @@ unsigned PPCELFObjectWriter::getRelocTypeInner(const MCValue &Target, unsigned PPCELFObjectWriter::GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel, - bool IsRelocWithSymbol) const { + bool IsPCRel) const { return getRelocTypeInner(Target, Fixup, IsPCRel); } diff --git a/lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp b/lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp index 88556ba8a1e..53b0e85751d 100644 --- a/lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp +++ b/lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp @@ -20,7 +20,7 @@ public: AMDGPUELFObjectWriter(); protected: unsigned GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel, bool IsRelocWithSymbol) const override { + bool IsPCRel) const override { llvm_unreachable("Not implemented"); } diff --git a/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp b/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp index 3ab878ab2c2..bb93b904ca0 100644 --- a/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp +++ b/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp @@ -29,7 +29,7 @@ namespace { virtual ~SparcELFObjectWriter() {} protected: unsigned GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel, bool IsRelocWithSymbol) const override; + bool IsPCRel) const override; virtual const MCSymbol *ExplicitRelSym(const MCAssembler &Asm, const MCValue &Target, @@ -40,8 +40,8 @@ namespace { } unsigned SparcELFObjectWriter::GetRelocType(const MCValue &Target, - const MCFixup &Fixup, bool IsPCRel, - bool IsRelocWithSymbol) const { + const MCFixup &Fixup, + bool IsPCRel) const { if (const SparcMCExpr *SExpr = dyn_cast(Fixup.getValue())) { if (SExpr->getKind() == SparcMCExpr::VK_Sparc_R_DISP32) diff --git a/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp b/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp index 6fa81ec91ad..76e1d24a937 100644 --- a/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp +++ b/lib/Target/SystemZ/MCTargetDesc/SystemZMCObjectWriter.cpp @@ -25,7 +25,7 @@ public: protected: // Override MCELFObjectTargetWriter. unsigned GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel, bool IsRelocWithSymbol) const override; + bool IsPCRel) const override; const MCSymbol *ExplicitRelSym(const MCAssembler &Asm, const MCValue &Target, const MCFragment &F, const MCFixup &Fixup, bool IsPCRel) const override; @@ -83,8 +83,8 @@ static unsigned getPLTReloc(unsigned Kind) { } unsigned SystemZObjectWriter::GetRelocType(const MCValue &Target, - const MCFixup &Fixup, bool IsPCRel, - bool IsRelocWithSymbol) const { + const MCFixup &Fixup, + bool IsPCRel) const { MCSymbolRefExpr::VariantKind Modifier = Fixup.getAccessVariant(); unsigned Kind = Fixup.getKind(); switch (Modifier) { diff --git a/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp b/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp index 0b88416307d..c44d88d48b6 100644 --- a/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp +++ b/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp @@ -25,7 +25,7 @@ namespace { virtual ~X86ELFObjectWriter(); protected: unsigned GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel, bool IsRelocWithSymbol) const override; + bool IsPCRel) const override; }; } @@ -40,8 +40,7 @@ X86ELFObjectWriter::~X86ELFObjectWriter() unsigned X86ELFObjectWriter::GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel, - bool IsRelocWithSymbol) const { + bool IsPCRel) const { // determine the type of the relocation MCSymbolRefExpr::VariantKind Modifier = Fixup.getAccessVariant();