Revert "CodeGen: ensure that libcalls are always AAPCS CC"

This reverts SVN r280683.  Revert until I figure out why this is breaking lli
tests.

llvm-svn: 280778
diff --git a/llvm/test/CodeGen/ARM/arm32-rounding.ll b/llvm/test/CodeGen/ARM/arm32-rounding.ll
index d1aeb88..f247648 100644
--- a/llvm/test/CodeGen/ARM/arm32-rounding.ll
+++ b/llvm/test/CodeGen/ARM/arm32-rounding.ll
@@ -4,116 +4,115 @@
 
 ; CHECK-LABEL: test1
 ; CHECK: vrintm.f32
-define arm_aapcs_vfpcc float @test1(float %a) {
+define float @test1(float %a) {
 entry:
-  %call = call arm_aapcs_vfpcc float @floorf(float %a) nounwind readnone
+  %call = call float @floorf(float %a) nounwind readnone
   ret float %call
 }
 
 ; CHECK-LABEL: test2
-; SP: bl floor
+; SP: b floor
 ; DP: vrintm.f64
-define arm_aapcs_vfpcc double @test2(double %a) {
+define double @test2(double %a) {
 entry:
-  %call = call arm_aapcscc double @floor(double %a) nounwind readnone
+  %call = call double @floor(double %a) nounwind readnone
   ret double %call
 }
 
 ; CHECK-LABEL: test3
 ; CHECK: vrintp.f32
-define arm_aapcs_vfpcc float @test3(float %a) {
+define float @test3(float %a) {
 entry:
-  %call = call arm_aapcs_vfpcc float @ceilf(float %a) nounwind readnone
+  %call = call float @ceilf(float %a) nounwind readnone
   ret float %call
 }
 
 ; CHECK-LABEL: test4
-; SP: bl ceil
+; SP: b ceil
 ; DP: vrintp.f64
-define arm_aapcs_vfpcc double @test4(double %a) {
+define double @test4(double %a) {
 entry:
-  %call = call arm_aapcscc double @ceil(double %a) nounwind readnone
+  %call = call double @ceil(double %a) nounwind readnone
   ret double %call
 }
 
 ; CHECK-LABEL: test5
 ; CHECK: vrinta.f32
-define arm_aapcs_vfpcc float @test5(float %a) {
+define float @test5(float %a) {
 entry:
-  %call = call arm_aapcs_vfpcc float @roundf(float %a) nounwind readnone
+  %call = call float @roundf(float %a) nounwind readnone
   ret float %call
 }
 
 ; CHECK-LABEL: test6
-; SP: bl round
+; SP: b round
 ; DP: vrinta.f64
-define arm_aapcs_vfpcc double @test6(double %a) {
+define double @test6(double %a) {
 entry:
-  %call = call arm_aapcscc double @round(double %a) nounwind readnone
+  %call = call double @round(double %a) nounwind readnone
   ret double %call
 }
 
 ; CHECK-LABEL: test7
 ; CHECK: vrintz.f32
-define arm_aapcs_vfpcc float @test7(float %a) {
+define float @test7(float %a) {
 entry:
-  %call = call arm_aapcs_vfpcc float @truncf(float %a) nounwind readnone
+  %call = call float @truncf(float %a) nounwind readnone
   ret float %call
 }
 
 ; CHECK-LABEL: test8
-; SP: bl trunc
+; SP: b trunc
 ; DP: vrintz.f64
-define arm_aapcs_vfpcc double @test8(double %a) {
+define double @test8(double %a) {
 entry:
-  %call = call arm_aapcscc double @trunc(double %a) nounwind readnone
+  %call = call double @trunc(double %a) nounwind readnone
   ret double %call
 }
 
 ; CHECK-LABEL: test9
 ; CHECK: vrintr.f32
-define arm_aapcs_vfpcc float @test9(float %a) {
+define float @test9(float %a) {
 entry:
-  %call = call arm_aapcs_vfpcc float @nearbyintf(float %a) nounwind readnone
+  %call = call float @nearbyintf(float %a) nounwind readnone
   ret float %call
 }
 
 ; CHECK-LABEL: test10
-; SP: bl nearbyint
+; SP: b nearbyint
 ; DP: vrintr.f64
-define arm_aapcs_vfpcc double @test10(double %a) {
+define double @test10(double %a) {
 entry:
-  %call = call arm_aapcscc double @nearbyint(double %a) nounwind readnone
+  %call = call double @nearbyint(double %a) nounwind readnone
   ret double %call
 }
 
 ; CHECK-LABEL: test11
 ; CHECK: vrintx.f32
-define arm_aapcs_vfpcc float @test11(float %a) {
+define float @test11(float %a) {
 entry:
-  %call = call arm_aapcs_vfpcc float @rintf(float %a) nounwind readnone
+  %call = call float @rintf(float %a) nounwind readnone
   ret float %call
 }
 
 ; CHECK-LABEL: test12
-; SP: bl rint
+; SP: b rint
 ; DP: vrintx.f64
-define arm_aapcs_vfpcc double @test12(double %a) {
+define double @test12(double %a) {
 entry:
-  %call = call arm_aapcscc double @rint(double %a) nounwind readnone
+  %call = call double @rint(double %a) nounwind readnone
   ret double %call
 }
 
-declare arm_aapcs_vfpcc float @floorf(float) nounwind readnone
-declare arm_aapcscc double @floor(double) nounwind readnone
-declare arm_aapcs_vfpcc float @ceilf(float) nounwind readnone
-declare arm_aapcscc double @ceil(double) nounwind readnone
-declare arm_aapcs_vfpcc float @roundf(float) nounwind readnone
-declare arm_aapcscc double @round(double) nounwind readnone
-declare arm_aapcs_vfpcc float @truncf(float) nounwind readnone
-declare arm_aapcscc double @trunc(double) nounwind readnone
-declare arm_aapcs_vfpcc float @nearbyintf(float) nounwind readnone
-declare arm_aapcscc double @nearbyint(double) nounwind readnone
-declare arm_aapcs_vfpcc float @rintf(float) nounwind readnone
-declare arm_aapcscc double @rint(double) nounwind readnone
-
+declare float @floorf(float) nounwind readnone
+declare double @floor(double) nounwind readnone
+declare float @ceilf(float) nounwind readnone
+declare double @ceil(double) nounwind readnone
+declare float @roundf(float) nounwind readnone
+declare double @round(double) nounwind readnone
+declare float @truncf(float) nounwind readnone
+declare double @trunc(double) nounwind readnone
+declare float @nearbyintf(float) nounwind readnone
+declare double @nearbyint(double) nounwind readnone
+declare float @rintf(float) nounwind readnone
+declare double @rint(double) nounwind readnone
diff --git a/llvm/test/CodeGen/ARM/tail-call-builtin.ll b/llvm/test/CodeGen/ARM/tail-call-builtin.ll
index 0ed15bc..c829cc5 100644
--- a/llvm/test/CodeGen/ARM/tail-call-builtin.ll
+++ b/llvm/test/CodeGen/ARM/tail-call-builtin.ll
@@ -1,38 +1,37 @@
 ; RUN: llc -mtriple=thumbv7-linux-gnueabihf %s -o - | FileCheck %s
 
-define arm_aapcs_vfpcc i64 @test_mismatched_call(double %in) {
+define i64 @test_mismatched_call(double %in) {
 ; CHECK-LABEL: test_mismatched_call:
-; CHECK: vmov r0, r1, d0
 ; CHECK: bl floor
+; CHECK: vmov r0, r1, d0
 
-  %val = tail call arm_aapcscc double @floor(double %in)
+  %val = tail call double @floor(double %in)
   %res = bitcast double %val to i64
   ret i64 %res
 }
 
-define arm_aapcs_vfpcc double @test_matched_call(double %in) {
+define double @test_matched_call(double %in) {
 ; CHECK-LABEL: test_matched_call:
-; CHECK: b _floor
+; CHECK: b floor
 
-  %val = tail call arm_aapcs_vfpcc double @_floor(double %in)
+  %val = tail call double @floor(double %in)
   ret double %val
 }
 
-define arm_aapcs_vfpcc void @test_irrelevant_call(double %in) {
+define void @test_irrelevant_call(double %in) {
 ; CHECK-LABEL: test_irrelevant_call:
 ; CHECK-NOT: bl floor
 
-  %val = tail call arm_aapcscc double @floor(double %in)
+  %val = tail call double @floor(double %in)
   ret void
 }
 
-define arm_aapcs_vfpcc double @test_callingconv(double %in) {
+define arm_aapcscc double @test_callingconv(double %in) {
 ; CHECK: test_callingconv:
 ; CHECK: bl floor
 
-  %val = tail call arm_aapcscc double @floor(double %in)
+  %val = tail call double @floor(double %in)
   ret double %val
 }
 
-declare arm_aapcs_vfpcc double @_floor(double) nounwind readonly
-declare arm_aapcscc double @floor(double) nounwind readonly
+declare double @floor(double) nounwind readonly