diff --git a/llvm/test/CodeGen/ARM/select.ll b/llvm/test/CodeGen/ARM/select.ll
index 8ed6e40..aca7b7d 100644
--- a/llvm/test/CodeGen/ARM/select.ll
+++ b/llvm/test/CodeGen/ARM/select.ll
@@ -1,49 +1,63 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep moveq | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movgt | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movlt | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movle | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movls | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep movhi | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm &&
+; RUN: llvm-as < %s | llc -march=arm | grep moveq | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=arm | grep movgt | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=arm | grep movlt | wc -l | grep 3 &&
+; RUN: llvm-as < %s | llc -march=arm | grep movle | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=arm | grep movls | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=arm | grep movhi | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=arm -mattr=+vfp2 | grep fcpydmi | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=arm -enable-thumb | grep beq | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=arm -enable-thumb | grep bgt | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=arm -enable-thumb | grep blt | wc -l | grep 3 &&
+; RUN: llvm-as < %s | llc -march=arm -enable-thumb | grep ble | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=arm -enable-thumb | grep bls | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=arm -enable-thumb | grep bhi | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=arm -enable-thumb | grep __ltdf2
 
-int %f1(int %a) {
+define i32 %f1(i32 %a.s) {
 entry:
-	%tmp = seteq int %a, 4		; <bool> [#uses=1]
-	%tmp1 = select bool %tmp, int 2, int 3
-	ret int %tmp1
+    %tmp = icmp eq i32 %a.s, 4
+    %tmp1.s = select i1 %tmp, i32 2, i32 3
+    ret i32 %tmp1.s
 }
 
-int %f2(int %a) {
+define i32 %f2(i32 %a.s) {
 entry:
-	%tmp = setgt int %a, 4		; <bool> [#uses=1]
-	%tmp1 = select bool %tmp, int 2, int 3
-	ret int %tmp1
+    %tmp = icmp sgt i32 %a.s, 4
+    %tmp1.s = select i1 %tmp, i32 2, i32 3
+    ret i32 %tmp1.s
 }
 
-int %f3(int %a, int %b) {
+define i32 %f3(i32 %a.s, i32 %b.s) {
 entry:
-	%tmp = setlt int %a, %b		; <bool> [#uses=1]
-	%tmp1 = select bool %tmp, int 2, int 3
-	ret int %tmp1
+    %tmp = icmp slt i32 %a.s, %b.s
+    %tmp1.s = select i1 %tmp, i32 2, i32 3
+    ret i32 %tmp1.s
 }
 
-int %f4(int %a, int %b) {
+define i32 %f4(i32 %a.s, i32 %b.s) {
 entry:
-	%tmp = setle int %a, %b		; <bool> [#uses=1]
-	%tmp1 = select bool %tmp, int 2, int 3
-	ret int %tmp1
+    %tmp = icmp sle i32 %a.s, %b.s
+    %tmp1.s = select i1 %tmp, i32 2, i32 3
+    ret i32 %tmp1.s
 }
 
-int %f5(uint %a, uint %b) {
+define i32 %f5(i32 %a.u, i32 %b.u) {
 entry:
-	%tmp = setle uint %a, %b		; <bool> [#uses=1]
-	%tmp1 = select bool %tmp, int 2, int 3
-	ret int %tmp1
+    %tmp = icmp ule i32 %a.u, %b.u
+    %tmp1.s = select i1 %tmp, i32 2, i32 3
+    ret i32 %tmp1.s
 }
 
-int %f6(uint %a, uint %b) {
+define i32 %f6(i32 %a.u, i32 %b.u) {
 entry:
-	%tmp = setgt uint %a, %b		; <bool> [#uses=1]
-	%tmp1 = select bool %tmp, int 2, int 3
-	ret int %tmp1
+    %tmp = icmp ugt i32 %a.u, %b.u
+    %tmp1.s = select i1 %tmp, i32 2, i32 3
+    ret i32 %tmp1.s
+}
+
+define double %f7(double %a, double %b) {
+    %tmp = fcmp olt double %a, 1.234e+00
+    %tmp1 = select i1 %tmp, double -1.000e+00, double %b
+    ret double %tmp1
 }