From 43f1e05156bce744ec3d4e57e53497c9bc3bf7af Mon Sep 17 00:00:00 2001 From: Philip Craig Date: Mon, 30 Dec 2019 19:31:47 +1000 Subject: [PATCH] Update target-lexicon to 0.10 --- cranelift/Cargo.toml | 2 +- cranelift/codegen/Cargo.toml | 2 +- cranelift/faerie/Cargo.toml | 6 +++--- cranelift/faerie/src/backend.rs | 2 +- cranelift/frontend/Cargo.toml | 2 +- cranelift/fuzz/Cargo.toml | 2 +- cranelift/native/Cargo.toml | 2 +- cranelift/object/Cargo.toml | 4 ++-- cranelift/object/src/backend.rs | 15 ++++++++++----- cranelift/reader/Cargo.toml | 2 +- cranelift/simplejit/Cargo.toml | 2 +- cranelift/wasm/Cargo.toml | 2 +- 12 files changed, 24 insertions(+), 19 deletions(-) diff --git a/cranelift/Cargo.toml b/cranelift/Cargo.toml index 7f78b3ddd2..d446b97f23 100644 --- a/cranelift/Cargo.toml +++ b/cranelift/Cargo.toml @@ -39,7 +39,7 @@ serde = "1.0.8" term = "0.6.1" capstone = { version = "0.6.0", optional = true } wabt = { version = "0.9.1", optional = true } -target-lexicon = "0.9" +target-lexicon = "0.10" pretty_env_logger = "0.3.0" file-per-thread-logger = "0.1.2" indicatif = "0.13.0" diff --git a/cranelift/codegen/Cargo.toml b/cranelift/codegen/Cargo.toml index bf85cf02cf..4c501d8302 100644 --- a/cranelift/codegen/Cargo.toml +++ b/cranelift/codegen/Cargo.toml @@ -17,7 +17,7 @@ cranelift-codegen-shared = { path = "./shared", version = "0.52.0" } cranelift-entity = { path = "../cranelift-entity", version = "0.52.0" } cranelift-bforest = { path = "../cranelift-bforest", version = "0.52.0" } hashbrown = { version = "0.6", optional = true } -target-lexicon = "0.9" +target-lexicon = "0.10" log = { version = "0.4.6", default-features = false } serde = { version = "1.0.94", features = ["derive"], optional = true } smallvec = { version = "1.0.0" } diff --git a/cranelift/faerie/Cargo.toml b/cranelift/faerie/Cargo.toml index c7321c3e8c..198676d057 100644 --- a/cranelift/faerie/Cargo.toml +++ b/cranelift/faerie/Cargo.toml @@ -11,10 +11,10 @@ edition = "2018" [dependencies] cranelift-module = { path = "../cranelift-module", version = "0.52.0" } -faerie = "0.12.0" +faerie = "0.14.0" goblin = "0.1.0" -failure = "0.1.2" -target-lexicon = "0.9" +anyhow = "1.0" +target-lexicon = "0.10" [dependencies.cranelift-codegen] path = "../cranelift-codegen" diff --git a/cranelift/faerie/src/backend.rs b/cranelift/faerie/src/backend.rs index 14d8245370..aca9196bc5 100644 --- a/cranelift/faerie/src/backend.rs +++ b/cranelift/faerie/src/backend.rs @@ -2,6 +2,7 @@ use crate::container; use crate::traps::{FaerieTrapManifest, FaerieTrapSink}; +use anyhow::Error; use cranelift_codegen::binemit::{ Addend, CodeOffset, NullStackmapSink, NullTrapSink, Reloc, RelocSink, Stackmap, StackmapSink, }; @@ -12,7 +13,6 @@ use cranelift_module::{ ModuleNamespace, ModuleResult, }; use faerie; -use failure::Error; use std::fs::File; use target_lexicon::Triple; diff --git a/cranelift/frontend/Cargo.toml b/cranelift/frontend/Cargo.toml index f8e4a0b66a..544eb0a553 100644 --- a/cranelift/frontend/Cargo.toml +++ b/cranelift/frontend/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] cranelift-codegen = { path = "../cranelift-codegen", version = "0.52.0", default-features = false } -target-lexicon = "0.9" +target-lexicon = "0.10" log = { version = "0.4.6", default-features = false } hashbrown = { version = "0.6", optional = true } smallvec = { version = "1.0.0" } diff --git a/cranelift/fuzz/Cargo.toml b/cranelift/fuzz/Cargo.toml index 8d9cdc0ffa..d2dca75c64 100644 --- a/cranelift/fuzz/Cargo.toml +++ b/cranelift/fuzz/Cargo.toml @@ -15,7 +15,7 @@ libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" } cranelift-codegen = { path = "../cranelift-codegen" } cranelift-wasm = { path = "../cranelift-wasm" } cranelift-reader = { path = "../cranelift-reader" } -target-lexicon = "0.9" +target-lexicon = "0.10" # Prevent this from interfering with workspaces [workspace] diff --git a/cranelift/native/Cargo.toml b/cranelift/native/Cargo.toml index 5bc12aa0f3..ee954f21f1 100644 --- a/cranelift/native/Cargo.toml +++ b/cranelift/native/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] cranelift-codegen = { path = "../cranelift-codegen", version = "0.52.0", default-features = false } -target-lexicon = "0.9" +target-lexicon = "0.10" [target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies] raw-cpuid = "7.0.3" diff --git a/cranelift/object/Cargo.toml b/cranelift/object/Cargo.toml index 95f3aa195c..917490cc70 100644 --- a/cranelift/object/Cargo.toml +++ b/cranelift/object/Cargo.toml @@ -11,8 +11,8 @@ edition = "2018" [dependencies] cranelift-module = { path = "../cranelift-module", version = "0.52.0" } -object = { version = "0.16", default-features = false, features = ["write"] } -target-lexicon = "0.9" +object = { version = "0.17", default-features = false, features = ["write"] } +target-lexicon = "0.10" [dependencies.cranelift-codegen] path = "../cranelift-codegen" diff --git a/cranelift/object/src/backend.rs b/cranelift/object/src/backend.rs index 37b4c6bff2..28874cb521 100644 --- a/cranelift/object/src/backend.rs +++ b/cranelift/object/src/backend.rs @@ -11,8 +11,10 @@ use cranelift_module::{ Backend, DataContext, DataDescription, DataId, FuncId, Init, Linkage, ModuleNamespace, ModuleResult, }; -use object::write::{Object, Relocation, SectionId, StandardSection, Symbol, SymbolId}; -use object::{RelocationEncoding, RelocationKind, SymbolKind, SymbolScope}; +use object::write::{ + Object, Relocation, SectionId, StandardSection, Symbol, SymbolId, SymbolSection, +}; +use object::{RelocationEncoding, RelocationKind, SymbolFlags, SymbolKind, SymbolScope}; use std::collections::HashMap; use target_lexicon::PointerWidth; @@ -133,7 +135,8 @@ impl Backend for ObjectBackend { kind: SymbolKind::Text, scope, weak, - section: None, + section: SymbolSection::Undefined, + flags: SymbolFlags::None, }); self.functions[id] = Some(symbol_id); } @@ -161,7 +164,8 @@ impl Backend for ObjectBackend { kind: SymbolKind::Data, scope, weak, - section: None, + section: SymbolSection::Undefined, + flags: SymbolFlags::None, }); self.data_objects[id] = Some(symbol_id); } @@ -432,7 +436,8 @@ impl ObjectBackend { kind: SymbolKind::Text, scope: SymbolScope::Unknown, weak: false, - section: None, + section: SymbolSection::Undefined, + flags: SymbolFlags::None, }); self.libcalls.insert(*libcall, symbol); symbol diff --git a/cranelift/reader/Cargo.toml b/cranelift/reader/Cargo.toml index cf489e19d3..d212016408 100644 --- a/cranelift/reader/Cargo.toml +++ b/cranelift/reader/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] cranelift-codegen = { path = "../cranelift-codegen", version = "0.52.0" } -target-lexicon = "0.9" +target-lexicon = "0.10" [badges] maintenance = { status = "experimental" } diff --git a/cranelift/simplejit/Cargo.toml b/cranelift/simplejit/Cargo.toml index 613a116bee..0a277e9d9b 100644 --- a/cranelift/simplejit/Cargo.toml +++ b/cranelift/simplejit/Cargo.toml @@ -15,7 +15,7 @@ cranelift-native = { path = "../cranelift-native", version = "0.52.0" } region = "2.0.0" libc = { version = "0.2.42" } errno = "0.2.4" -target-lexicon = "0.9" +target-lexicon = "0.10" memmap = { version = "0.7.0", optional = true } [dependencies.cranelift-codegen] diff --git a/cranelift/wasm/Cargo.toml b/cranelift/wasm/Cargo.toml index 6c9b77ecb6..11ac403f0f 100644 --- a/cranelift/wasm/Cargo.toml +++ b/cranelift/wasm/Cargo.toml @@ -22,7 +22,7 @@ thiserror = "1.0.4" [dev-dependencies] wabt = "0.9.1" -target-lexicon = "0.9" +target-lexicon = "0.10" [features] default = ["std", "basic-blocks"]