rustc: Start a custom cabi module for wasm32

[rust.git] / src / librustc_trans / lib.rs

diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs
index 0b8da10b78e776c71acfd2c00c539970c43d0ebf..4a32b614c05d4a40a6cd52574cbd426dc09bc1bc 100644 (file)
--- a/src/librustc_trans/lib.rs
+++ b/src/librustc_trans/lib.rs
@@ -50,7 +50,7 @@
 extern crate rustc_apfloat;
 extern crate rustc_back;
 extern crate rustc_const_math;
-extern crate rustc_data_structures;
+#[macro_use] extern crate rustc_data_structures;
 extern crate rustc_demangle;
 extern crate rustc_incremental;
 extern crate rustc_llvm as llvm;
@@ -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;
@@ -238,7 +239,7 @@ fn join_trans_and_link(
             back::write::dump_incremental_data(&trans);
         }
 
-        time(sess.time_passes(),
+        time(sess,
              "serialize work products",
              move || rustc_incremental::save_work_products(sess, &dep_graph));
 
@@ -251,7 +252,7 @@ fn join_trans_and_link(
 
         // Run the linker on any artifacts that resulted from the LLVM run.
         // This should produce either a finished executable or library.
-        time(sess.time_passes(), "linking", || {
+        time(sess, "linking", || {
             back::link::link_binary(sess, &trans, outputs, &trans.crate_name.as_str());
         });