17 files changed, 38 insertions, 21 deletions

diff --git a/test/FrontendC/2005-06-15-ExpandGotoInternalProblem.c b/test/FrontendC/2005-06-15-ExpandGotoInternalProblem.c
index d7d03badfddf2..0f076c9bf79f1 100644
--- a/test/FrontendC/2005-06-15-ExpandGotoInternalProblem.c
+++ b/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/test/FrontendC/2005-09-24-AsmUserPrefix.c b/test/FrontendC/2005-09-24-AsmUserPrefix.c
index 9b9b153e27615..952c7b3c35da6 100644
--- a/test/FrontendC/2005-09-24-AsmUserPrefix.c
+++ b/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/test/FrontendC/2006-01-13-StackSave.c b/test/FrontendC/2006-01-13-StackSave.c
index dfe00fbde3301..ae8d908210165 100644
--- a/test/FrontendC/2006-01-13-StackSave.c
+++ b/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/test/FrontendC/2006-01-23-FileScopeAsm.c b/test/FrontendC/2006-01-23-FileScopeAsm.c
index fb55a41e87c5c..80e719556237f 100644
--- a/test/FrontendC/2006-01-23-FileScopeAsm.c
+++ b/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/test/FrontendC/2006-03-03-MissingInitializer.c b/test/FrontendC/2006-03-03-MissingInitializer.c
index 0d09d297d191e..19d4bc7fe7a84 100644
--- a/test/FrontendC/2006-03-03-MissingInitializer.c
+++ b/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/test/FrontendC/2007-01-24-InlineAsmCModifier.c b/test/FrontendC/2007-01-24-InlineAsmCModifier.c
index 5735cce11e334..c601ccf2eb19a 100644
--- a/test/FrontendC/2007-01-24-InlineAsmCModifier.c
+++ b/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/test/FrontendC/2007-04-11-InlineAsmStruct.c b/test/FrontendC/2007-04-11-InlineAsmStruct.c
index 158a16e53665a..49741c68ee6e7 100644
--- a/test/FrontendC/2007-04-11-InlineAsmStruct.c
+++ b/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/test/FrontendC/2007-04-11-InlineAsmUnion.c b/test/FrontendC/2007-04-11-InlineAsmUnion.c
index 0435d6498ee5e..83fe7db771f5f 100644
--- a/test/FrontendC/2007-04-11-InlineAsmUnion.c
+++ b/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/test/FrontendC/2007-04-11-InlineStorageClassC89.c b/test/FrontendC/2007-04-11-InlineStorageClassC89.c
index 4631191b9496d..ab1f556b84fd5 100644
--- a/test/FrontendC/2007-04-11-InlineStorageClassC89.c
+++ b/test/FrontendC/2007-04-11-InlineStorageClassC89.c
@@ -11,8 +11,9 @@
 // RUN:   grep -v linkonce | count 1
 // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \
 // RUN:   grep xstatnoWeak | grep internal | count 1
-// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \
-// RUN:   grep xextnoWeak | grep available_externally | count 1
+// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep declare | \
+// RUN:   grep xextnoWeak | grep -v internal | grep -v weak | \
+// RUN:   grep -v linkonce | count 1
 inline int xglobWeak(int) __attribute__((weak));
 inline int xglobWeak (int i) {
   return i*2;
diff --git a/test/FrontendC/2007-04-11-InlineStorageClassC99.c b/test/FrontendC/2007-04-11-InlineStorageClassC99.c
index 3607999eb17d4..f6193aa0ff6a1 100644
--- a/test/FrontendC/2007-04-11-InlineStorageClassC99.c
+++ b/test/FrontendC/2007-04-11-InlineStorageClassC99.c
@@ -1,13 +1,14 @@
-// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
-// RUN:   grep xglobWeak | grep weak | count 1
+// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep declare | \
+// RUN:   grep xglobWeak | grep extern_weak | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
 // RUN:   grep xextWeak | grep weak | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
 // RUN:   grep xWeaknoinline | grep weak | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
 // RUN:   grep xWeakextnoinline | grep weak | count 1
-// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
-// RUN:   grep xglobnoWeak | grep available_externally | count 1
+// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep declare | \
+// RUN:   grep xglobnoWeak | grep -v internal | grep -v weak | \
+// RUN:   grep -v linkonce | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
 // RUN:   grep xstatnoWeak | grep internal | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
diff --git a/test/FrontendC/2007-08-01-LoadStoreAlign.c b/test/FrontendC/2007-08-01-LoadStoreAlign.c
index ef890bf7cfc99..75a82c14ad0f9 100644
--- a/test/FrontendC/2007-08-01-LoadStoreAlign.c
+++ b/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/test/FrontendC/2007-12-VarArrayDebug.c b/test/FrontendC/2007-12-VarArrayDebug.c
index cd6cfdf4672b9..966789eef30da 100644
--- a/test/FrontendC/2007-12-VarArrayDebug.c
+++ b/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/test/FrontendC/2009-02-17-BitField-dbg.c b/test/FrontendC/2009-02-17-BitField-dbg.c
index 7ab14fd27a688..3effd027a8815 100644
--- a/test/FrontendC/2009-02-17-BitField-dbg.c
+++ b/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/test/FrontendC/2009-12-07-BitFieldAlignment.c b/test/FrontendC/2009-12-07-BitFieldAlignment.c
new file mode 100644
index 0000000000000..a8312a5fd8a9c
--- /dev/null
+++ b/test/FrontendC/2009-12-07-BitFieldAlignment.c
@@ -0,0 +1,15 @@
+// RUN: %llvmgcc -m32 %s -S -o - | FileCheck %s
+// Set alignment on bitfield accesses.
+
+struct S {
+  int a, b;
+  void *c;
+  unsigned d : 8;
+  unsigned e : 8;
+};
+
+void f0(struct S *a) {
+// CHECK: %3 = load i32* %2, align 4
+// CHECK: store i32 %4, i32* %2, align 4
+  a->e = 0;
+}
diff --git a/test/FrontendC/BasicInstrs.c b/test/FrontendC/BasicInstrs.c
index 812b49db28db0..ceed17c2ba9ad 100644
--- a/test/FrontendC/BasicInstrs.c
+++ b/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/test/FrontendC/extern-weak.c b/test/FrontendC/extern-weak.c
index f31a6ad0dc7f9..4729b048fbe03 100644
--- a/test/FrontendC/extern-weak.c
+++ b/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/test/FrontendC/unaligned-memcpy.c b/test/FrontendC/unaligned-memcpy.c
index e5d810f3ace8c..9e6ce07e367e1 100644
--- a/test/FrontendC/unaligned-memcpy.c
+++ b/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};