diff options
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/MC/MCObjectFileInfo.cpp | 17 | ||||
| -rw-r--r-- | llvm/lib/Target/Mips/MipsTargetObjectFile.cpp | 8 | ||||
| -rw-r--r-- | llvm/lib/Target/Mips/MipsTargetObjectFile.h | 2 |
3 files changed, 23 insertions, 4 deletions
diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp index e99f036af16..c189d19c12d 100644 --- a/llvm/lib/MC/MCObjectFileInfo.cpp +++ b/llvm/lib/MC/MCObjectFileInfo.cpp @@ -324,10 +324,13 @@ void MCObjectFileInfo::InitELFMCObjectFileInfo(Triple T) { case Triple::mipsel: case Triple::mips64: case Triple::mips64el: - // MIPS uses indirect pointer to refer personality functions, so that the - // eh_frame section can be read-only. DW.ref.personality will be generated - // for relocation. + // MIPS uses indirect pointer to refer personality functions and types, so + // that the eh_frame section can be read-only. DW.ref.personality will be + // generated for relocation. PersonalityEncoding = dwarf::DW_EH_PE_indirect; + TTypeEncoding = SelectMipsTTypeEncoding(); + // We don't support PC-relative LSDA references in GAS so we use the default + // DW_EH_PE_absptr for those. break; case Triple::ppc64: case Triple::ppc64le: @@ -793,3 +796,11 @@ void MCObjectFileInfo::InitEHFrameSection() { COFF::IMAGE_SCN_MEM_WRITE, SectionKind::getDataRel()); } + +unsigned MCObjectFileInfo::SelectMipsTTypeEncoding() const { + // FIXME: The N64 ABI ought to use DW_EH_PE_sdata8 but we can't + // identify N64 from just a triple. We currently fix this by + // overriding this function in MipsTargetObjectFile. + return dwarf::DW_EH_PE_indirect | dwarf::DW_EH_PE_pcrel | + dwarf::DW_EH_PE_sdata4; +} diff --git a/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp b/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp index 0f2db6039b6..adbe526376e 100644 --- a/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp +++ b/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp @@ -37,6 +37,7 @@ ExternSData("mextern-sdata", cl::Hidden, cl::init(true)); void MipsTargetObjectFile::Initialize(MCContext &Ctx, const TargetMachine &TM){ + this->TM = &static_cast<const MipsTargetMachine &>(TM); TargetLoweringObjectFileELF::Initialize(Ctx, TM); InitializeELF(TM.Options.UseInitArray); @@ -45,7 +46,6 @@ void MipsTargetObjectFile::Initialize(MCContext &Ctx, const TargetMachine &TM){ SmallBSSSection = getContext().getELFSection(".sbss", ELF::SHT_NOBITS, ELF::SHF_WRITE | ELF::SHF_ALLOC); - this->TM = &static_cast<const MipsTargetMachine &>(TM); } // A address must be loaded from a small section if its size is less than the @@ -146,3 +146,9 @@ MipsTargetObjectFile::getSectionForConstant(SectionKind Kind, // Otherwise, we work the same as ELF. return TargetLoweringObjectFileELF::getSectionForConstant(Kind, C); } + +unsigned MipsTargetObjectFile::SelectMipsTTypeEncoding() const { + return dwarf::DW_EH_PE_indirect | dwarf::DW_EH_PE_pcrel | + (TM->getABI().ArePtrs64bit() ? dwarf::DW_EH_PE_sdata8 + : dwarf::DW_EH_PE_sdata4); +} diff --git a/llvm/lib/Target/Mips/MipsTargetObjectFile.h b/llvm/lib/Target/Mips/MipsTargetObjectFile.h index 725f2ffd93d..72338d275f8 100644 --- a/llvm/lib/Target/Mips/MipsTargetObjectFile.h +++ b/llvm/lib/Target/Mips/MipsTargetObjectFile.h @@ -41,6 +41,8 @@ class MipsTargetMachine; MCSection *getSectionForConstant(SectionKind Kind, const Constant *C) const override; + + unsigned SelectMipsTTypeEncoding() const override; }; } // end namespace llvm |
