diff --git a/clang/test/CodeGen/arm-arguments.c b/clang/test/CodeGen/arm-arguments.c
index 72fd7c3f8b71..73bc03dac7f5 100644
--- a/clang/test/CodeGen/arm-arguments.c
+++ b/clang/test/CodeGen/arm-arguments.c
@@ -1,131 +1,131 @@
 // RUN: %clang_cc1 -triple armv7-apple-darwin9 -target-abi apcs-gnu -emit-llvm -w -o - %s | FileCheck -check-prefix=APCS-GNU %s
 // RUN: %clang_cc1 -triple armv7-apple-darwin9 -target-abi aapcs -emit-llvm -w -o - %s | FileCheck -check-prefix=AAPCS %s
 
-// APCS-GNU: define arm_apcscc signext i8 @f0()
+// APCS-GNU: define signext i8 @f0()
 // AAPCS: define arm_aapcscc signext i8 @f0()
 char f0(void) {
   return 0;
 }
 
-// APCS-GNU: define arm_apcscc i8 @f1()
+// APCS-GNU: define i8 @f1()
 // AAPCS: define arm_aapcscc i8 @f1()
 struct s1 { char f0; };
 struct s1 f1(void) {}
 
-// APCS-GNU: define arm_apcscc i16 @f2()
+// APCS-GNU: define i16 @f2()
 // AAPCS: define arm_aapcscc i16 @f2()
 struct s2 { short f0; };
 struct s2 f2(void) {}
 
-// APCS-GNU: define arm_apcscc i32 @f3()
+// APCS-GNU: define i32 @f3()
 // AAPCS: define arm_aapcscc i32 @f3()
 struct s3 { int f0; };
 struct s3 f3(void) {}
 
-// APCS-GNU: define arm_apcscc i32 @f4()
+// APCS-GNU: define i32 @f4()
 // AAPCS: define arm_aapcscc i32 @f4()
 struct s4 { struct s4_0 { int f0; } f0; };
 struct s4 f4(void) {}
 
-// APCS-GNU: define arm_apcscc void @f5(
+// APCS-GNU: define void @f5(
 // APCS-GNU: struct.s5* sret
 // AAPCS: define arm_aapcscc i32 @f5()
 struct s5 { struct { } f0; int f1; };
 struct s5 f5(void) {}
 
-// APCS-GNU: define arm_apcscc void @f6(
+// APCS-GNU: define void @f6(
 // APCS-GNU: struct.s6* sret
 // AAPCS: define arm_aapcscc i32 @f6()
 struct s6 { int f0[1]; };
 struct s6 f6(void) {}
 
-// APCS-GNU: define arm_apcscc void @f7()
+// APCS-GNU: define void @f7()
 // AAPCS: define arm_aapcscc void @f7()
 struct s7 { struct { int : 0; } f0; };
 struct s7 f7(void) {}
 
-// APCS-GNU: define arm_apcscc void @f8(
+// APCS-GNU: define void @f8(
 // APCS-GNU: struct.s8* sret
 // AAPCS: define arm_aapcscc void @f8()
 struct s8 { struct { int : 0; } f0[1]; };
 struct s8 f8(void) {}
 
-// APCS-GNU: define arm_apcscc i32 @f9()
+// APCS-GNU: define i32 @f9()
 // AAPCS: define arm_aapcscc i32 @f9()
 struct s9 { int f0; int : 0; };
 struct s9 f9(void) {}
 
-// APCS-GNU: define arm_apcscc i32 @f10()
+// APCS-GNU: define i32 @f10()
 // AAPCS: define arm_aapcscc i32 @f10()
 struct s10 { int f0; int : 0; int : 0; };
 struct s10 f10(void) {}
 
-// APCS-GNU: define arm_apcscc void @f11(
+// APCS-GNU: define void @f11(
 // APCS-GNU: struct.s10* sret
 // AAPCS: define arm_aapcscc i32 @f11()
 struct s11 { int : 0; int f0; };
 struct s11 f11(void) {}
 
-// APCS-GNU: define arm_apcscc i32 @f12()
+// APCS-GNU: define i32 @f12()
 // AAPCS: define arm_aapcscc i32 @f12()
 union u12 { char f0; short f1; int f2; };
 union u12 f12(void) {}
 
-// APCS-GNU: define arm_apcscc void @f13(
+// APCS-GNU: define void @f13(
 // APCS-GNU: struct.s13* sret
 
 // FIXME: This should return a float.
-// AAPCS-FIXME: define arm_aapcscc float @f13()
+// AAPCS-FIXME: darm_aapcscc efine float @f13()
 struct s13 { float f0; };
 struct s13 f13(void) {}
 
-// APCS-GNU: define arm_apcscc void @f14(
+// APCS-GNU: define void @f14(
 // APCS-GNU: struct.s13* sret
 // AAPCS: define arm_aapcscc i32 @f14()
 union u14 { float f0; };
 union u14 f14(void) {}
 
-// APCS-GNU: define arm_apcscc void @f15()
+// APCS-GNU: define void @f15()
 // AAPCS: define arm_aapcscc void @f15()
 void f15(struct s7 a0) {}
 
-// APCS-GNU: define arm_apcscc void @f16()
+// APCS-GNU: define void @f16()
 // AAPCS: define arm_aapcscc void @f16()
 void f16(struct s8 a0) {}
 
-// APCS-GNU: define arm_apcscc i32 @f17()
+// APCS-GNU: define i32 @f17()
 // AAPCS: define arm_aapcscc i32 @f17()
 struct s17 { short f0 : 13; char f1 : 4; };
 struct s17 f17(void) {}
 
-// APCS-GNU: define arm_apcscc i32 @f18()
+// APCS-GNU: define i32 @f18()
 // AAPCS: define arm_aapcscc i32 @f18()
 struct s18 { short f0; char f1 : 4; };
 struct s18 f18(void) {}
 
-// APCS-GNU: define arm_apcscc void @f19(
+// APCS-GNU: define void @f19(
 // APCS-GNU: struct.s19* sret
 // AAPCS: define arm_aapcscc i32 @f19()
 struct s19 { int f0; struct s8 f1; };
 struct s19 f19(void) {}
 
-// APCS-GNU: define arm_apcscc void @f20(
+// APCS-GNU: define void @f20(
 // APCS-GNU: struct.s20* sret
 // AAPCS: define arm_aapcscc i32 @f20()
 struct s20 { struct s8 f1; int f0; };
 struct s20 f20(void) {}
 
-// APCS-GNU: define arm_apcscc i8 @f21()
+// APCS-GNU: define i8 @f21()
 // AAPCS: define arm_aapcscc i32 @f21()
 struct s21 { struct {} f1; int f0 : 4; };
 struct s21 f21(void) {}
 
-// APCS-GNU: define arm_apcscc i16 @f22()
-// APCS-GNU: define arm_apcscc i32 @f23()
-// APCS-GNU: define arm_apcscc i64 @f24()
-// APCS-GNU: define arm_apcscc i128 @f25()
-// APCS-GNU: define arm_apcscc i64 @f26()
-// APCS-GNU: define arm_apcscc i128 @f27()
+// APCS-GNU: define i16 @f22()
+// APCS-GNU: define i32 @f23()
+// APCS-GNU: define i64 @f24()
+// APCS-GNU: define i128 @f25()
+// APCS-GNU: define i64 @f26()
+// APCS-GNU: define i128 @f27()
 // AAPCS: define arm_aapcscc i16 @f22()
 // AAPCS: define arm_aapcscc i32 @f23()
 // AAPCS: define arm_aapcscc void @f24({{.*}} sret
@@ -139,17 +139,17 @@ _Complex long long  f25(void) {}
 _Complex float      f26(void) {}
 _Complex double     f27(void) {}
 
-// APCS-GNU: define arm_apcscc i16 @f28()
+// APCS-GNU: define i16 @f28()
 // AAPCS: define arm_aapcscc i16 @f28()
 struct s28 { _Complex char f0; };
 struct s28 f28() {}
 
-// APCS-GNU: define arm_apcscc i32 @f29()
+// APCS-GNU: define i32 @f29()
 // AAPCS: define arm_aapcscc i32 @f29()
 struct s29 { _Complex short f0; };
 struct s29 f29() {}
 
-// APCS-GNU: define arm_apcscc void @f30({{.*}} sret
+// APCS-GNU: define void @f30({{.*}} sret
 // AAPCS: define arm_aapcscc void @f30({{.*}} sret
 struct s30 { _Complex int f0; };
 struct s30 f30() {}
diff --git a/clang/test/CodeGen/builtin-attributes.c b/clang/test/CodeGen/builtin-attributes.c
index 944aac3f521f..6f13239bf655 100644
--- a/clang/test/CodeGen/builtin-attributes.c
+++ b/clang/test/CodeGen/builtin-attributes.c
@@ -1,11 +1,11 @@
 // RUN: %clang_cc1 -triple arm-unknown-unknown -emit-llvm -o - %s | FileCheck %s
 
-// CHECK: declare arm_aapcscc i32 @printf(i8*, ...)
+// CHECK: declare i32 @printf(i8*, ...)
 void f0() {
   printf("a\n");
 }
 
-// CHECK: call arm_aapcscc void @exit
+// CHECK: call void @exit
 // CHECK: unreachable
 void f1() {
   exit(1);
diff --git a/clang/test/CodeGenCXX/arm-cc.cpp b/clang/test/CodeGenCXX/arm-cc.cpp
index d9a796ea863d..a81c44d08999 100644
--- a/clang/test/CodeGenCXX/arm-cc.cpp
+++ b/clang/test/CodeGenCXX/arm-cc.cpp
@@ -16,5 +16,5 @@ void baz() {
   zed(a);
 }
 
-// CHECK: declare arm_aapcscc void @_Z3fooPv(%class.SMLoc* sret, i8*)
-// CHECK: declare arm_aapcscc void @_Z3zed5SMLoc(%class.SMLoc*)
+// CHECK: declare void @_Z3fooPv(%class.SMLoc* sret, i8*)
+// CHECK: declare void @_Z3zed5SMLoc(%class.SMLoc*)
diff --git a/clang/test/CodeGenCXX/arm.cpp b/clang/test/CodeGenCXX/arm.cpp
index 5cca7885b7d7..1d4085ca231d 100644
--- a/clang/test/CodeGenCXX/arm.cpp
+++ b/clang/test/CodeGenCXX/arm.cpp
@@ -16,5 +16,4 @@ public:
 bar baz;
 
 // CHECK: @_GLOBAL__D_a()
-// CHECK: call arm_apcscc  void @_ZN3barD1Ev(%class.bar* @baz)
-
+// CHECK: call void @_ZN3barD1Ev(%class.bar* @baz)
diff --git a/clang/test/CodeGenObjC/metadata_symbols.m b/clang/test/CodeGenObjC/metadata_symbols.m
index 921168c1616b..59441e523fd6 100644
--- a/clang/test/CodeGenObjC/metadata_symbols.m
+++ b/clang/test/CodeGenObjC/metadata_symbols.m
@@ -33,8 +33,8 @@
 // CHECK-ARMV6: @"OBJC_EHTYPE_$_EH2" = external global
 // CHECK-ARMV6: @"OBJC_EHTYPE_$_EH3" = global {{.*}}, section "__DATA,__objc_const", align 4
 // CHECK-ARMV6: @"\01L_OBJC_LABEL_CLASS_$" = internal global {{.*}}, section "__DATA, __objc_classlist, regular, no_dead_strip", align 4
-// CHECK-ARMV6: define internal arm_apcscc void @"\01-[A im0]"
-// CHECK-ARMV6: define internal arm_apcscc void @"\01-[A(Cat) im1]"
+// CHECK-ARMV6: define internal void @"\01-[A im0]"
+// CHECK-ARMV6: define internal void @"\01-[A(Cat) im1]"
 
 @interface A
 @end