PNaCl localmod mods in LLVM to 223109 (local files only)

lib/Target/ARM/ARMNaClRewritePass.cpp

Index: lib/Target/ARM/ARMNaClRewritePass.cpp
diff --git a/lib/Target/ARM/ARMNaClRewritePass.cpp b/lib/Target/ARM/ARMNaClRewritePass.cpp
index f10c62fa21c51e968cd28c626887f6564c7577e7..dbf29e606cc516b1d65c2321ccc0b7c6a2811933 100644
--- a/lib/Target/ARM/ARMNaClRewritePass.cpp
+++ b/lib/Target/ARM/ARMNaClRewritePass.cpp
@@ -30,7 +30,7 @@
 #include "llvm/IR/Function.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/Target/TargetMachine.h"
+#include "llvm/Target/TargetSubtargetInfo.h"
 #include <set>
 #include <stdio.h>
 
@@ -1056,8 +1056,8 @@ bool ARMNaClRewritePass::SandboxMemoryReferencesInBlock(
 /**********************************************************************/
 
 bool ARMNaClRewritePass::runOnMachineFunction(MachineFunction &MF) {
-  TII = static_cast<const ARMBaseInstrInfo*>(MF.getTarget().getInstrInfo());
-  TRI = MF.getTarget().getRegisterInfo();
+  TII = static_cast<const ARMBaseInstrInfo*>(MF.getSubtarget().getInstrInfo());
+  TRI = MF.getSubtarget().getRegisterInfo();
 
   bool Modified = false;
   for (MachineFunction::iterator MFI = MF.begin(), E = MF.end();