summaryrefslogtreecommitdiffstats
path: root/llvm/lib/MC/ELFObjectWriter.cpp
diff options
context:
space:
mode:
authorLang Hames <lhames@gmail.com>2015-01-06 00:54:32 +0000
committerLang Hames <lhames@gmail.com>2015-01-06 00:54:32 +0000
commit04b37c4043bf90e9986e08f23214d6080bee603e (patch)
tree10b0b0b81d885fef0e6ea6afbc2b39f97a67fd67 /llvm/lib/MC/ELFObjectWriter.cpp
parente78889c66969e9af8d66459a55bdce41051603a8 (diff)
downloadbcm5719-llvm-04b37c4043bf90e9986e08f23214d6080bee603e.tar.gz
bcm5719-llvm-04b37c4043bf90e9986e08f23214d6080bee603e.zip
Revert r225048: It broke ObjC on AArch64.
I've filed http://llvm.org/PR22100 to track this issue. llvm-svn: 225228
Diffstat (limited to 'llvm/lib/MC/ELFObjectWriter.cpp')
-rw-r--r--llvm/lib/MC/ELFObjectWriter.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp
index 83a76dc2256..e4442e10a05 100644
--- a/llvm/lib/MC/ELFObjectWriter.cpp
+++ b/llvm/lib/MC/ELFObjectWriter.cpp
@@ -219,7 +219,7 @@ class ELFObjectWriter : public MCObjectWriter {
const MCSymbolData *SD, uint64_t C,
unsigned Type) const;
- void RecordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout,
+ void RecordRelocation(const MCAssembler &Asm, const MCAsmLayout &Layout,
const MCFragment *Fragment, const MCFixup &Fixup,
MCValue Target, bool &IsPCRel,
uint64_t &FixedValue) override;
@@ -789,11 +789,13 @@ static const MCSymbol *getWeakRef(const MCSymbolRefExpr &Ref) {
return nullptr;
}
-void ELFObjectWriter::RecordRelocation(MCAssembler &Asm,
+void ELFObjectWriter::RecordRelocation(const MCAssembler &Asm,
const MCAsmLayout &Layout,
const MCFragment *Fragment,
- const MCFixup &Fixup, MCValue Target,
- bool &IsPCRel, uint64_t &FixedValue) {
+ const MCFixup &Fixup,
+ MCValue Target,
+ bool &IsPCRel,
+ uint64_t &FixedValue) {
const MCSectionData *FixupSection = Fragment->getParent();
uint64_t C = Target.getConstant();
uint64_t FixupOffset = Layout.getFragmentOffset(Fragment) + Fixup.getOffset();
OpenPOWER on IntegriCloud