about summary refs log tree commit diff
path: root/src/comp/middle
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-11-08 17:17:06 -0800
committerBrian Anderson <banderson@mozilla.com>2011-11-08 17:17:06 -0800
commit4f3f04643f2ba6760e66e8efd54be07cb08a6b9c (patch)
tree2a45764aabb28eee335af48d6b08aabf20ce5e74 /src/comp/middle
parentd536bc2c10b7008dd3bccdfc9e82ba0af2533f34 (diff)
Remove native "cdecl" ABI
Diffstat (limited to 'src/comp/middle')
-rw-r--r--src/comp/middle/trans.rs6
-rw-r--r--src/comp/middle/typeck.rs3
2 files changed, 2 insertions, 7 deletions
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
index ff67fb37257..e054d359bb9 100644
--- a/src/comp/middle/trans.rs
+++ b/src/comp/middle/trans.rs
@@ -5531,7 +5531,6 @@ fn native_fn_ty_param_count(cx: @crate_ctxt, id: ast::node_id) -> uint {
 
 pure fn native_abi_requires_pair(abi: ast::native_abi) -> bool {
     alt abi {
-        ast::native_abi_cdecl. |
         ast::native_abi_rust_intrinsic. |
         ast::native_abi_x86stdcall. { ret true; }
         ast::native_abi_c_stack_cdecl. |
@@ -5576,11 +5575,6 @@ fn register_native_fn(ccx: @crate_ctxt, sp: span, path: [str], name: str,
         uses_retptr = true;
         cast_to_i32 = false;
       }
-      ast::native_abi_cdecl. {
-        pass_task = false;
-        uses_retptr = false;
-        cast_to_i32 = true;
-      }
       ast::native_abi_x86stdcall. {
         pass_task = false;
         uses_retptr = false;
diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs
index be79474536d..7306ae41817 100644
--- a/src/comp/middle/typeck.rs
+++ b/src/comp/middle/typeck.rs
@@ -551,7 +551,8 @@ mod collect {
         alt it {
           some(ast_map::node_item(item)) { tpt = ty_of_item(cx, item); }
           some(ast_map::node_native_item(native_item)) {
-            tpt = ty_of_native_item(cx, native_item, ast::native_abi_cdecl);
+            tpt = ty_of_native_item(cx, native_item,
+                                    ast::native_abi_c_stack_cdecl);
           }
           _ { cx.tcx.sess.fatal("internal error " + std::int::str(id.node)); }
         }