Rebased PNaCl localmods in LLVM to 223109

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

-; 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*)
 
 @va_list = external global i8*
 
 ; On ARM, varargs arguments are passed in r0-r3 with the rest on the
 ; stack.  A varargs function must therefore spill rN-r3 just below the
 ; function's initial stack pointer.
 ;
 ; This test checks for a bug in which a gap was left between the spill
 ; area and varargs arguments on the stack when using 16 byte stack
 ; alignment.
 
 define void @varargs_func(i32 %arg1, ...) {
   call void @llvm.va_start(i8* bitcast (i8** @va_list to i8*))
   call void @external_func(i8* bitcast (i8** @va_list to i8*))
   ret void
 }
 ; CHECK-LABEL: varargs_func:
 ; Reserve space for the varargs save area.  This currently reserves
 ; more than enough (16 bytes rather than the 12 bytes needed).
 ; CHECK: sub sp, sp, #16
 ; CHECK: push {r11, lr}
 ; Align the stack pointer to a multiple of 16.
 ; 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}