From: Daniel Sanders <daniel.sanders@imgtec.com>
Date: Fri, 20 Nov 2015 13:16:35 +0000 (+0000)
Subject: Partially revert r253662: some unrelated work was accidentally committed with it.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d498a1b6d1cc6c11426c1145d07953e22495b511;p=oota-llvm.git

Partially revert r253662: some unrelated work was accidentally committed with it.

Sorry.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@253663 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 0f5b1f1afb5..04895e7702f 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -439,7 +439,6 @@ bool SelectionDAGISel::runOnMachineFunction(MachineFunction &mf) {
   if (Fn.hasFnAttribute(Attribute::OptimizeNone))
     NewOptLevel = CodeGenOpt::None;
   OptLevelChanger OLC(*this, NewOptLevel);
-  errs() << "OptLevel is -O" << OptLevel << "\n";
 
   TII = MF->getSubtarget().getInstrInfo();
   TLI = MF->getSubtarget().getTargetLowering();
diff --git a/lib/Target/Mips/AsmParser/MipsAsmParser.cpp b/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
index 74c289f1b9a..32856550b70 100644
--- a/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
+++ b/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
@@ -1708,25 +1708,14 @@ bool MipsAsmParser::processInstruction(MCInst &Inst, SMLoc IDLoc,
                 MCOperand::createExpr(GotDispRelocExpr), IDLoc, Instructions);
       }
     } else {
-      if (isABI_O32()) {
-        // If it's an external/weak symbol, we expand to:
-        //  lw/ld    $25, 0($gp)
-        //    R_(MICRO)MIPS_CALL16  label
-        //  jalr  $25
-        const MCExpr *Call16RelocExpr = evaluateRelocExpr(JalExpr, "call16");
-
-        emitRRX(ABI.ArePtrs64bit() ? Mips::LD : Mips::LW, Mips::T9, Mips::GP,
-                MCOperand::createExpr(Call16RelocExpr), IDLoc, Instructions);
-      } else if (isABI_N32() || isABI_N64()) {
-        // If it's an external/weak symbol, we expand to:
-        //  lw/ld    $25, 0($gp)
-        //    R_(MICRO)MIPS_GOT_DISP  label
-        //  jalr  $25
-        const MCExpr *GotDispRelocExpr = evaluateRelocExpr(JalExpr, "got_disp");
-
-        emitRRX(ABI.ArePtrs64bit() ? Mips::LD : Mips::LW, Mips::T9, Mips::GP,
-                MCOperand::createExpr(GotDispRelocExpr), IDLoc, Instructions);
-      }
+      // If it's an external/weak symbol, we expand to:
+      //  lw/ld    $25, 0($gp)
+      //    R_(MICRO)MIPS_CALL16  label
+      //  jalr  $25
+      const MCExpr *Call16RelocExpr = evaluateRelocExpr(JalExpr, "call16");
+
+      emitRRX(ABI.ArePtrs64bit() ? Mips::LD : Mips::LW, Mips::T9, Mips::GP,
+              MCOperand::createExpr(Call16RelocExpr), IDLoc, Instructions);
     }
 
     MCInst JalrInst;