Reapply r176133 with testcase fixes.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@176145 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CodeGenObjC/gnu-exceptions.m b/test/CodeGenObjC/gnu-exceptions.m
index 3df92ef..4a046e2 100644
--- a/test/CodeGenObjC/gnu-exceptions.m
+++ b/test/CodeGenObjC/gnu-exceptions.m
@@ -6,7 +6,7 @@
 
 @class C;
 
-// CHECK: define void @test0() #0 {
+// CHECK: define void @test0() {
 void test0() {
   @try {
     // CHECK: invoke void @opaque()
@@ -30,6 +30,3 @@
 
   log(1);
 }
-
-// CHECK: attributes #0 = { "target-features"={{.*}} }
-// CHECK: attributes #1 = { nounwind readnone }