diff --git a/Cargo.toml b/Cargo.toml index f05aed71bd9..bb2e094e952 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,8 +34,8 @@ wasmtime-wast = { path = "wasmtime-wast" } docopt = "1.0.1" serde = "1.0.75" serde_derive = "1.0.75" -faerie = "0.7.1" -target-lexicon = { version = "0.2.0", default-features = false } +faerie = "0.9.1" +target-lexicon = { version = "0.3.0", default-features = false } pretty_env_logger = "0.3.0" file-per-thread-logger = "0.1.1" wabt = "0.7" diff --git a/wasmtime-debug/Cargo.toml b/wasmtime-debug/Cargo.toml index 7239918c0bb..74a0f150c3a 100644 --- a/wasmtime-debug/Cargo.toml +++ b/wasmtime-debug/Cargo.toml @@ -17,9 +17,9 @@ wasmparser = { version = "0.28.0" } cranelift-codegen = "0.29.0" cranelift-entity = "0.29.0" cranelift-wasm = "0.29.0" -faerie = "0.7.0" +faerie = "0.9.1" wasmtime-environ = { path = "../wasmtime-environ", default-features = false } -target-lexicon = { version = "0.2.0", default-features = false } +target-lexicon = { version = "0.3.0", default-features = false } failure = { version = "0.1.3", default-features = false } failure_derive = { version = "0.1.3", default-features = false } diff --git a/wasmtime-debug/src/lib.rs b/wasmtime-debug/src/lib.rs index ccbe9df10b3..0b2ee5fa449 100644 --- a/wasmtime-debug/src/lib.rs +++ b/wasmtime-debug/src/lib.rs @@ -74,7 +74,7 @@ pub fn emit_debugsections_image( let segment_body = (segment_body.0 as *const u8, segment_body.1 - segment_body.0); let body = unsafe { ::std::slice::from_raw_parts(segment_body.0, segment_body.1) }; - obj.declare_with("all", Decl::Function { global: false }, body.to_vec())?; + obj.declare_with("all", Decl::function(), body.to_vec())?; emit_dwarf(&mut obj, dwarf, &resolver); diff --git a/wasmtime-debug/src/write_debuginfo.rs b/wasmtime-debug/src/write_debuginfo.rs index 2645ee556cd..f591936c26c 100644 --- a/wasmtime-debug/src/write_debuginfo.rs +++ b/wasmtime-debug/src/write_debuginfo.rs @@ -21,7 +21,7 @@ macro_rules! decl_section { $artifact .declare_with( SectionId::$section.name(), - Decl::DebugSection, + Decl::debug_section(), $name.0.writer.into_vec(), ) .unwrap(); diff --git a/wasmtime-jit/Cargo.toml b/wasmtime-jit/Cargo.toml index 0e88b561a42..f2d4600bb8e 100644 --- a/wasmtime-jit/Cargo.toml +++ b/wasmtime-jit/Cargo.toml @@ -22,7 +22,7 @@ wasmtime-debug = { path = "../wasmtime-debug", default-features = false } region = "2.0.0" failure = { version = "0.1.3", default-features = false } failure_derive = { version = "0.1.3", default-features = false } -target-lexicon = { version = "0.2.0", default-features = false } +target-lexicon = { version = "0.3.0", default-features = false } hashbrown = { version = "0.1.8", optional = true } wasmparser = "0.29.2" diff --git a/wasmtime-obj/Cargo.toml b/wasmtime-obj/Cargo.toml index 7fecde0e7e5..0244cbe6cd9 100644 --- a/wasmtime-obj/Cargo.toml +++ b/wasmtime-obj/Cargo.toml @@ -16,4 +16,4 @@ cranelift-codegen = "0.29.0" cranelift-entity = "0.29.0" cranelift-wasm = "0.29.0" wasmtime-environ = { path = "../wasmtime-environ" } -faerie = "0.7.1" +faerie = "0.9.1" diff --git a/wasmtime-obj/src/data_segment.rs b/wasmtime-obj/src/data_segment.rs index fdf4397f139..c4ce8862cd4 100644 --- a/wasmtime-obj/src/data_segment.rs +++ b/wasmtime-obj/src/data_segment.rs @@ -8,14 +8,8 @@ pub fn declare_data_segment( index: usize, ) -> Result<(), String> { let name = format!("_memory_{}", index); - obj.declare( - name, - Decl::Data { - writable: false, - global: false, - }, - ) - .map_err(|err| format!("{}", err))?; + obj.declare(name, Decl::data()) + .map_err(|err| format!("{}", err))?; Ok(()) } diff --git a/wasmtime-obj/src/function.rs b/wasmtime-obj/src/function.rs index a680986c6e2..246c5d6459f 100644 --- a/wasmtime-obj/src/function.rs +++ b/wasmtime-obj/src/function.rs @@ -13,7 +13,7 @@ pub fn declare_functions( for (i, _function_relocs) in relocations.iter().rev() { let func_index = module.func_index(i); let string_name = format!("_wasm_function_{}", func_index.index()); - obj.declare(string_name, Decl::Function { global: true }) + obj.declare(string_name, Decl::function().global()) .map_err(|err| format!("{}", err))?; } Ok(()) diff --git a/wasmtime-obj/src/module.rs b/wasmtime-obj/src/module.rs index c9d1c6631db..d35e652251c 100644 --- a/wasmtime-obj/src/module.rs +++ b/wasmtime-obj/src/module.rs @@ -12,15 +12,8 @@ fn emit_vmcontext_init( target_config: &TargetFrontendConfig, ) -> Result<(), String> { let (data, table_relocs) = layout_vmcontext(module, target_config); - obj.declare_with( - "_vmcontext_init", - Decl::Data { - writable: false, - global: true, - }, - data.to_vec(), - ) - .map_err(|err| format!("{}", err))?; + obj.declare_with("_vmcontext_init", Decl::data().global(), data.to_vec()) + .map_err(|err| format!("{}", err))?; for reloc in table_relocs.iter() { let target_name = format!("_table_{}", reloc.index); obj.link(Link { diff --git a/wasmtime-obj/src/table.rs b/wasmtime-obj/src/table.rs index bfe0666577f..269e50927c4 100644 --- a/wasmtime-obj/src/table.rs +++ b/wasmtime-obj/src/table.rs @@ -3,14 +3,8 @@ use faerie::{Artifact, Decl}; /// Declares data segment symbol pub fn declare_table(obj: &mut Artifact, index: usize) -> Result<(), String> { let name = format!("_table_{}", index); - obj.declare( - name, - Decl::Data { - writable: false, - global: false, - }, - ) - .map_err(|err| format!("{}", err))?; + obj.declare(name, Decl::data()) + .map_err(|err| format!("{}", err))?; Ok(()) } diff --git a/wasmtime-wast/Cargo.toml b/wasmtime-wast/Cargo.toml index a7a450e971f..a25fdb6066c 100644 --- a/wasmtime-wast/Cargo.toml +++ b/wasmtime-wast/Cargo.toml @@ -20,7 +20,7 @@ wasmtime-jit = { path = "../wasmtime-jit" } wasmtime-runtime = { path = "../wasmtime-runtime" } wasmtime-environ = { path = "../wasmtime-environ" } wabt = "0.7" -target-lexicon = "0.2.0" +target-lexicon = "0.3.0" failure = { version = "0.1.3", default-features = false } failure_derive = { version = "0.1.3", default-features = false }