Revert 42908 for now.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@42960 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 8 insertions, 8 deletions

diff --git a/test/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll b/test/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll
index 210c365..f0be2bb 100644
--- a/test/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll
+++ b/test/CodeGen/X86/2006-10-19-SwitchUnnecessaryBranching.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | %prcontext je 1 | \
-; RUN:   grep BB | grep main
+; RUN:   grep BB1_1:
 
 %str = internal constant [14 x sbyte] c"Hello world!\0A\00"		; <[14 x sbyte]*> [#uses=1]
 %str = internal constant [13 x sbyte] c"Blah world!\0A\00"		; <[13 x sbyte]*> [#uses=1]
diff --git a/test/CodeGen/X86/2007-01-08-InstrSched.ll b/test/CodeGen/X86/2007-01-08-InstrSched.ll
index 4ff1bf1..811e9ac 100644
--- a/test/CodeGen/X86/2007-01-08-InstrSched.ll
+++ b/test/CodeGen/X86/2007-01-08-InstrSched.ll
@@ -1,6 +1,6 @@
 ; PR1075
 ; RUN: llvm-as < %s | llc -mtriple=x86_64-apple-darwin | \
-; RUN:   %prcontext {mulss	LCPI3__foo} 1 | grep mulss | count 1
+; RUN:   %prcontext {mulss	LCPI1_3} 1 | grep mulss | count 1
 
 define float @foo(float %x) {
     %tmp1 = mul float %x, 3.000000e+00
diff --git a/test/CodeGen/X86/fp_constant_op.llx b/test/CodeGen/X86/fp_constant_op.llx
index 89cc831..8c59d18 100644
--- a/test/CodeGen/X86/fp_constant_op.llx
+++ b/test/CodeGen/X86/fp_constant_op.llx
@@ -3,32 +3,32 @@
 
 ; Test that the load of the constant is folded into the operation.
 
-double %foo_add(double %P) {
+double %test_add(double %P) {
         %tmp.1 = add double %P, 0x405EC00000000000
         ret double %tmp.1
 }
 
-double %foo_mul(double %P) {
+double %test_mul(double %P) {
         %tmp.1 = mul double %P, 0x405EC00000000000
         ret double %tmp.1
 }
 
-double %foo_sub(double %P) {
+double %test_sub(double %P) {
         %tmp.1 = sub double %P, 0x405EC00000000000
         ret double %tmp.1
 }
 
-double %foo_subr(double %P) {
+double %test_subr(double %P) {
         %tmp.1 = sub double 0x405EC00000000000, %P
         ret double %tmp.1
 }
 
-double %foo_div(double %P) {
+double %test_div(double %P) {
         %tmp.1 = div double %P, 0x405EC00000000000
         ret double %tmp.1
 }
 
-double %foo_divr(double %P) {
+double %test_divr(double %P) {
         %tmp.1 = div double 0x405EC00000000000, %P
         ret double %tmp.1
 }