commit a92c4424379c7d2b77b85ddd045c33fce23f7e17
author Rafael Espindola <rafael.espindola@gmail.com> Wed Jun 16 16:13:39 2010 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Wed Jun 16 16:13:39 2010 +0000
tree 97ce39a196323708d98eccd4a4e8ed56ec3249b8
parent 1c69bf00ae8328bae33594cd5e84f0c61009598e

Don't set the calling convention for ARM if it is already the default.

llvm-svn: 106106

clang/lib/CodeGen/TargetInfo.cpp

diff --git a/clang/lib/CodeGen/TargetInfo.cpp b/clang/lib/CodeGen/TargetInfo.cpp
index 74f9a51..6089292 100644
--- a/clang/lib/CodeGen/TargetInfo.cpp
+++ b/clang/lib/CodeGen/TargetInfo.cpp
@@ -1776,14 +1776,22 @@
     it->info = classifyArgumentType(it->type, Context, VMContext);
   }
 
-  // ARM always overrides the calling convention.
+  const llvm::Triple &Triple(Context.Target.getTriple());
+  llvm::CallingConv::ID DefaultCC;
+  if (Triple.getOS() == llvm::Triple::Darwin)
+    DefaultCC = llvm::CallingConv::ARM_APCS;
+  else
+    DefaultCC = llvm::CallingConv::ARM_AAPCS;
+
   switch (getABIKind()) {
   case APCS:
-    FI.setEffectiveCallingConvention(llvm::CallingConv::ARM_APCS);
+    if (DefaultCC != llvm::CallingConv::ARM_APCS)
+      FI.setEffectiveCallingConvention(llvm::CallingConv::ARM_APCS);
     break;
 
   case AAPCS:
-    FI.setEffectiveCallingConvention(llvm::CallingConv::ARM_AAPCS);
+    if (DefaultCC != llvm::CallingConv::ARM_AAPCS)
+      FI.setEffectiveCallingConvention(llvm::CallingConv::ARM_AAPCS);
     break;
 
   case AAPCS_VFP: