Merge r127441 from mainline.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_29@127443 91177308-0d34-0410-b5e6-96231b3b80d8

test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll

@@ -1,4 +1,3 @@
-; XFAIL: *
 ; RUN: llc < %s -march=x86 -mcpu=yonah -stats |& \
 ; RUN:   not grep {Number of register spills}
 ; END.

test/CodeGen/X86/2008-08-31-EH_RETURN32.ll

@@ -1,6 +1,6 @@
 ; Check that eh_return & unwind_init were properly lowered
 ; RUN: llc < %s | grep %ebp | count 7
-; RUN: llc < %s | grep %edx | count 5
+; RUN: llc < %s | grep %ecx | count 5
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"
 target triple = "i386-pc-linux"

test/CodeGen/X86/fold-pcmpeqd-0.ll

@@ -1,4 +1,5 @@
-; RUN: llc < %s -mtriple=i386-apple-darwin -mcpu=yonah | grep pcmpeqd | count 1
+; RUN: llc < %s -mtriple=i386-apple-darwin -mcpu=yonah  | not grep pcmpeqd
+; RUN: llc < %s -mtriple=i386-apple-darwin -mcpu=yonah  | grep orps | grep CPI0_2  | count 2
 ; RUN: llc < %s -mtriple=x86_64-apple-darwin | grep pcmpeqd | count 1
 
 ; This testcase shouldn't need to spill the -1 value,

test/CodeGen/X86/pr1505b.ll

@@ -1,4 +1,3 @@
-; XFAIL: *
 ; RUN: llc < %s -mcpu=i486 | grep fstpl | count 5
 ; RUN: llc < %s -mcpu=i486 | grep fstps | count 2
 ; PR1505

test/CodeGen/X86/v-binop-widen.ll

@@ -1,7 +1,7 @@
 ; RUN: llc -march=x86 -mattr=+sse < %s | FileCheck %s
-; CHECK: divps
 ; CHECK: divss
 ; CHECK: divps
+; CHECK: divps
 
 %vec = type <9 x float>
 define %vec @vecdiv( %vec %p1, %vec %p2)