Fix the mono calling convention on arm64+linux.

mono · Nov 8, 2018 · 37e14bd · 37e14bd
1 parent acb33f3
commit 37e14bd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/Target/AArch64/AArch64CallingConvention.td b/lib/Target/AArch64/AArch64CallingConvention.td
@@ -262,3 +262,12 @@ def CC_AArch64_Mono_DarwinPCS : CallingConv<[
 
   CCDelegateTo<CC_AArch64_DarwinPCS>
 ]>;
+
+def CC_AArch64_Mono_AAPCS : CallingConv<[
+
+  // Mono marks the parameter it wants to pass in this non-abi register with
+  // the 'inreg' attribute.
+  CCIfInReg<CCAssignToReg<[X15]>>,
+
+  CCDelegateTo<CC_AArch64_AAPCS>
+]>;
diff --git a/lib/Target/AArch64/AArch64ISelLowering.cpp b/lib/Target/AArch64/AArch64ISelLowering.cpp
@@ -1796,7 +1796,12 @@ CCAssignFn *AArch64TargetLowering::CCAssignFnForCall(CallingConv::ID CC,
       return CC_AArch64_AAPCS;
     return IsVarArg ? CC_AArch64_DarwinPCS_VarArg : CC_AArch64_DarwinPCS;
   case CallingConv::Mono:
-    return CC_AArch64_Mono_DarwinPCS;
+      if (Subtarget->isTargetDarwin())
+          return CC_AArch64_Mono_DarwinPCS;
+      else if (Subtarget->isTargetWindows())
+          report_fatal_error("Unsupported calling convention.");
+      else
+          return CC_AArch64_Mono_AAPCS;
   }
 }