Rebased PNaCl localmods in LLVM to 223109

lib/Target/ARM/ARMSelectionDAGInfo.cpp

Index: lib/Target/ARM/ARMSelectionDAGInfo.cpp
diff --git a/lib/Target/ARM/ARMSelectionDAGInfo.cpp b/lib/Target/ARM/ARMSelectionDAGInfo.cpp
index fa30ac31a30f79bb3ef01c83c1ea131fa6729052..ead581a0787f50e7d878058416c9f5a5bc57c3e2 100644
--- a/lib/Target/ARM/ARMSelectionDAGInfo.cpp
+++ b/lib/Target/ARM/ARMSelectionDAGInfo.cpp
@@ -152,9 +152,12 @@ EmitTargetCodeForMemset(SelectionDAG &DAG, SDLoc dl,
                         MachinePointerInfo DstPtrInfo) const {
   const ARMSubtarget &Subtarget = DAG.getTarget().getSubtarget<ARMSubtarget>();
   // Use default for non-AAPCS (or MachO) subtargets
-  if (!Subtarget.isAAPCS_ABI() || Subtarget.isTargetMachO() ||
+  // @LOCALMOD-START
+  if (Subtarget.isTargetNaCl() || !EnableARMAEABIFunctions ||
+      !Subtarget.isAAPCS_ABI() || Subtarget.isTargetMachO() ||
       Subtarget.isTargetWindows())
     return SDValue();
+  // @LOCALMOD-END
 
   const ARMTargetLowering &TLI =
       *DAG.getTarget().getSubtarget<ARMSubtarget>().getTargetLowering();