aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanya Lattner <tonic@nondot.org>2006-11-08 23:27:54 +0000
committerTanya Lattner <tonic@nondot.org>2006-11-08 23:27:54 +0000
commitbad3d39af3642ffeb5c075cacbabd1267e8afecc (patch)
tree15c15a31278a0efc352b830476314dae7161f9cf
parent0661dc25f5195502077800efdb28889743de88a4 (diff)
downloadllvm-bad3d39af3642ffeb5c075cacbabd1267e8afecc.zip
llvm-bad3d39af3642ffeb5c075cacbabd1267e8afecc.tar.gz
llvm-bad3d39af3642ffeb5c075cacbabd1267e8afecc.tar.bz2
Merging from mainline
llvm-svn: 31579
-rw-r--r--llvm/test/Regression/C++Frontend/2003-11-02-WeakLinkage.cpp.tr2
-rw-r--r--llvm/test/Regression/CFrontend/2006-09-28-SimpleAsm.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/llvm/test/Regression/C++Frontend/2003-11-02-WeakLinkage.cpp.tr b/llvm/test/Regression/C++Frontend/2003-11-02-WeakLinkage.cpp.tr
index 0b1cb05..1e324ca 100644
--- a/llvm/test/Regression/C++Frontend/2003-11-02-WeakLinkage.cpp.tr
+++ b/llvm/test/Regression/C++Frontend/2003-11-02-WeakLinkage.cpp.tr
@@ -1,5 +1,5 @@
// RUN: %llvmgcc -xc++ -S -o - %s | not grep weak
-// XFAIL: *
+// XFAIL: llvmgcc4
template<class T>
void thefunc();
diff --git a/llvm/test/Regression/CFrontend/2006-09-28-SimpleAsm.c b/llvm/test/Regression/CFrontend/2006-09-28-SimpleAsm.c
index ca8dbac..7b16712 100644
--- a/llvm/test/Regression/CFrontend/2006-09-28-SimpleAsm.c
+++ b/llvm/test/Regression/CFrontend/2006-09-28-SimpleAsm.c
@@ -1,6 +1,7 @@
// RUN: %llvmgcc %s -S -o /dev/null &&
// RUN: %llvmgcc %s -S -o - | grep 'ext: xorl %eax, eax; movl' &&
// RUN: %llvmgcc %s -S -o - | grep 'nonext: xorl %eax, %eax; mov'
+// XFAIL: llvmgcc3
// PR924
void bar() {