Fix dependency paths. wasmstandalone no longer depends on out-of-tree patches.

lib/wasm2obj/Cargo.toml

@@ -5,7 +5,8 @@ authors = ["The Cretonne Project Developers"]
 publish = false
 
 [dependencies]
-cretonne = { path = "/home/sunfish/rust/cretonne/lib/cretonne" }
-cretonne-frontend = { path = "/home/sunfish/rust/cretonne/lib/frontend" }
-cretonne-wasm = { path = "/home/sunfish/rust/cretonne/lib/wasm" }
+cretonne = { git = "https://github.com/stoklund/cretonne.git" }
+cretonne-frontend = { git = "https://github.com/stoklund/cretonne.git" }
+cretonne-wasm = { git = "https://github.com/stoklund/cretonne.git" }
+wasmstandalone = { path = "../wasmstandalone" }
 faerie = { git = "https://github.com/m4b/faerie" }

lib/wasm2obj/src/emit_module.rs

@@ -12,6 +12,7 @@ use cton_wasm::TranslationResult;
 use std::collections::HashMap;
 use std::fmt::Write;
 use faerie::Artifact;
+use wasmstandalone::StandaloneRuntime;
 
 type RelocRef = u16;
 
@@ -50,10 +51,11 @@ pub fn emit_module(
     trans_result: &TranslationResult,
     obj: &mut Artifact,
     isa: &TargetIsa,
+    runtime: &StandaloneRuntime,
 ) -> Result<(), String> {
     debug_assert!(
         trans_result.start_index.is_none() ||
-            trans_result.start_index.unwrap() >= trans_result.function_imports_count,
+            trans_result.start_index.unwrap() >= runtime.imported_funcs.len(),
         "imported start functions not supported yet"
     );
 

lib/wasm2obj/src/lib.rs

@@ -1,6 +1,7 @@
 extern crate cretonne;
 extern crate cton_wasm;
 extern crate faerie;
+extern crate wasmstandalone;
 
 mod emit_module;