Index: include/llvm/MC/MCObjectFileInfo.h
===================================================================
--- include/llvm/MC/MCObjectFileInfo.h
+++ include/llvm/MC/MCObjectFileInfo.h
@@ -380,6 +380,8 @@
   ///
   void InitEHFrameSection();
 
+  virtual unsigned SelectMipsTTypeEncoding() const;
+
 public:
   const Triple &getTargetTriple() const { return TT; }
 };
Index: lib/MC/MCObjectFileInfo.cpp
===================================================================
--- lib/MC/MCObjectFileInfo.cpp
+++ lib/MC/MCObjectFileInfo.cpp
@@ -324,10 +324,13 @@
   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 @@
                           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;
+}
Index: lib/Target/Mips/MipsTargetObjectFile.h
===================================================================
--- lib/Target/Mips/MipsTargetObjectFile.h
+++ lib/Target/Mips/MipsTargetObjectFile.h
@@ -41,6 +41,8 @@
 
     const MCSection *getSectionForConstant(SectionKind Kind,
                                            const Constant *C) const override;
+
+    unsigned SelectMipsTTypeEncoding() const override;
   };
 } // end namespace llvm
 
Index: lib/Target/Mips/MipsTargetObjectFile.cpp
===================================================================
--- lib/Target/Mips/MipsTargetObjectFile.cpp
+++ lib/Target/Mips/MipsTargetObjectFile.cpp
@@ -37,6 +37,7 @@
             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 @@
 
   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
@@ -144,3 +144,9 @@
   // 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);
+}
Index: test/CodeGen/Mips/ehframe-indirect.ll
===================================================================
--- test/CodeGen/Mips/ehframe-indirect.ll
+++ test/CodeGen/Mips/ehframe-indirect.ll
@@ -1,9 +1,11 @@
-; RUN: llc -mtriple=mipsel-linux-gnu < %s | FileCheck -check-prefix=ALL -check-prefix=O32 %s
-; RUN: llc -mtriple=mipsel-linux-android < %s | FileCheck -check-prefix=ALL -check-prefix=O32 %s
-; RUN: llc -mtriple=mips64el-linux-gnu -target-abi=n32 < %s | FileCheck -check-prefix=ALL -check-prefix=N32 %s
-; RUN: llc -mtriple=mips64el-linux-android -target-abi=n32 < %s | FileCheck -check-prefix=ALL -check-prefix=N32 %s
-; RUN: llc -mtriple=mips64el-linux-gnu < %s | FileCheck -check-prefix=ALL -check-prefix=N64 %s
-; RUN: llc -mtriple=mips64el-linux-android < %s | FileCheck -check-prefix=ALL -check-prefix=N64 %s
+; RUN: llc -mtriple=mipsel-linux-gnu < %s -asm-verbose | FileCheck -check-prefix=ALL -check-prefix=O32 %s
+; RUN: llc -mtriple=mipsel-linux-android < %s -asm-verbose | FileCheck -check-prefix=ALL -check-prefix=O32 %s
+; RUN: llc -mtriple=mips64el-linux-gnu -target-abi=n32 < %s -asm-verbose | FileCheck -check-prefix=ALL -check-prefix=N32 %s
+; RUN: llc -mtriple=mips64el-linux-android -target-abi=n32 < %s -asm-verbose | FileCheck -check-prefix=ALL -check-prefix=N32 %s
+; RUN: llc -mtriple=mips64el-linux-gnu < %s -asm-verbose | FileCheck -check-prefix=ALL -check-prefix=N64 %s
+; RUN: llc -mtriple=mips64el-linux-android < %s -asm-verbose | FileCheck -check-prefix=ALL -check-prefix=N64 %s
+
+@_ZTISt9exception = external constant i8*
 
 define i32 @main() {
 ; ALL: .cfi_startproc
@@ -16,7 +18,9 @@
 
 lpad:
   %0 = landingpad { i8*, i32 } personality i8*
-    bitcast (i32 (...)* @__gxx_personality_v0 to i8*) catch i8* null
+    bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+    catch i8* null
+    catch i8* bitcast (i8** @_ZTISt9exception to i8*)
   ret i32 0
 
 cont:
@@ -28,6 +32,18 @@
 
 declare void @foo()
 
+; ALL: GCC_except_table{{[0-9]+}}:
+; O32: .byte 155 # @TType Encoding = indirect pcrel sdata4
+; N32: .byte 155 # @TType Encoding = indirect pcrel sdata4
+; N64: .byte 156 # @TType Encoding = indirect pcrel sdata8
+; ALL: $[[PC_LABEL:tmp[0-9]+]]:
+; O32: .4byte	($_ZTISt9exception.DW.stub)-($[[PC_LABEL]])
+; N32: .4byte	($_ZTISt9exception.DW.stub)-($[[PC_LABEL]])
+; N64: .8byte	($_ZTISt9exception.DW.stub)-($[[PC_LABEL]])
+; ALL: $_ZTISt9exception.DW.stub:
+; O32: .4byte _ZTISt9exception
+; N32: .4byte _ZTISt9exception
+; N64: .8byte _ZTISt9exception
 ; ALL: .hidden DW.ref.__gxx_personality_v0
 ; ALL: .weak DW.ref.__gxx_personality_v0
 ; ALL: .section .data.DW.ref.__gxx_personality_v0,"aGw",@progbits,DW.ref.__gxx_personality_v0,comdat