Fix testcases to not rely upon target-* attributes.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@176135 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CodeGen/unwind-attr.c b/test/CodeGen/unwind-attr.c
index 3a11ce6..2ffb5a8 100644
--- a/test/CodeGen/unwind-attr.c
+++ b/test/CodeGen/unwind-attr.c
@@ -3,28 +3,27 @@
 
 int opaque();
 
-// CHECK:       define [[INT:i.*]] @test0() #0 {
-// CHECK-NOEXC: define [[INT:i.*]] @test0() #0 {
+// CHECK:       define [[INT:i.*]] @test0() [[NONE:#[0-9]+]] {
+// CHECK-NOEXC: define [[INT:i.*]] @test0() [[NUW:#[0-9]+]] {
 int test0(void) {
   return opaque();
 }
 
 // <rdar://problem/8087431>: locally infer nounwind at -O0
-// CHECK:       define [[INT:i.*]] @test1() #1 {
-// CHECK-NOEXC: define [[INT:i.*]] @test1() #0 {
+// CHECK:       define [[INT:i.*]] @test1() [[NUW:#[0-9]+]] {
+// CHECK-NOEXC: define [[INT:i.*]] @test1() [[NUW]] {
 int test1(void) {
   return 0;
 }
 
 // <rdar://problem/8283071>: not for weak functions
-// CHECK:       define weak [[INT:i.*]] @test2() #0 {
-// CHECK-NOEXC: define weak [[INT:i.*]] @test2() #0 {
+// CHECK:       define weak [[INT:i.*]] @test2() [[NONE]] {
+// CHECK-NOEXC: define weak [[INT:i.*]] @test2() [[NUW]] {
 __attribute__((weak)) int test2(void) {
   return 0;
 }
 
-// CHECK: attributes #0 = { "target-features"={{.*}} }
-// CHECK: attributes #1 = { nounwind "target-features"={{.*}} }
+// CHECK: attributes [[NONE]] = { {{.*}} }
+// CHECK: attributes [[NUW]] = { nounwind{{.*}} }
 
-// CHECK-NOEXC: attributes #0 = { nounwind "target-features"={{.*}} }
-// CHECK-NOEXC: attributes #1 = { "target-features"={{.*}} }
+// CHECK-NOEXC: attributes [[NUW]] = { nounwind{{.*}} }