Change all ARM calls into indirect calls.

tests_lit/llvm2ice_tests/arith.ll

Index: tests_lit/llvm2ice_tests/arith.ll
diff --git a/tests_lit/llvm2ice_tests/arith.ll b/tests_lit/llvm2ice_tests/arith.ll
index 7613900c97fb72aca4d17ed8e572a347d186532e..56b557a510d69a3e9b2995c4137875c361f77739 100644
--- a/tests_lit/llvm2ice_tests/arith.ll
+++ b/tests_lit/llvm2ice_tests/arith.ll
@@ -4,28 +4,28 @@
 ; RUN:   --target x8632 -i %s --args -O2 \
 ; RUN:   | %if --need=target_X8632 --command FileCheck %s
 
-; TODO(jvoung): Stop skipping unimplemented parts (via --skip-unimplemented)
-; once enough infrastructure is in. Also, switch to --filetype=obj
-; when possible.
 ; RUN: %if --need=target_ARM32 --need=allow_dump \
-; RUN:   --command %p2i --filetype=asm --assemble --disassemble --target arm32 \
-; RUN:   -i %s --args -O2 --skip-unimplemented \
+; RUN:   --command %p2i --filetype=obj --assemble --disassemble --target arm32 \
+; RUN:   -i %s --args -O2 \
 ; RUN:   | %if --need=target_ARM32 --need=allow_dump \
 ; RUN:   --command FileCheck --check-prefix ARM32 --check-prefix ARM-OPT2 %s
 ; RUN: %if --need=target_ARM32 --need=allow_dump \
-; RUN:   --command %p2i --filetype=asm --assemble --disassemble --target arm32 \
-; RUN:   -i %s --args -O2 --mattr=hwdiv-arm --skip-unimplemented \
+; RUN:   --command %p2i --filetype=obj --assemble --disassemble --target arm32 \
+; RUN:   -i %s --args -O2 --mattr=hwdiv-arm \
 ; RUN:   | %if --need=target_ARM32 --need=allow_dump \
 ; RUN:   --command FileCheck --check-prefix ARM32HWDIV %s
 ; RUN: %if --need=target_ARM32 --need=allow_dump \
-; RUN:   --command %p2i --filetype=asm --assemble --disassemble --target arm32 \
-; RUN:   -i %s --args -Om1 --skip-unimplemented \
+; RUN:   --command %p2i --filetype=obj --assemble --disassemble --target arm32 \
+; RUN:   -i %s --args -Om1 \
 ; RUN:   | %if --need=target_ARM32 --need=allow_dump \
 ; RUN:   --command FileCheck --check-prefix ARM32 --check-prefix ARM32-OPTM1 %s
 ;
+; TODO(kschimpf): Stop skipping unimplemented parts (via --skip-unimplemented)
+; once enough infrastructure is in. Also, switch to --filetype=obj
+; when possible.
 ; RUN: %if --need=target_MIPS32 --need=allow_dump \
 ; RUN:   --command %p2i --filetype=asm --assemble --disassemble --target mips32\
-; RUN:   -i %s --args -O2 --skip-unimplemented \
+; RUN:   -i %s --args -O2 -skip-unimplemented \
 ; RUN:   | %if --need=target_MIPS32 --need=allow_dump \
 ; RUN:   --command FileCheck --check-prefix MIPS32 %s
 
@@ -162,8 +162,11 @@ entry:
 ; ARM32-LABEL: Sdiv
 ; ARM32: tst [[DENOM:r.*]], [[DENOM]]
 ; ARM32: bne
-; ARM32: .word 0xe7fedef0
-; ARM32: {{.*}} bl {{.*}} __divsi3
+; AARM32: .word 0xe7fedef0
+; ARM32: udf #60896 ; 0xede0
+; ARM32: movw [[CALL:r[0-9]]], {{.+}} __divsi3
+; ARM32: movt [[CALL]], {{.+}} __divsi3
+; ARM32: blx [[CALL]]
 ; ARM32HWDIV-LABEL: Sdiv
 ; ARM32HWDIV: tst
 ; ARM32HWDIV: bne
@@ -182,7 +185,9 @@ entry:
 ;
 ; ARM32-LABEL: SdivConst
 ; ARM32-NOT: tst
-; ARM32: bl {{.*}} __divsi3
+; ARM32: movw [[CALL:r[0-9]]], {{.+}} __divsi3
+; ARM32: movt [[CALL]], {{.+}} __divsi3
+; ARM32: blx [[CALL]]
 ; ARM32HWDIV-LABEL: SdivConst
 ; ARM32HWDIV-NOT: tst
 ; ARM32HWDIV: sdiv
@@ -201,7 +206,9 @@ entry:
 ; ARM32-LABEL: Srem
 ; ARM32: tst [[DENOM:r.*]], [[DENOM]]
 ; ARM32: bne
-; ARM32: bl {{.*}} __modsi3
+; ARM32: movw [[CALL:r[0-9]]], {{.+}} __modsi3
+; ARM32: movt [[CALL]], {{.+}} __modsi3
+; ARM32: blx [[CALL]]
 ; ARM32HWDIV-LABEL: Srem
 ; ARM32HWDIV: tst
 ; ARM32HWDIV: bne
@@ -221,7 +228,9 @@ entry:
 ; ARM32-LABEL: Udiv
 ; ARM32: tst [[DENOM:r.*]], [[DENOM]]
 ; ARM32: bne
-; ARM32: bl {{.*}} __udivsi3
+; ARM32: movw [[CALL:r[0-9]]], {{.+}} __udivsi3
+; ARM32: movt [[CALL]], {{.+}} __udivsi3
+; ARM32: blx [[CALL]]
 ; ARM32HWDIV-LABEL: Udiv
 ; ARM32HWDIV: tst
 ; ARM32HWDIV: bne
@@ -240,7 +249,9 @@ entry:
 ; ARM32-LABEL: Urem
 ; ARM32: tst [[DENOM:r.*]], [[DENOM]]
 ; ARM32: bne
-; ARM32: bl {{.*}} __umodsi3
+; ARM32: movw [[CALL:r[0-9]]], {{.+}} __umodsi3
+; ARM32: movt [[CALL]], {{.+}} __umodsi3
+; ARM32: blx [[CALL]]
 ; ARM32HWDIV-LABEL: Urem
 ; ARM32HWDIV: tst
 ; ARM32HWDIV: bne