Revert r238190 and r238197: [mips] Make TTypeEncoding indirect to allow .eh_frame to be read-only.

This broke the llvm-mips-linux builder and several of our out-of-tree builders.
Initial investigations show that the commit probably isn't the problem but
reverting anyway while I investigate.

llvm-svn: 238302

2 files changed, 1 insertions, 9 deletions

diff --git a/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp b/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp
index adbe526376e..0f2db6039b6 100644
--- a/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp
+++ b/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp
@@ -37,7 +37,6 @@ 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);
 
@@ -46,6 +45,7 @@ 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,9 +146,3 @@ 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 72338d275f8..725f2ffd93d 100644
--- a/llvm/lib/Target/Mips/MipsTargetObjectFile.h
+++ b/llvm/lib/Target/Mips/MipsTargetObjectFile.h
@@ -41,8 +41,6 @@ class MipsTargetMachine;
 
     MCSection *getSectionForConstant(SectionKind Kind,
                                      const Constant *C) const override;
-
-    unsigned SelectMipsTTypeEncoding() const override;
   };
 } // end namespace llvm