From 9ebdbca379fb71da7236e7534e1d3465f7fb151f Mon Sep 17 00:00:00 2001
From: Sreehari S <sreeharisreedev1@gmail.com>
Date: Thu, 8 Apr 2021 21:00:53 -0700
Subject: callconv: add SysV

---
 src/stage1/analyze.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/stage1/analyze.cpp')

diff --git a/src/stage1/analyze.cpp b/src/stage1/analyze.cpp
index d7535ed806..196ddd9fa2 100644
--- a/src/stage1/analyze.cpp
+++ b/src/stage1/analyze.cpp
@@ -974,6 +974,7 @@ const char *calling_convention_name(CallingConvention cc) {
         case CallingConventionAAPCS: return "AAPCS";
         case CallingConventionAAPCSVFP: return "AAPCSVFP";
         case CallingConventionInline: return "Inline";
+        case CallingConventionSysV: return "SysV";
     }
     zig_unreachable();
 }
@@ -995,6 +996,7 @@ bool calling_convention_allows_zig_types(CallingConvention cc) {
         case CallingConventionAPCS:
         case CallingConventionAAPCS:
         case CallingConventionAAPCSVFP:
+        case CallingConventionSysV:
             return false;
     }
     zig_unreachable();
@@ -1969,6 +1971,10 @@ Error emit_error_unless_callconv_allowed_for_target(CodeGen *g, AstNode *source_
         case CallingConventionAAPCSVFP:
             if (!target_is_arm(g->zig_target))
                 allowed_platforms = "ARM";
+        case CallingConventionSysV:
+            if (g->zig_target->arch != ZigLLVM_x86_64)
+                allowed_platforms = "x86_64";
+            break;
     }
     if (allowed_platforms != nullptr) {
         add_node_error(g, source_node, buf_sprintf(
@@ -3805,6 +3811,7 @@ static void resolve_decl_fn(CodeGen *g, TldFn *tld_fn) {
                 case CallingConventionAPCS:
                 case CallingConventionAAPCS:
                 case CallingConventionAAPCSVFP:
+                case CallingConventionSysV:
                     add_fn_export(g, fn_table_entry, buf_ptr(&fn_table_entry->symbol_name),
                                   GlobalLinkageIdStrong, fn_cc);
                     break;
-- 
cgit v1.2.3


From 906ac7b2f9ef9a485c45884d71b6e30379084641 Mon Sep 17 00:00:00 2001
From: Sreehari S <sreeharisreedev1@gmail.com>
Date: Thu, 8 Apr 2021 22:26:35 -0700
Subject: fix unannotated fall-through bug in case

---
 src/stage1/analyze.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/stage1/analyze.cpp')

diff --git a/src/stage1/analyze.cpp b/src/stage1/analyze.cpp
index 196ddd9fa2..c56344c53a 100644
--- a/src/stage1/analyze.cpp
+++ b/src/stage1/analyze.cpp
@@ -1971,10 +1971,10 @@ Error emit_error_unless_callconv_allowed_for_target(CodeGen *g, AstNode *source_
         case CallingConventionAAPCSVFP:
             if (!target_is_arm(g->zig_target))
                 allowed_platforms = "ARM";
+            break;
         case CallingConventionSysV:
             if (g->zig_target->arch != ZigLLVM_x86_64)
                 allowed_platforms = "x86_64";
-            break;
     }
     if (allowed_platforms != nullptr) {
         add_node_error(g, source_node, buf_sprintf(
-- 
cgit v1.2.3