12 files changed, 25 insertions, 25 deletions
diff --git a/test/CodeGen/ARM/dg.exp b/test/CodeGen/ARM/dg.exp
index ba4ade5c10..0a367252d7 100644
--- a/test/CodeGen/ARM/dg.exp
+++ b/test/CodeGen/ARM/dg.exp
@@ -1,5 +1,5 @@
 load_lib llvm.exp
 
 if { [llvm_supports_target ARM] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
+  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp,tr}]]
 }
diff --git a/test/CodeGen/CBackend/dg.exp b/test/CodeGen/CBackend/dg.exp
index 304b90f4ff..21c46a537a 100644
--- a/test/CodeGen/CBackend/dg.exp
+++ b/test/CodeGen/CBackend/dg.exp
@@ -1,5 +1,5 @@
 load_lib llvm.exp
 
 if { [llvm_supports_target CBackend] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
+  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp,tr}]]
 }
diff --git a/test/CodeGen/CellSPU/dg.exp b/test/CodeGen/CellSPU/dg.exp
index 1c0f7f8a4f..d38320cfc5 100644
--- a/test/CodeGen/CellSPU/dg.exp
+++ b/test/CodeGen/CellSPU/dg.exp
@@ -1,5 +1,5 @@
 load_lib llvm.exp
 
 if { [llvm_supports_target CellSPU] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
+  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp,tr}]]
 }
diff --git a/test/CodeGen/Generic/GC/dg.exp b/test/CodeGen/Generic/GC/dg.exp
index 879685ca87..78dd6f10b4 100644
--- a/test/CodeGen/Generic/GC/dg.exp
+++ b/test/CodeGen/Generic/GC/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm.exp
 
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp,tr}]]
diff --git a/test/CodeGen/Generic/dg.exp b/test/CodeGen/Generic/dg.exp
index 879685ca87..78dd6f10b4 100644
--- a/test/CodeGen/Generic/dg.exp
+++ b/test/CodeGen/Generic/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm.exp
 
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp,tr}]]
diff --git a/test/CodeGen/IA64/dg.exp b/test/CodeGen/IA64/dg.exp
index 32e44b4aec..e011a50c00 100644
--- a/test/CodeGen/IA64/dg.exp
+++ b/test/CodeGen/IA64/dg.exp
@@ -1,5 +1,5 @@
 load_lib llvm.exp
 
 if { [llvm_supports_target IA64] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
+  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp,tr}]]
 }
diff --git a/test/CodeGen/PowerPC/dg.exp b/test/CodeGen/PowerPC/dg.exp
index 22b60bc721..f34e894918 100644
--- a/test/CodeGen/PowerPC/dg.exp
+++ b/test/CodeGen/PowerPC/dg.exp
@@ -1,5 +1,5 @@
 load_lib llvm.exp
 
 if { [llvm_supports_target PowerPC] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
+  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp,tr}]]
 }
diff --git a/test/CodeGen/SPARC/dg.exp b/test/CodeGen/SPARC/dg.exp
index a1ce6a1061..204a656d7d 100644
--- a/test/CodeGen/SPARC/dg.exp
+++ b/test/CodeGen/SPARC/dg.exp
@@ -1,5 +1,5 @@
 load_lib llvm.exp
 
 if { [llvm_supports_target Sparc] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
+  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp,tr}]]
 }
diff --git a/test/CodeGen/X86/dg.exp b/test/CodeGen/X86/dg.exp
index 161fccceb0..64b354b8fa 100644
--- a/test/CodeGen/X86/dg.exp
+++ b/test/CodeGen/X86/dg.exp
@@ -1,5 +1,5 @@
 load_lib llvm.exp
 
 if { [llvm_supports_target X86] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
+  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp,tr}]]
 }
diff --git a/test/CodeGen/X86/isnan.ll b/test/CodeGen/X86/isnan.ll
index 18fe29a883..65916ff577 100644
--- a/test/CodeGen/X86/isnan.ll
+++ b/test/CodeGen/X86/isnan.ll
@@ -1,11 +1,9 @@
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah | not grep pxor
+; RUN: llvm-as < %s | llc -march=x86 | not grep call
 
-; This should not need to materialize 0.0 to evaluate the condition.
+declare i1 @llvm.isunordered.f64(double)
 
-define i32 @test(double %X) nounwind  {
-entry:
-	%tmp6 = fcmp uno double %X, 0.000000e+00		; <i1> [#uses=1]
-	%tmp67 = zext i1 %tmp6 to i32		; <i32> [#uses=1]
-	ret i32 %tmp67
+define i1 @test_isnan(double %X) {
+        %R = fcmp uno double %X, %X             ; <i1> [#uses=1]
+        ret i1 %R
 }
 
diff --git a/test/CodeGen/X86/isnan.llx b/test/CodeGen/X86/isnan.llx
deleted file mode 100644
index 65916ff577..0000000000
--- a/test/CodeGen/X86/isnan.llx
+++ /dev/null
@@ -1,9 +0,0 @@
-; RUN: llvm-as < %s | llc -march=x86 | not grep call
-
-declare i1 @llvm.isunordered.f64(double)
-
-define i1 @test_isnan(double %X) {
-        %R = fcmp uno double %X, %X             ; <i1> [#uses=1]
-        ret i1 %R
-}
-
diff --git a/test/CodeGen/X86/isnan2.ll b/test/CodeGen/X86/isnan2.ll
new file mode 100644
index 0000000000..18fe29a883
--- /dev/null
+++ b/test/CodeGen/X86/isnan2.ll
@@ -0,0 +1,11 @@
+; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah | not grep pxor
+
+; This should not need to materialize 0.0 to evaluate the condition.
+
+define i32 @test(double %X) nounwind  {
+entry:
+	%tmp6 = fcmp uno double %X, 0.000000e+00		; <i1> [#uses=1]
+	%tmp67 = zext i1 %tmp6 to i32		; <i32> [#uses=1]
+	ret i32 %tmp67
+}
+