Rustup to rustc 1.52.0-nightly (83b30a639 2021-02-20)

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 1b505f7e6b88dd7e7a8f9fccc2ea6f85e0decbe3..9861af1f8eae2cfb384cbaee7ad709937835465a 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"
@@ -7,42 +5,73 @@ authors = ["bjorn3 <bjorn3@users.noreply.github.com>"]
 edition = "2018"
 
 [lib]
-crate-type = ["rlib", "dylib"]
+crate-type = ["dylib"]
 
 [dependencies]
 # These have to be in sync with each other
-cranelift = { git = "https://github.com/CraneStation/cranelift.git" }
-cranelift-module = { git = "https://github.com/CraneStation/cranelift.git" }
-cranelift-faerie = { git = "https://github.com/CraneStation/cranelift.git" }
-target-lexicon = "0.4.0"
-faerie = "0.10.0"
-
-#goblin = "0.0.17"
-ar = "0.7.0"
-bitflags = "1.1.0"
-byteorder = "1.2.7"
-libc = "0.2.53"
-tempfile = "3.0.7"
-gimli = { git = "https://github.com/gimli-rs/gimli.git" }
+cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main", features = ["unwind", "x64"] }
+cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main" }
+cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main" }
+cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main", optional = true }
+cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main" }
+target-lexicon = "0.11.0"
+gimli = { version = "0.23.0", default-features = false, features = ["write"]}
+object = { version = "0.23.0", default-features = false, features = ["std", "read_core", "write", "coff", "elf", "macho", "pe"] }
+
+ar = { git = "https://github.com/bjorn3/rust-ar.git", branch = "do_not_remove_cg_clif_ranlib" }
 indexmap = "1.0.2"
-object = "0.12.0"
+libloading = { version = "0.6.0", optional = true }
+smallvec = "1.6.1"
 
 # Uncomment to use local checkout of cranelift
-#[patch."https://github.com/CraneStation/cranelift.git"]
-#cranelift = { path = "../cranelift/cranelift-umbrella" }
-#cranelift-module = { path = "../cranelift/cranelift-module" }
-#cranelift-simplejit = { path = "../cranelift/cranelift-simplejit" }
-#cranelift-faerie = { path = "../cranelift/cranelift-faerie" }
+#[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-jit = { path = "../wasmtime/cranelift/jit" }
+#cranelift-object = { path = "../wasmtime/cranelift/object" }
 
-#[patch."https://github.com/gimli-rs/gimli.git"]
+#[patch.crates-io]
 #gimli = { path = "../" }
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-cranelift-simplejit = { git = "https://github.com/CraneStation/cranelift.git" }
-
-[patch.crates-io]
-faerie = { path = "../faerie" }
-object = { path = "../object" }
+[features]
+default = ["jit", "inline_asm"]
+jit = ["cranelift-jit", "libloading"]
+inline_asm = []
 
-[profile.dev.overrides."*"]
+[profile.dev]
+# By compiling dependencies with optimizations, performing tests gets much faster.
 opt-level = 3
+
+[profile.dev.package.rustc_codegen_cranelift]
+# 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]
+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.release.package.syn]
+opt-level = 0
+debug = false