diff options
author | Eli Bendersky <eliben@chromium.org> | 2013-03-11 15:38:11 -0700 |
---|---|---|
committer | Eli Bendersky <eliben@chromium.org> | 2013-03-20 14:49:21 -0700 |
commit | d41567d2ffd3413600162653c08b2365bd5bcbbf (patch) | |
tree | aa1c212bcf816f4011315b80826acfb85ae7d9f3 /lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp | |
parent | 23c00401dad33ca247d2818e71540079bed63c5b (diff) |
Apply after-merge fixes to return to working state.
Diffstat (limited to 'lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp')
-rw-r--r-- | lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp b/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp index c39d3fad3b..6c080408dd 100644 --- a/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp +++ b/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp @@ -49,7 +49,6 @@ namespace { virtual unsigned GetRelocType(const MCValue &Target, const MCFixup &Fixup, bool IsPCRel, bool IsRelocWithSymbol, int64_t Addend) const; - virtual unsigned getEFlags() const; virtual const MCSymbol *ExplicitRelSym(const MCAssembler &Asm, const MCValue &Target, const MCFragment &F, @@ -68,22 +67,6 @@ MipsELFObjectWriter::MipsELFObjectWriter(bool _is64Bit, uint8_t OSABI, MipsELFObjectWriter::~MipsELFObjectWriter() {} -// FIXME: get the real EABI Version from the Subtarget class. -unsigned MipsELFObjectWriter::getEFlags() const { - - // FIXME: We can't tell if we are PIC (dynamic) or CPIC (static) - unsigned Flag = ELF::EF_MIPS_NOREORDER; - - if (is64Bit()) - Flag |= ELF::EF_MIPS_ARCH_64R2; - else - Flag |= ELF::EF_MIPS_ARCH_32R2; - /* @LOCLAMOD-START */ - if (RelocModelOption == Reloc::PIC_ || RelocModelOption == Reloc::Default) - Flag |= ELF::EF_MIPS_PIC; - /* @LOCLAMOD-END */ - return Flag; -} const MCSymbol *MipsELFObjectWriter::ExplicitRelSym(const MCAssembler &Asm, const MCValue &Target, |