[MIPS] Fix LLVM issues with recent LLVM trunk merge

This change fixes some of the issues that came with recent merge with LLVM
trunk, and it removes some workarounds that are not needed anymore in the
code. In more details, it:

- removes hack to set ELF::EF_MIPS_PIC flag;
- checks whether __nacl_read_tp is defined in the module, as different
  relocation(s) is used to calculate the address;
- marks Mips::JALRPseudo as indirect call in NaCl rewrite pass;
- fixes incorrect merge in MipsAsmPrinter.cpp and MipsMCTargetDesc.cpp.

BUG= https://code.google.com/p/nativeclient/issues/detail?id=2275
TEST= run smoke tests

Review URL: https://codereview.chromium.org/13601014

1 files changed, 0 insertions, 7 deletions

diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp
index 1e2086e565..2e1a045569 100644
--- a/lib/MC/MCObjectFileInfo.cpp
+++ b/lib/MC/MCObjectFileInfo.cpp
@@ -610,16 +610,9 @@ void MCObjectFileInfo::InitCOFFMCObjectFileInfo(Triple T) {
                         SectionKind::getDataRel());
 }
 
-// @LOCALMOD-START
-// TODO(petarj): HACK! Find a better way to set ELF::EF_MIPS_PIC flag.
-// See also file lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp.
-Reloc::Model RelocModelOption = Reloc::Default;
-// @LOCALMOD-END
-
 void MCObjectFileInfo::InitMCObjectFileInfo(StringRef TT, Reloc::Model relocm,
                                             CodeModel::Model cm,
                                             MCContext &ctx) {
-  RelocModelOption = relocm;  // @LOCALMOD
   RelocM = relocm;
   CMModel = cm;
   Ctx = &ctx;