Merge pull request #1079 from CohenArthur/fmt-master

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 5c980c40a3c0f2ca0e8f34c48b08a2890cf80e81..858a0f0e33e3f7ca48dcd0abdf470b6eed35c285 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["profile-overrides"]
-
 [package]
 name = "rustc_codegen_cranelift"
 version = "0.1.0"
@@ -9,48 +7,39 @@ edition = "2018"
 [lib]
 crate-type = ["dylib"]
 
-[features]
-backend_object = ["object/write", "cranelift-object"]
-
 [dependencies]
 # These have to be in sync with each other
-cranelift = { git = "https://github.com/bytecodealliance/cranelift/", default-features = false, features = ["std"] }
-cranelift-module = { git = "https://github.com/bytecodealliance/cranelift/" }
-cranelift-faerie = { git = "https://github.com/bytecodealliance/cranelift/" }
-cranelift-object = { git = "https://github.com/bytecodealliance/cranelift/", optional = true }
-target-lexicon = "0.9.0"
-faerie = "0.12.0"
-
-#goblin = "0.0.17"
-ar = "0.8.0"
+cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main", features = ["unwind"] }
+cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main" }
+cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main" }
+cranelift-simplejit = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main", optional = true }
+cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main" }
+target-lexicon = "0.10.0"
+gimli = { version = "0.21.0", default-features = false, features = ["write"]}
+object = { version = "0.21.1", default-features = false, features = ["read", "std", "write"] }
+
+ar = { git = "https://github.com/bjorn3/rust-ar.git", branch = "do_not_remove_cg_clif_ranlib" }
 byteorder = "1.2.7"
-libc = "0.2.53"
-gimli = "0.19.0"
 indexmap = "1.0.2"
-libloading = "0.5.1"
-
-[dependencies.object]
-# FIXME remove git and rev once cranelift switches back to a crates.io release of object
-git = "https://github.com/gimli-rs/object"
-rev = "cba3ed4932e4c594c5eab4f5ef6c51838f4a5056"
-
-version = "0.15.0"
-default-features = false
-features = ["compression", "read", "std"] # We don't need WASM support
+cfg-if = "0.1.10"
+libloading = { version = "0.6.0", optional = true }
+hashbrown = "0.8.1"
 
 # Uncomment to use local checkout of cranelift
-#[patch."https://github.com/bytecodealliance/cranelift/"]
-#cranelift = { path = "../cranelift/cranelift-umbrella", default-features = false, features = ["std"] }
-#cranelift-module = { path = "../cranelift/cranelift-module" }
-#cranelift-simplejit = { path = "../cranelift/cranelift-simplejit" }
-#cranelift-faerie = { path = "../cranelift/cranelift-faerie" }
-#cranelift-object = { path = "../cranelift/cranelift-object" }
+#[patch."https://github.com/bytecodealliance/wasmtime/"]
+#cranelift-codegen = { path = "../wasmtime/cranelift/codegen" }
+#cranelift-frontend = { path = "../wasmtime/cranelift/frontend" }
+#cranelift-module = { path = "../wasmtime/cranelift/module" }
+#cranelift-simplejit = { path = "../wasmtime/cranelift/simplejit" }
+#cranelift-object = { path = "../wasmtime/cranelift/object" }
 
 #[patch.crates-io]
 #gimli = { path = "../" }
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-cranelift-simplejit = { git = "https://github.com/bytecodealliance/cranelift/" }
+[features]
+default = ["jit", "inline_asm"]
+jit = ["cranelift-simplejit", "libloading"]
+inline_asm = []
 
 [profile.dev]
 # By compiling dependencies with optimizations, performing tests gets much faster.
@@ -66,14 +55,22 @@ opt-level = 0
 opt-level = 0
 debug = false
 
+[profile.release.build-override]
+opt-level = 0
+debug = false
+
 [profile.dev.package.cranelift-codegen-meta]
 opt-level = 0
 debug = false
 
+[profile.release.package.cranelift-codegen-meta]
+opt-level = 0
+debug = false
+
 [profile.dev.package.syn]
 opt-level = 0
 debug = false
 
-[profile.dev.package.synstructure]
+[profile.release.package.syn]
 opt-level = 0
 debug = false