Rebased PNaCl localmods in LLVM to 223109

test/CodeGen/ARM/varargs-spill-stack-align-nacl.ll

Index: test/CodeGen/ARM/varargs-spill-stack-align-nacl.ll
diff --git a/test/CodeGen/ARM/varargs-spill-stack-align-nacl.ll b/test/CodeGen/ARM/varargs-spill-stack-align-nacl.ll
index 148a79df0cb86c5d29f4c1d9b8581886a3bcf06c..670b7e02bfb17960d222bc6ec722f44aea92f536 100644
--- a/test/CodeGen/ARM/varargs-spill-stack-align-nacl.ll
+++ b/test/CodeGen/ARM/varargs-spill-stack-align-nacl.ll
@@ -1,4 +1,6 @@
-; RUN: llc < %s -mtriple=arm-nacl-gnueabi | FileCheck %s
+; RUN: llc < %s -mtriple=armv7-nacl-gnueabi | FileCheck %s
+; @LOCALMOD: change to armv7, (or alternatively +v6t2) since NaCl needs
+; movw/movt to materialize the @va_list global address.
 
 declare void @llvm.va_start(i8*)
 declare void @external_func(i8*)
@@ -27,5 +29,8 @@ define void @varargs_func(i32 %arg1, ...) {
 ; CHECK: sub sp, sp, #8
 ; Calculate the address of the varargs save area and save varargs
 ; arguments into it.
-; CHECK-NEXT: add r0, sp, #20
-; CHECK-NEXT: stm r0, {r1, r2, r3}
+; @LOCALMOD: Adjust test expectation, removing NEXT to allow CFI
+; directive to intervene in the output.
+; CHECK: add r0, sp, #20
+; @LOCALMOD: Adjust test expectation, removing NEXT to allow sandboxing.
+; CHECK: stm r0, {r1, r2, r3}