Move cranelift dependencies to wasmtime-environ (#669)

Groups all CL data structures into single dependency to be used accross wasmtime project.

src/bin/wasm2obj.rs

@@ -29,10 +29,6 @@
     )
 )]
 
-use cranelift_codegen::settings::Configurable;
-use cranelift_codegen::{isa, settings};
-use cranelift_entity::EntityRef;
-use cranelift_wasm::DefinedMemoryIndex;
 use docopt::Docopt;
 use faerie::Artifact;
 use serde::Deserialize;
@@ -44,13 +40,17 @@ use std::{process, str};
 use target_lexicon::Triple;
 use wasmtime_cli::pick_compilation_strategy;
 use wasmtime_debug::{emit_debugsections, read_debuginfo};
+use wasmtime_environ::entity::EntityRef;
+use wasmtime_environ::settings;
+use wasmtime_environ::settings::Configurable;
+use wasmtime_environ::wasm::DefinedMemoryIndex;
 #[cfg(feature = "lightbeam")]
 use wasmtime_environ::Lightbeam;
 use wasmtime_environ::{
     cache_create_new_config, cache_init, Compiler, Cranelift, ModuleEnvironment, ModuleVmctxInfo,
     Tunables, VMOffsets,
 };
-use wasmtime_jit::CompilationStrategy;
+use wasmtime_jit::{native, CompilationStrategy};
 use wasmtime_obj::emit_module;
 
 const USAGE: &str = "
@@ -190,11 +190,9 @@ fn handle_module(
     let isa_builder = match *target {
         Some(ref target) => {
             let target = Triple::from_str(&target).map_err(|_| "could not parse --target")?;
-            isa::lookup(target).map_err(|err| format!("{:?}", err))?
+            native::lookup(target).map_err(|err| format!("{:?}", err))?
         }
-        None => cranelift_native::builder().unwrap_or_else(|_| {
-            panic!("host machine is not a supported target");
-        }),
+        None => native::builder(),
     };
     let mut flag_builder = settings::builder();
 

src/bin/wasmtime.rs

@@ -31,7 +31,6 @@
 )]
 
 use anyhow::{bail, Context as _, Result};
-use cranelift_codegen::{settings, settings::Configurable};
 use docopt::Docopt;
 use serde::Deserialize;
 use std::path::{Component, Path};
@@ -40,6 +39,7 @@ use wasi_common::preopen_dir;
 use wasmtime::{Config, Engine, HostRef, Instance, Module, Store};
 use wasmtime_cli::pick_compilation_strategy;
 use wasmtime_environ::{cache_create_new_config, cache_init};
+use wasmtime_environ::{settings, settings::Configurable};
 use wasmtime_interface_types::ModuleData;
 use wasmtime_jit::Features;
 use wasmtime_wasi::create_wasi_instance;

src/bin/wast.rs

@@ -25,16 +25,16 @@
     )
 )]
 
-use cranelift_codegen::settings;
-use cranelift_codegen::settings::Configurable;
-use cranelift_native;
 use docopt::Docopt;
 use pretty_env_logger;
 use serde::Deserialize;
 use std::path::Path;
 use std::process;
 use wasmtime_cli::pick_compilation_strategy;
+use wasmtime_environ::settings;
+use wasmtime_environ::settings::Configurable;
 use wasmtime_environ::{cache_create_new_config, cache_init};
+use wasmtime_jit::native;
 use wasmtime_jit::{Compiler, Features};
 use wasmtime_wast::WastContext;
 
@@ -128,9 +128,7 @@ fn main() {
         process::exit(1);
     }
 
-    let isa_builder = cranelift_native::builder().unwrap_or_else(|_| {
-        panic!("host machine is not a supported target");
-    });
+    let isa_builder = native::builder();
     let mut flag_builder = settings::builder();
     let mut features: Features = Default::default();