Subzero: switch from llvm-objdump to objdump for lit tests (for LLVM merge)

tests_lit/llvm2ice_tests/returns_twice_no_coalesce.ll

Index: tests_lit/llvm2ice_tests/returns_twice_no_coalesce.ll
diff --git a/tests_lit/llvm2ice_tests/returns_twice_no_coalesce.ll b/tests_lit/llvm2ice_tests/returns_twice_no_coalesce.ll
index b6540fc225648d4c0d8bcce15379d9a1522ca88f..caaf1038bf735f38039bc2b47458ad0454fe6d32 100644
--- a/tests_lit/llvm2ice_tests/returns_twice_no_coalesce.ll
+++ b/tests_lit/llvm2ice_tests/returns_twice_no_coalesce.ll
@@ -1,9 +1,8 @@
 ; This file checks that SimpleCoalescing of local stack slots is not done
 ; when calling a function with the "returns twice" attribute.
 
-; RUN: %p2i -i %s --args -Om1 --verbose none \
-; RUN:   | llvm-mc -triple=i686-none-nacl -filetype=obj \
-; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - | FileCheck %s
+; RUN: %p2i -i %s --assemble --disassemble --args -Om1 --verbose none \
+; RUN:   | FileCheck %s
 
 ; Setjmp is a function with the "returns twice" attribute.
 declare i32 @llvm.nacl.setjmp(i8*)
@@ -29,10 +28,10 @@ NonZero:
 
 ; CHECK-LABEL: call_returns_twice
 ; CHECK: add [[REG1:.*]], 12345
-; CHECK: mov dword ptr [esp + [[OFF:.*]]], [[REG1]]
+; CHECK: mov DWORD PTR [esp+[[OFF:.*]]],[[REG1]]
 ; CHECK: add [[REG2:.*]], 54321
 ; There should not be sharing of the stack slot.
-; CHECK-NOT: mov dword ptr [esp + [[OFF]]], [[REG2]]
+; CHECK-NOT: mov DWORD PTR [esp + [[OFF]]], [[REG2]]
 
 define i32 @no_call_returns_twice(i32 %iptr_jmpbuf, i32 %x) {
 entry:
@@ -51,10 +50,10 @@ NonZero:
 
 ; CHECK-LABEL: no_call_returns_twice
 ; CHECK: add [[REG1:.*]], 12345
-; CHECK: mov dword ptr [esp + [[OFF:.*]]], [[REG1]]
+; CHECK: mov DWORD PTR [esp+[[OFF:.*]]],[[REG1]]
 ; CHECK: add [[REG2:.*]], 54321
 ; Now there should be sharing of the stack slot (OFF is the same).
 ; Commenting out after disabling simple coalescing for -Om1.
 ; TODO(stichnot): Add it back if/when we add a flag to enable simple
 ; coalescing.
-; xCHECK: mov dword ptr [esp + [[OFF]]], [[REG2]]
+; xCHECK: mov DWORD PTR [esp + [[OFF]]], [[REG2]]