Move cranelift dependencies to wasmtime-environ (#669)

Groups all CL data structures into single dependency to be used accross wasmtime project.
This commit is contained in:
Yury Delendik
2019-12-05 16:07:34 -06:00
committed by GitHub
parent 8a1b7965d8
commit cc6e8e1af2
65 changed files with 223 additions and 233 deletions

View File

@@ -12,13 +12,12 @@ version = "0.1.0"
anyhow = "1.0.22"
arbitrary = "0.2.0"
binaryen = "0.8.2"
cranelift-codegen = "0.50.0"
cranelift-native = "0.50.0"
env_logger = { version = "0.7.1", optional = true }
log = "0.4.8"
wasmparser = "0.44.0"
wasmprinter = "0.2.0"
wasmtime = { path = "../api" }
wasmtime-environ = { path = "../environ" }
wasmtime-jit = { path = "../jit" }
[dev-dependencies]

View File

@@ -12,17 +12,17 @@
pub mod dummy;
use cranelift_codegen::settings;
use dummy::dummy_imports;
use std::cell::RefCell;
use std::collections::HashMap;
use std::rc::Rc;
use wasmtime::{Config, Engine, HostRef, Instance, Module, Store};
use wasmtime_jit::{CompilationStrategy, CompiledModule, Compiler, NullResolver};
use wasmtime_environ::{isa, settings};
use wasmtime_jit::{native, CompilationStrategy, CompiledModule, Compiler, NullResolver};
fn host_isa() -> Box<dyn cranelift_codegen::isa::TargetIsa> {
fn host_isa() -> Box<dyn isa::TargetIsa> {
let flag_builder = settings::builder();
let isa_builder = cranelift_native::builder().expect("host machine is not a supported target");
let isa_builder = native::builder();
isa_builder.finish(settings::Flags::new(flag_builder))
}