diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2016-01-13 22:56:57 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2016-01-13 22:56:57 +0000 |
commit | 8340f94df1cab1e278e764967e78f3ec6cbf6bcc (patch) | |
tree | dd1a30c1f0cbc75dafcda9663b8f51475b35523e /llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp | |
parent | 3dd0ff3b627b974019b837cc5f991d7253324bc5 (diff) | |
download | bcm5719-llvm-8340f94df1cab1e278e764967e78f3ec6cbf6bcc.tar.gz bcm5719-llvm-8340f94df1cab1e278e764967e78f3ec6cbf6bcc.zip |
Convert a few assert failures into proper errors.
Fixes PR25944.
llvm-svn: 257697
Diffstat (limited to 'llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp')
-rw-r--r-- | llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp index 52eba8be288..388ce799b6a 100644 --- a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp +++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp @@ -34,8 +34,8 @@ namespace { ~ARMELFObjectWriter() override; - unsigned GetRelocType(const MCValue &Target, const MCFixup &Fixup, - bool IsPCRel) const override; + unsigned getRelocType(MCContext &Ctx, const MCValue &Target, + const MCFixup &Fixup, bool IsPCRel) const override; bool needsRelocateWithSymbol(const MCSymbol &Sym, unsigned Type) const override; @@ -67,7 +67,7 @@ bool ARMELFObjectWriter::needsRelocateWithSymbol(const MCSymbol &Sym, // Need to examine the Fixup when determining whether to // emit the relocation as an explicit symbol or as a section relative // offset -unsigned ARMELFObjectWriter::GetRelocType(const MCValue &Target, +unsigned ARMELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target, const MCFixup &Fixup, bool IsPCRel) const { return GetRelocTypeInner(Target, Fixup, IsPCRel); |