diff --git a/llvm/test/FrontendC++/2006-11-06-StackTrace.cpp b/llvm/test/FrontendC++/2006-11-06-StackTrace.cpp
index 24eeda8a27b2..3732cb936901 100644
--- a/llvm/test/FrontendC++/2006-11-06-StackTrace.cpp
+++ b/llvm/test/FrontendC++/2006-11-06-StackTrace.cpp
@@ -1,6 +1,6 @@
 // This is a regression test on debug info to make sure that we can get a
 // meaningful stack trace from a C++ program.
-// RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | \
+// RUN: %llvmgcc -S -O0 -g %s -o - | \
 // RUN:    llc --disable-fp-elim -o %t.s -O0 -relocation-model=pic
 // RUN: %compile_c %t.s -o %t.o
 // RUN: %link %t.o -o %t.exe
diff --git a/llvm/test/FrontendC++/2006-11-30-NoCompileUnit.cpp b/llvm/test/FrontendC++/2006-11-30-NoCompileUnit.cpp
index cd8b988a9852..242a37e41336 100644
--- a/llvm/test/FrontendC++/2006-11-30-NoCompileUnit.cpp
+++ b/llvm/test/FrontendC++/2006-11-30-NoCompileUnit.cpp
@@ -1,6 +1,6 @@
 // This is a regression test on debug info to make sure we don't hit a compile 
 // unit size issue with gdb.
-// RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | \
+// RUN: %llvmgcc -S -O0 -g %s -o - | \
 // RUN:   llc --disable-fp-elim -o NoCompileUnit.s
 // RUN: %compile_c NoCompileUnit.s -o NoCompileUnit.o
 // RUN: %link NoCompileUnit.o -o NoCompileUnit.exe
diff --git a/llvm/test/FrontendC++/2006-11-30-Pubnames.cpp b/llvm/test/FrontendC++/2006-11-30-Pubnames.cpp
index 64214a8d0094..3a08b3c3345b 100644
--- a/llvm/test/FrontendC++/2006-11-30-Pubnames.cpp
+++ b/llvm/test/FrontendC++/2006-11-30-Pubnames.cpp
@@ -1,6 +1,6 @@
 // This is a regression test on debug info to make sure that we can access 
 // qualified global names.
-// RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | \
+// RUN: %llvmgcc -S -O0 -g %s -o - | \
 // RUN:   llc --disable-fp-elim -o %t.s -O0
 // RUN: %compile_c %t.s -o %t.o
 // RUN: %link %t.o -o %t.exe
diff --git a/llvm/test/FrontendC++/2009-07-15-LineNumbers.cpp b/llvm/test/FrontendC++/2009-07-15-LineNumbers.cpp
index d603aa738f69..5b448eae14bb 100644
--- a/llvm/test/FrontendC++/2009-07-15-LineNumbers.cpp
+++ b/llvm/test/FrontendC++/2009-07-15-LineNumbers.cpp
@@ -1,6 +1,6 @@
 // This is a regression test on debug info to make sure that we can
 // print line numbers in asm.
-// RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | \
+// RUN: %llvmgcc -S -O0 -g %s -o - | \
 // RUN:    llc --disable-fp-elim -O0 -relocation-model=pic | grep {SrcLine 25}
 
 #include <stdlib.h>
diff --git a/llvm/test/FrontendC/2005-06-15-ExpandGotoInternalProblem.c b/llvm/test/FrontendC/2005-06-15-ExpandGotoInternalProblem.c
index d7d03badfddf..0f076c9bf79f 100644
--- a/llvm/test/FrontendC/2005-06-15-ExpandGotoInternalProblem.c
+++ b/llvm/test/FrontendC/2005-06-15-ExpandGotoInternalProblem.c
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -std=c99 %s -S -o - | llvm-as | \
+// RUN: %llvmgcc -std=c99 %s -S -o - | \
 // RUN:    opt -std-compile-opts -disable-output
 // PR580
 
diff --git a/llvm/test/FrontendC/2005-09-24-AsmUserPrefix.c b/llvm/test/FrontendC/2005-09-24-AsmUserPrefix.c
index 9b9b153e2761..952c7b3c35da 100644
--- a/llvm/test/FrontendC/2005-09-24-AsmUserPrefix.c
+++ b/llvm/test/FrontendC/2005-09-24-AsmUserPrefix.c
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts | llc | \
+// RUN: %llvmgcc %s -S -o - | opt -std-compile-opts | llc | \
 // RUN:    not grep _foo2
 
 void foo() __asm__("foo2");
diff --git a/llvm/test/FrontendC/2006-01-13-StackSave.c b/llvm/test/FrontendC/2006-01-13-StackSave.c
index dfe00fbde330..ae8d90821016 100644
--- a/llvm/test/FrontendC/2006-01-13-StackSave.c
+++ b/llvm/test/FrontendC/2006-01-13-StackSave.c
@@ -1,5 +1,5 @@
 // PR691
-// RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts | \
+// RUN: %llvmgcc %s -S -o - | opt -std-compile-opts | \
 // RUN:    llvm-dis | grep llvm.stacksave
 
 void test(int N) {
diff --git a/llvm/test/FrontendC/2006-01-23-FileScopeAsm.c b/llvm/test/FrontendC/2006-01-23-FileScopeAsm.c
index fb55a41e87c5..80e719556237 100644
--- a/llvm/test/FrontendC/2006-01-23-FileScopeAsm.c
+++ b/llvm/test/FrontendC/2006-01-23-FileScopeAsm.c
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts | \
+// RUN: %llvmgcc %s -S -o - | opt -std-compile-opts | \
 // RUN:    llvm-dis | grep {foo\[12345\]} | count 5
 
 __asm__ ("foo1");
diff --git a/llvm/test/FrontendC/2006-03-03-MissingInitializer.c b/llvm/test/FrontendC/2006-03-03-MissingInitializer.c
index 0d09d297d191..19d4bc7fe7a8 100644
--- a/llvm/test/FrontendC/2006-03-03-MissingInitializer.c
+++ b/llvm/test/FrontendC/2006-03-03-MissingInitializer.c
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts | \
+// RUN: %llvmgcc %s -S -o - | opt -std-compile-opts | \
 // RUN:    llvm-dis | grep {@nate.*internal global i32 0}
 
 struct X { int *XX; int Y;};
diff --git a/llvm/test/FrontendC/2007-01-24-InlineAsmCModifier.c b/llvm/test/FrontendC/2007-01-24-InlineAsmCModifier.c
index 5735cce11e33..c601ccf2eb19 100644
--- a/llvm/test/FrontendC/2007-01-24-InlineAsmCModifier.c
+++ b/llvm/test/FrontendC/2007-01-24-InlineAsmCModifier.c
@@ -1,6 +1,6 @@
 // Verify that the %c modifier works and strips off any prefixes from 
 // immediates.
-// RUN: %llvmgcc -S %s -o - | llvm-as | llc | grep {pickANumber: 789514}
+// RUN: %llvmgcc -S %s -o - | llc | grep {pickANumber: 789514}
 
 void foo() {
   __asm__         volatile("/* " "pickANumber" ": %c0 */"::"i"(0xC0C0A));
diff --git a/llvm/test/FrontendC/2007-04-11-InlineAsmStruct.c b/llvm/test/FrontendC/2007-04-11-InlineAsmStruct.c
index 158a16e53665..49741c68ee6e 100644
--- a/llvm/test/FrontendC/2007-04-11-InlineAsmStruct.c
+++ b/llvm/test/FrontendC/2007-04-11-InlineAsmStruct.c
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc %s -S -emit-llvm -o - | llvm-as | llc
+// RUN: %llvmgcc %s -S -emit-llvm -o - | llc
 
 struct V { short X, Y; };
 int bar() {
diff --git a/llvm/test/FrontendC/2007-04-11-InlineAsmUnion.c b/llvm/test/FrontendC/2007-04-11-InlineAsmUnion.c
index 0435d6498ee5..83fe7db771f5 100644
--- a/llvm/test/FrontendC/2007-04-11-InlineAsmUnion.c
+++ b/llvm/test/FrontendC/2007-04-11-InlineAsmUnion.c
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc %s -S -emit-llvm -o - | llvm-as | llc
+// RUN: %llvmgcc %s -S -emit-llvm -o - | llc
 
 union U { int x; float p; };
 void foo() {
diff --git a/llvm/test/FrontendC/2007-08-01-LoadStoreAlign.c b/llvm/test/FrontendC/2007-08-01-LoadStoreAlign.c
index ef890bf7cfc9..75a82c14ad0f 100644
--- a/llvm/test/FrontendC/2007-08-01-LoadStoreAlign.c
+++ b/llvm/test/FrontendC/2007-08-01-LoadStoreAlign.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | grep {align 1} | count 2
-// RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | llvm-as | llc
+// RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | llc
 
 struct p {
   char a;
diff --git a/llvm/test/FrontendC/2007-12-VarArrayDebug.c b/llvm/test/FrontendC/2007-12-VarArrayDebug.c
index cd6cfdf4672b..966789eef30d 100644
--- a/llvm/test/FrontendC/2007-12-VarArrayDebug.c
+++ b/llvm/test/FrontendC/2007-12-VarArrayDebug.c
@@ -1,5 +1,5 @@
-// RUN: %llvmgcc -S -g -O %s -o - | llvm-as | llc
-// RUN: %llvmgcc -S -g %s -o - | llvm-as | llc
+// RUN: %llvmgcc -S -g -O %s -o - | llc
+// RUN: %llvmgcc -S -g %s -o - | llc
 
 extern void foo (void);
 
diff --git a/llvm/test/FrontendC/2009-02-17-BitField-dbg.c b/llvm/test/FrontendC/2009-02-17-BitField-dbg.c
index 7ab14fd27a68..3effd027a881 100644
--- a/llvm/test/FrontendC/2009-02-17-BitField-dbg.c
+++ b/llvm/test/FrontendC/2009-02-17-BitField-dbg.c
@@ -1,5 +1,5 @@
 // Check bitfields.
-// RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | \
+// RUN: %llvmgcc -S -O0 -g %s -o - | \
 // RUN: llc --disable-fp-elim -o 2009-02-17-BitField-dbg.s
 // RUN: %compile_c 2009-02-17-BitField-dbg.s -o 2009-02-17-BitField-dbg.o
 // RUN: echo {ptype mystruct} > %t2
diff --git a/llvm/test/FrontendC/BasicInstrs.c b/llvm/test/FrontendC/BasicInstrs.c
index 812b49db28db..ceed17c2ba9a 100644
--- a/llvm/test/FrontendC/BasicInstrs.c
+++ b/llvm/test/FrontendC/BasicInstrs.c
@@ -1,7 +1,7 @@
 // This file can be used to see what a native C compiler is generating for a
 // variety of interesting operations.
 //
-// RUN: %llvmgcc -S %s -o - | llvm-as | llc
+// RUN: %llvmgcc -S %s -o - | llc
 
 unsigned int udiv(unsigned int X, unsigned int Y) {
   return X/Y;
diff --git a/llvm/test/FrontendC/extern-weak.c b/llvm/test/FrontendC/extern-weak.c
index f31a6ad0dc7f..4729b048fbe0 100644
--- a/llvm/test/FrontendC/extern-weak.c
+++ b/llvm/test/FrontendC/extern-weak.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | grep extern_weak
-// RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | llvm-as | llc
+// RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | llc
 
 #if !defined(__linux__) && !defined(__FreeBSD__) && \
     !defined(__OpenBSD__) && !defined(__CYGWIN__) && !defined(__DragonFly__)
diff --git a/llvm/test/FrontendC/unaligned-memcpy.c b/llvm/test/FrontendC/unaligned-memcpy.c
index e5d810f3ace8..9e6ce07e367e 100644
--- a/llvm/test/FrontendC/unaligned-memcpy.c
+++ b/llvm/test/FrontendC/unaligned-memcpy.c
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc %s -S -emit-llvm -o - | llvm-as | llc
+// RUN: %llvmgcc %s -S -emit-llvm -o - | llc
 
 void bork() {
   char Qux[33] = {0};
diff --git a/llvm/test/FrontendObjC/2009-08-17-DebugInfo.m b/llvm/test/FrontendObjC/2009-08-17-DebugInfo.m
index 0bc4e9a6d6c3..2c72e9532ceb 100644
--- a/llvm/test/FrontendObjC/2009-08-17-DebugInfo.m
+++ b/llvm/test/FrontendObjC/2009-08-17-DebugInfo.m
@@ -1,6 +1,6 @@
 // This is a regression test on debug info to make sure that we can set a
 // breakpoint on a objective message.
-// RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | llc -o %t.s -O0
+// RUN: %llvmgcc -S -O0 -g %s -o - | llc -o %t.s -O0
 // RUN: %compile_c %t.s -o %t.o
 // RUN: %link %t.o -o %t.exe -framework Foundation
 // RUN: echo {break randomFunc\n} > %t.in 
diff --git a/llvm/test/FrontendObjC/2009-11-30-Objc-ID.m b/llvm/test/FrontendObjC/2009-11-30-Objc-ID.m
index dadccdc2dffb..787bf72efe3e 100644
--- a/llvm/test/FrontendObjC/2009-11-30-Objc-ID.m
+++ b/llvm/test/FrontendObjC/2009-11-30-Objc-ID.m
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | \
+// RUN: %llvmgcc -S -O0 -g %s -o - | \
 // RUN:     llc --disable-fp-elim -o %t.s -O0 
 // RUN: grep id %t.s | grep DW_AT_name
 @interface A