From 74f5dd07cff8dba348f91cfef4df5242ab33a311 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 12 Mar 2018 13:09:03 -0700
Subject: [PATCH] rustc: Start a custom cabi module for wasm32

It actually was already using the `cabi_asmjs` module but that was by accident,
so route the new `wasm32-unknown-unknown` target to a new `cabi_wasm32` module.
The first entries in this module are to use `signext` and `zeroext` for types
that are under 32 bytes in size

Closes rust-lang-nursery/rust-wasm#88
---
 src/librustc_trans/abi.rs         |  9 ++++++++-
 src/librustc_trans/cabi_wasm32.rs | 31 +++++++++++++++++++++++++++++++
 src/librustc_trans/lib.rs         |  1 +
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 src/librustc_trans/cabi_wasm32.rs

diff --git a/src/librustc_trans/abi.rs b/src/librustc_trans/abi.rs
index ee0f2415bd8..d2420335b42 100644
--- a/src/librustc_trans/abi.rs
+++ b/src/librustc_trans/abi.rs
@@ -30,6 +30,7 @@
 use cabi_nvptx;
 use cabi_nvptx64;
 use cabi_hexagon;
+use cabi_wasm32;
 use mir::place::PlaceRef;
 use mir::operand::OperandValue;
 use type_::Type;
@@ -948,7 +949,13 @@ fn adjust_for_abi(&mut self,
             "powerpc64" => cabi_powerpc64::compute_abi_info(cx, self),
             "s390x" => cabi_s390x::compute_abi_info(cx, self),
             "asmjs" => cabi_asmjs::compute_abi_info(cx, self),
-            "wasm32" => cabi_asmjs::compute_abi_info(cx, self),
+            "wasm32" => {
+                if cx.sess().opts.target_triple.contains("emscripten") {
+                    cabi_asmjs::compute_abi_info(cx, self)
+                } else {
+                    cabi_wasm32::compute_abi_info(cx, self)
+                }
+            }
             "msp430" => cabi_msp430::compute_abi_info(self),
             "sparc" => cabi_sparc::compute_abi_info(cx, self),
             "sparc64" => cabi_sparc64::compute_abi_info(cx, self),
diff --git a/src/librustc_trans/cabi_wasm32.rs b/src/librustc_trans/cabi_wasm32.rs
new file mode 100644
index 00000000000..5530a03d65d
--- /dev/null
+++ b/src/librustc_trans/cabi_wasm32.rs
@@ -0,0 +1,31 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use abi::{FnType, ArgType};
+use context::CodegenCx;
+
+fn classify_ret_ty<'a, 'tcx>(_cx: &CodegenCx<'a, 'tcx>, ret: &mut ArgType<'tcx>) {
+    ret.extend_integer_width_to(32);
+}
+
+fn classify_arg_ty(arg: &mut ArgType) {
+    arg.extend_integer_width_to(32);
+}
+
+pub fn compute_abi_info<'a, 'tcx>(cx: &CodegenCx<'a, 'tcx>, fty: &mut FnType<'tcx>) {
+    if !fty.ret.is_ignore() {
+        classify_ret_ty(cx, &mut fty.ret);
+    }
+
+    for arg in &mut fty.args {
+        if arg.is_ignore() { continue; }
+        classify_arg_ty(arg);
+    }
+}
diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs
index 39eb38658fe..4a32b614c05 100644
--- a/src/librustc_trans/lib.rs
+++ b/src/librustc_trans/lib.rs
@@ -123,6 +123,7 @@ mod back {
 mod cabi_x86;
 mod cabi_x86_64;
 mod cabi_x86_win64;
+mod cabi_wasm32;
 mod callee;
 mod common;
 mod consts;
-- 
2.44.0