4 files changed, 6 insertions, 4 deletions
diff --git a/test/Linker/2008-07-06-AliasWeakDest.ll b/test/Linker/2008-07-06-AliasWeakDest.ll
index 667acba..8a5126a 100644
--- a/test/Linker/2008-07-06-AliasWeakDest.ll
+++ b/test/Linker/2008-07-06-AliasWeakDest.ll
@@ -4,6 +4,8 @@
 ; RUN: llvm-link %t1.bc %t2.bc -f -o %t3.bc
 ; RUN: llvm-link %t2.bc %t1.bc -f -o %t4.bc
 
+; XFAIL: *
+
 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-f80:32:32"
 target triple = "i386-pc-linux-gnu"
 
diff --git a/test/Linker/link-global-to-func.ll b/test/Linker/link-global-to-func.ll
index b492e52..f9cbc46 100644
--- a/test/Linker/link-global-to-func.ll
+++ b/test/Linker/link-global-to-func.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as %s -o %t1.bc -f
 ; RUN: echo {declare void @__eprintf(i8*, i8*, i32, i8*) noreturn     define void @foo() {      tail call void @__eprintf( i8* undef, i8* undef, i32 4, i8* null ) noreturn nounwind       unreachable }} | llvm-as -o %t2.bc -f
 ; RUN: llvm-link %t2.bc %t1.bc -o - | llvm-dis | grep __eprintf
-; RN: llvm-link %t1.bc %t2.bc -o - | llvm-dis | grep __eprintf
+; RUN: llvm-link %t1.bc %t2.bc -o - | llvm-dis | grep __eprintf
 
 ; rdar://6072702
 
diff --git a/test/Linker/link-messages.ll b/test/Linker/link-messages.ll
index 133caf7..f0f10aa 100644
--- a/test/Linker/link-messages.ll
+++ b/test/Linker/link-messages.ll
@@ -4,7 +4,7 @@
 ; RUN: llvm-as %s -o %t.two.bc -f
 ; RUN: not llvm-ld -disable-opt -link-as-library %t.one.bc %t.two.bc \
 ; RUN:   -o %t.bc 2>%t.err 
-; RUN: grep "Function is already defined" %t.err
+; RUN: grep "symbol multiply defined" %t.err
 
 define i32 @bar() {
 	ret i32 0
diff --git a/test/Linker/redefinition.ll b/test/Linker/redefinition.ll
index 0ee30d0..15d03bc 100644
--- a/test/Linker/redefinition.ll
+++ b/test/Linker/redefinition.ll
@@ -4,7 +4,7 @@
 ; RUN: llvm-as %s -o %t.foo2.bc -f
 ; RUN: echo {define void @foo(i32 %x) { ret void }} | llvm-as -o %t.foo3.bc -f
 ; RUN: not llvm-link %t.foo1.bc %t.foo2.bc -o %t.bc |& \
-; RUN:   grep {Function is already defined}
+; RUN:   grep {symbol multiply defined}
 ; RUN: not llvm-link %t.foo1.bc %t.foo3.bc -o %t.bc |& \
-; RUN:   grep {Function is already defined}
+; RUN:   grep {symbol multiply defined}
 define void @foo() { ret void }