X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=Cargo.toml;h=6f40fc0fcb881e77fa67e548191d380321f70550;hb=d480d9ee3b8bf1b07f85fee1605df1a106c50530;hp=90f5429bb0e1ce8c93706dc0e835e0cd955d328f;hpb=7dbbfe668fa78f83d72bae264cfd712ff7a900d1;p=rust.git

diff --git a/Cargo.toml b/Cargo.toml
index 90f5429bb0e..6f40fc0fcb8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "rustc_codegen_cranelift"
 version = "0.1.0"
-authors = ["bjorn3 <bjorn3@users.noreply.github.com>"]
 edition = "2018"
 
 [lib]
@@ -9,40 +8,38 @@ crate-type = ["dylib"]
 
 [dependencies]
 # These have to be in sync with each other
-cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime/", features = ["unwind"] }
-cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime/" }
-cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime/" }
-cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime/" }
-target-lexicon = "0.10.0"
-
-ar = "0.8.0"
-byteorder = "1.2.7"
+cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", features = ["unwind", "all-arch"] }
+cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git" }
+cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git" }
+cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git" }
+cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", optional = true }
+cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git" }
+target-lexicon = "0.12.0"
+gimli = { version = "0.25.0", default-features = false, features = ["write"]}
+object = { version = "0.26.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
+
+ar = { git = "https://github.com/bjorn3/rust-ar.git", branch = "do_not_remove_cg_clif_ranlib" }
 indexmap = "1.0.2"
-
-[dependencies.object]
-version = "0.18.0"
-default-features = false
-features = ["read", "std", "write"] # We don't need WASM support
-
-[dependencies.gimli]
-version = "0.20.0"
-default-features = false
-features = ["write"] # We don't need read support
+libloading = { version = "0.6.0", optional = true }
+smallvec = "1.6.1"
 
 # Uncomment to use local checkout of cranelift
-#[patch."https://github.com/bytecodealliance/wasmtime/"]
+#[patch."https://github.com/bytecodealliance/wasmtime.git"]
 #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-native = { path = "../wasmtime/cranelift/native" }
+#cranelift-jit = { path = "../wasmtime/cranelift/jit" }
 #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/wasmtime/" }
-libloading = "0.6.0"
+[features]
+# Enable features not ready to be enabled when compiling as part of rustc
+unstable-features = ["jit", "inline_asm"]
+jit = ["cranelift-jit", "libloading"]
+inline_asm = []
 
 [profile.dev]
 # By compiling dependencies with optimizations, performing tests gets much faster.
@@ -52,6 +49,9 @@ opt-level = 3
 # Disabling optimizations for cg_clif itself makes compilation after a change faster.
 opt-level = 0
 
+[profile.release.package.rustc_codegen_cranelift]
+incremental = true
+
 # Disable optimizations and debuginfo of build scripts and some of the heavy build deps, as the
 # execution time of build scripts is so fast that optimizing them slows down the total build time.
 [profile.dev.build-override]
@@ -70,10 +70,5 @@ debug = false
 opt-level = 0
 debug = false
 
-[profile.dev.package.syn]
-opt-level = 0
-debug = false
-
-[profile.release.package.syn]
-opt-level = 0
-debug = false
+[package.metadata.rust-analyzer]
+rustc_private = true