Revert 239698 - Accidentally committed more than intended.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_36@239699 91177308-0d34-0410-b5e6-96231b3b80d8

5 files changed, 3 insertions, 37 deletions

diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 1ba2e1fd23c5..ef5452554f72 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -656,7 +656,7 @@ void SelectionDAGISel::CodeGenAndEmitDAG() {
   (void)BlockNumber;
   bool MatchFilterBB = false; (void)MatchFilterBB;
 #ifndef NDEBUG
-  MatchFilterBB = (FilterDAGBasicBlockName.empty() ||
+  MatchFilterBB = (!FilterDAGBasicBlockName.empty() &&
                    FilterDAGBasicBlockName ==
                        FuncInfo->MBB->getBasicBlock()->getName().str());
 #endif
diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp
index e0a86eef441d..858181dd4af9 100644
--- a/lib/MC/MCObjectFileInfo.cpp
+++ b/lib/MC/MCObjectFileInfo.cpp
@@ -350,8 +350,6 @@ void MCObjectFileInfo::InitELFMCObjectFileInfo(Triple T) {
     // eh_frame section can be read-only.  DW.ref.personality will be generated
     // for relocation.
     PersonalityEncoding = dwarf::DW_EH_PE_indirect;
-    LSDAEncoding = dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4;
-    TTypeEncoding = dwarf::DW_EH_PE_indirect | dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4;
     break;
   case Triple::ppc64:
   case Triple::ppc64le:
diff --git a/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp b/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
index ec796a3b4ce3..56aac4eaea49 100644
--- a/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
+++ b/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
@@ -55,7 +55,8 @@ unsigned MipsELFObjectWriter::GetRelocType(const MCValue &Target,
   default:
     llvm_unreachable("invalid fixup kind!");
   case FK_Data_4:
-    return IsPCRel ? ELF::R_MIPS_PC32 : ELF::R_MIPS_32;
+    Type = ELF::R_MIPS_32;
+    break;
   case FK_Data_8:
     Type = ELF::R_MIPS_64;
     break;
diff --git a/lib/Target/Mips/MipsAsmPrinter.cpp b/lib/Target/Mips/MipsAsmPrinter.cpp
index 9b774cd650ac..50c0441e0dd4 100644
--- a/lib/Target/Mips/MipsAsmPrinter.cpp
+++ b/lib/Target/Mips/MipsAsmPrinter.cpp
@@ -29,8 +29,6 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineJumpTableInfo.h"
 #include "llvm/CodeGen/MachineMemOperand.h"
-#include "llvm/CodeGen/MachineModuleInfoImpls.h"
-#include "llvm/CodeGen/TargetLoweringObjectFileImpl.h"
 #include "llvm/IR/BasicBlock.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/InlineAsm.h"
@@ -1035,27 +1033,6 @@ void MipsAsmPrinter::EmitEndOfAsmFile(Module &M) {
   }
   // return to the text section
   OutStreamer.SwitchSection(OutContext.getObjectFileInfo()->getTextSection());
-
-  /* if (Subtarget->isTargetELF()) */ {
-    const TargetLoweringObjectFileELF &TLOFELF =
-      static_cast<const TargetLoweringObjectFileELF &>(getObjFileLowering());
-
-    MachineModuleInfoELF &MMIELF = MMI->getObjFileInfo<MachineModuleInfoELF>();
-
-    // Output stubs for external and common global variables.
-    MachineModuleInfoELF::SymbolListTy Stubs = MMIELF.GetGVStubList();
-    if (!Stubs.empty()) {
-      OutStreamer.SwitchSection(TLOFELF.getDataRelSection());
-      const DataLayout *TD = TM.getSubtargetImpl()->getDataLayout();
-
-      for (const auto &Stub : Stubs) {
-        OutStreamer.EmitLabel(Stub.first);
-        OutStreamer.EmitSymbolValue(Stub.second.getPointer(),
-                                    TD->getPointerSize());
-      }
-      Stubs.clear();
-    }
-  }
 }
 
 void MipsAsmPrinter::PrintDebugValueComment(const MachineInstr *MI,
diff --git a/test/MC/Mips/relocation.s b/test/MC/Mips/relocation.s
deleted file mode 100644
index 642b40960a65..000000000000
--- a/test/MC/Mips/relocation.s
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux < %s | llvm-readobj -r | FileCheck  %s
-
-// Test that we produce the correct relocation.
-// FIXME: move more relocation only tests here.
-
-        .long foo
-// CHECK: R_MIPS_32 foo
-
-        .long foo-.
-// CHECK: R_MIPS_PC32 foo