Subzero. ARM32. Reverts cl 1687553002.

tests_lit/llvm2ice_tests/nacl-other-intrinsics.ll

Index: tests_lit/llvm2ice_tests/nacl-other-intrinsics.ll
diff --git a/tests_lit/llvm2ice_tests/nacl-other-intrinsics.ll b/tests_lit/llvm2ice_tests/nacl-other-intrinsics.ll
index 3ceabf9835d50433e93fb072dcb64d3bb91e9e5c..371db88df0dcb09e88869b599ba218f33eac6202 100644
--- a/tests_lit/llvm2ice_tests/nacl-other-intrinsics.ll
+++ b/tests_lit/llvm2ice_tests/nacl-other-intrinsics.ll
@@ -129,12 +129,8 @@ NonZero:
 ; CHECKO2REM: call {{.*}} R_{{.*}} setjmp
 ; CHECKO2REM: call {{.*}} R_{{.*}} longjmp
 ; ARM32-LABEL: test_setjmplongjmp
-; ARM32: movw [[CALL:r[0-9]]], {{.+}} setjmp
-; ARM32: movt [[CALL]]
-; ARM32: blx [[CALL]]
-; ARM32: movw [[CALL:r[0-9]]], {{.+}} longjmp
-; ARM32: movt [[CALL]]
-; ARM32: blx [[CALL]]
+; ARM32: bl {{.*}} setjmp
+; ARM32: bl {{.*}} longjmp
 
 define internal i32 @test_setjmp_unused(i32 %iptr_env, i32 %i_other) {
 entry:
@@ -475,9 +471,7 @@ entry:
 ; CHECK-LABEL: test_popcount_32
 ; CHECK: call {{.*}} R_{{.*}} __popcountsi2
 ; ARM32-LABEL: test_popcount_32
-; ARM32: movw [[CALL:r[0-9]]], {{.+}} __popcountsi2
-; ARM32: movt [[CALL]]
-; ARM32: blx [[CALL]]
+; ARM32: bl {{.*}} __popcountsi2
 
 define internal i64 @test_popcount_64(i64 %x) {
 entry:
@@ -490,9 +484,7 @@ entry:
 ; the return value just in case.
 ; CHECK: mov {{.*}},0x0
 ; ARM32-LABEL: test_popcount_64
-; ARM32: movw [[CALL:r[0-9]]], {{.+}} __popcountdi2
-; ARM32: movt [[CALL]]
-; ARM32: blx [[CALL]]
+; ARM32: bl {{.*}} __popcountdi2
 ; ARM32: mov {{.*}}, #0
 
 define internal i32 @test_popcount_64_ret_i32(i64 %x) {