13 files changed, 24 insertions, 13 deletions
diff --git a/test/FrontendObjC/2007-04-03-ObjcEH.m b/test/FrontendObjC/2007-04-03-ObjcEH.m
index 353323d..ae744c7 100644
--- a/test/FrontendObjC/2007-04-03-ObjcEH.m
+++ b/test/FrontendObjC/2007-04-03-ObjcEH.m
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -c %s -o /dev/null
+// RUN: %llvmgcc -S %s -o /dev/null
 
 @interface B 
 -(int)bar;
diff --git a/test/FrontendObjC/2007-05-02-Strong.m b/test/FrontendObjC/2007-05-02-Strong.m
index 3778fd2..34b41ad 100644
--- a/test/FrontendObjC/2007-05-02-Strong.m
+++ b/test/FrontendObjC/2007-05-02-Strong.m
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -c %s -fobjc-gc -o /dev/null
+// RUN: %llvmgcc -S %s -fobjc-gc -o /dev/null
 typedef int NSInteger;
 typedef struct _NSRect {
   int origin;
diff --git a/test/FrontendObjC/2007-09-25-EH.m b/test/FrontendObjC/2007-09-25-EH.m
index 5fa9cbb..d625584 100644
--- a/test/FrontendObjC/2007-09-25-EH.m
+++ b/test/FrontendObjC/2007-09-25-EH.m
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -c -w -m64 -mmacosx-version-min=10.5 %s -o /dev/null
+// RUN: %llvmgcc -S -w -m64 -mmacosx-version-min=10.5 %s -o /dev/null
 // XFAIL: *
 // XTARGET: darwin
 @class NSDictionary, DSoBuffer, DSoDirectory, NSMutableArray;
diff --git a/test/FrontendObjC/2007-10-18-ProDescriptor.m b/test/FrontendObjC/2007-10-18-ProDescriptor.m
index e87a43f..220fdd2 100644
--- a/test/FrontendObjC/2007-10-18-ProDescriptor.m
+++ b/test/FrontendObjC/2007-10-18-ProDescriptor.m
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -x objective-c -c %s -o /dev/null
+// RUN: %llvmgcc -x objective-c -S %s -o /dev/null
 @protocol O
 @end
 @interface O < O > {
diff --git a/test/FrontendObjC/2007-10-23-GC-WriteBarrier.m b/test/FrontendObjC/2007-10-23-GC-WriteBarrier.m
index 866c330..4bbe440 100644
--- a/test/FrontendObjC/2007-10-23-GC-WriteBarrier.m
+++ b/test/FrontendObjC/2007-10-23-GC-WriteBarrier.m
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -x objective-c -c %s -o /dev/null -fobjc-gc
+// RUN: %llvmgcc -x objective-c -S %s -o /dev/null -fobjc-gc
 // rdar://5541393
 
 typedef unsigned int NSUInteger;
diff --git a/test/FrontendObjC/2008-10-3-EhValue.m b/test/FrontendObjC/2008-10-3-EhValue.m
index a4c0cae..c7aabe2 100644
--- a/test/FrontendObjC/2008-10-3-EhValue.m
+++ b/test/FrontendObjC/2008-10-3-EhValue.m
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -w -x objective-c -c %s -o /dev/null
+// RUN: %llvmgcc -w -x objective-c -S %s -o /dev/null
 
 @interface Object {
 @public
diff --git a/test/FrontendObjC/2008-11-12-Metadata.m b/test/FrontendObjC/2008-11-12-Metadata.m
index 7e9f028..be8ee41 100644
--- a/test/FrontendObjC/2008-11-12-Metadata.m
+++ b/test/FrontendObjC/2008-11-12-Metadata.m
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -x objective-c -m64 -c %s -o /dev/null
+// RUN: %llvmgcc -x objective-c -m64 -S %s -o /dev/null
 
 @interface A
 @end
diff --git a/test/FrontendObjC/2008-11-25-Blocks.m b/test/FrontendObjC/2008-11-25-Blocks.m
index 258d70a..c5cd3d2 100644
--- a/test/FrontendObjC/2008-11-25-Blocks.m
+++ b/test/FrontendObjC/2008-11-25-Blocks.m
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -c %s -o /dev/null
+// RUN: %llvmgcc -S %s -o /dev/null
 // rdar://6394879
 
 @interface bork
diff --git a/test/FrontendObjC/2009-02-05-VolatileProp.m b/test/FrontendObjC/2009-02-05-VolatileProp.m
index 461f92b..1deef73 100644
--- a/test/FrontendObjC/2009-02-05-VolatileProp.m
+++ b/test/FrontendObjC/2009-02-05-VolatileProp.m
@@ -1,4 +1,4 @@
-/* RUN: %llvmgcc -w -x objective-c -c %s -o /dev/null -pedantic-errors
+/* RUN: %llvmgcc -w -x objective-c -S %s -o /dev/null -pedantic-errors
    rdar://6551276 */
 
 void foo(const unsigned short *);
diff --git a/test/FrontendObjC/2009-04-14-AsmSection.m b/test/FrontendObjC/2009-04-14-AsmSection.m
index de2cef0..aefe088 100644
--- a/test/FrontendObjC/2009-04-14-AsmSection.m
+++ b/test/FrontendObjC/2009-04-14-AsmSection.m
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -S %s -fobjc-abi-version=2 -emit-llvm -o %t
+// RUN: %llvmgcc -S %s -fobjc-abi-version=2 -o %t
 // RUN: grep {OBJC_CLASS_\\\$_A.*section.*__DATA, __objc_data.*align} %t
 // XTARGET: darwin
 
diff --git a/test/FrontendObjC/2009-08-05-utf16.m b/test/FrontendObjC/2009-08-05-utf16.m
index 2964ecf..df3745c 100644
--- a/test/FrontendObjC/2009-08-05-utf16.m
+++ b/test/FrontendObjC/2009-08-05-utf16.m
@@ -1,4 +1,4 @@
-/* RUN: %llvmgcc -w -x objective-c -S %s -o - | grep {__utf16_string_1} | grep {internal constant} | grep {12 x i8}
+/* RUN: %llvmgcc -w -x objective-c -S %s -o - | grep {__utf16_string_1} | grep {internal unnamed_addr constant} | grep {12 x i8}
    rdar://7095855 rdar://7115749 */
 
 void *P = @"iPod™";
diff --git a/test/FrontendObjC/2010-02-11-fwritable-stringsBug.m b/test/FrontendObjC/2010-02-11-fwritable-stringsBug.m
index 13e1631..bb00f6a 100644
--- a/test/FrontendObjC/2010-02-11-fwritable-stringsBug.m
+++ b/test/FrontendObjC/2010-02-11-fwritable-stringsBug.m
@@ -1,6 +1,6 @@
 // RUN: %llvmgcc -x objective-c -fwritable-strings -S %s -o - | FileCheck %s
-// CHECK: @.str = private constant
-// CHECK: @.str1 = internal global
+// CHECK: @.str = private unnamed_addr constant
+// CHECK: @.str1 = internal unnamed_addr global
 
 // rdar://7634471
 
diff --git a/test/FrontendObjC/2011-03-02-ConstCFStringLiteralAlign.m b/test/FrontendObjC/2011-03-02-ConstCFStringLiteralAlign.m
new file mode 100644
index 0000000..a5bd2b7
--- /dev/null
+++ b/test/FrontendObjC/2011-03-02-ConstCFStringLiteralAlign.m
@@ -0,0 +1,11 @@
+// RUN: %llvmgcc -S -w -m64 -mmacosx-version-min=10.5 %s -o - | \
+// RUN:     llc --disable-fp-elim -o - | FileCheck %s
+// XFAIL: *
+// XTARGET: darwin
+
+@interface Foo
+@end
+Foo *FooName = @"FooBar";
+
+// CHECK:      .section __TEXT,__cstring,cstring_literals
+// CHECK-NEXT: L_.str: