Back out r130862; it appears to be breaking bootstrap.

llvm-svn: 130867

2 files changed, 2 insertions, 24 deletions

diff --git a/llvm/test/CodeGen/Thumb2/thumb2-cbnz.ll b/llvm/test/CodeGen/Thumb2/thumb2-cbnz.ll
index 0ca97647d54..10a4985d173 100644
--- a/llvm/test/CodeGen/Thumb2/thumb2-cbnz.ll
+++ b/llvm/test/CodeGen/Thumb2/thumb2-cbnz.ll
@@ -21,8 +21,8 @@ bb7:                                              ; preds = %bb3
 
 bb9:                                              ; preds = %bb7
 ; CHECK:      cmp r0, #0
-; CHECK-NOT: cmp
-; CHECK: cbnz
+; CHECK:      cmp r0, #0
+; CHECK-NEXT: cbnz
   %0 = tail call  double @floor(double %b) nounwind readnone ; <double> [#uses=0]
   br label %bb11
 
diff --git a/llvm/test/CodeGen/X86/cmp-redundant.ll b/llvm/test/CodeGen/X86/cmp-redundant.ll
deleted file mode 100644
index d30ea3edd68..00000000000
--- a/llvm/test/CodeGen/X86/cmp-redundant.ll
+++ /dev/null
@@ -1,22 +0,0 @@
-; RUN: llc < %s -mtriple=x86_64-apple-darwin10 | FileCheck %s
-
-define i32 @cmp(i32* %aa, i32* %bb) nounwind readnone ssp {
-entry:
-  %a = load i32* %aa
-  %b = load i32* %bb
-  %cmp = icmp sgt i32 %a, %b
-  br i1 %cmp, label %return, label %if.end
-; CHECK: cmp:
-; CHECK: cmpl
-; CHECK: jg
-if.end:                                           ; preds = %entry
-; CHECK-NOT: cmpl
-; CHECK: cmov
-  %cmp4 = icmp slt i32 %a, %b
-  %. = select i1 %cmp4, i32 2, i32 111
-  br label %return
-
-return:                                           ; preds = %if.end, %entry
-  %retval.0 = phi i32 [ 1, %entry ], [ %., %if.end ]
-  ret i32 %retval.0
-}