Merge branch 'master' into no_std

2018-04-17 16:41:27 -04:00
parent 07693048f0 58380f38e8
commit a10a6a0df0
364 changed files with 3412 additions and 1024 deletions
--- a/lib/wasm/src/lib.rs
+++ b/lib/wasm/src/lib.rs
@@ -25,8 +25,8 @@ extern crate alloc;
 extern crate hashmap_core;

 #[macro_use(dbg)]
-extern crate cretonne;
-extern crate cton_frontend;
+extern crate cretonne_codegen;
+extern crate cretonne_frontend;
 extern crate wasmparser;

 mod code_translator;