X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=Cargo.toml;h=3be4250296e774e1c5d2fb13def047985e97e4ec;hb=eef35308efcd493587d9b1d23b2363d99246a220;hp=86347a006d7d928003befdd3456b45870dfd8af5;hpb=75c24b9c9677600422ec86fa9f4c78fe3678d2ce;p=rust.git

diff --git a/Cargo.toml b/Cargo.toml
index 86347a006d7..3be4250296e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,75 +1,54 @@
-cargo-features = ["profile-overrides"]
-
 [package]
 name = "rustc_codegen_cranelift"
 version = "0.1.0"
-authors = ["bjorn3 <bjorn3@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 
 [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/CraneStation/cranelift.git" }
-cranelift-module = { git = "https://github.com/CraneStation/cranelift.git" }
-cranelift-faerie = { git = "https://github.com/CraneStation/cranelift.git" }
-cranelift-object = { git = "https://github.com/CraneStation/cranelift.git", optional = true }
-target-lexicon = "0.8.1"
-faerie = "0.11.0"
-
-#goblin = "0.0.17"
-ar = "0.8.0"
-byteorder = "1.2.7"
-libc = "0.2.53"
-gimli = "0.19.0"
+cranelift-codegen = { version = "0.78.0", features = ["unwind", "all-arch"] }
+cranelift-frontend = "0.78.0"
+cranelift-module = "0.78.0"
+cranelift-native = "0.78.0"
+cranelift-jit = { version = "0.78.0", optional = true }
+cranelift-object = "0.78.0"
+target-lexicon = "0.12.0"
+gimli = { version = "0.25.0", default-features = false, features = ["write"]}
+object = { version = "0.27.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"
-libloading = "0.5.1"
-
-[dependencies.object]
-version = "0.14.0"
-default-features = false
-features = ["compression", "read", "std"] # We don't need WASM support
+libloading = { version = "0.6.0", optional = true }
+smallvec = "1.6.1"
 
+[patch.crates-io]
 # 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" }
-#cranelift-object = { path = "../cranelift/cranelift-object" }
+#cranelift-codegen = { path = "../wasmtime/cranelift/codegen" }
+#cranelift-frontend = { path = "../wasmtime/cranelift/frontend" }
+#cranelift-module = { path = "../wasmtime/cranelift/module" }
+#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/CraneStation/cranelift.git" }
-
-[profile.dev]
-# By compiling dependencies with optimizations, performing tests gets much faster.
-opt-level = 3
-
-[profile.dev.overrides."rustc_codegen_cranelift"]
-# Disabling optimizations for cg_clif itself makes compilation after a change faster.
-opt-level = 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 = []
 
 # 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]
+[profile.release.build-override]
 opt-level = 0
 debug = false
 
-[profile.dev.overrides.cranelift-codegen-meta]
+[profile.release.package.cranelift-codegen-meta]
 opt-level = 0
 debug = false
 
-[profile.dev.overrides.syn]
-opt-level = 0
-debug = false
-
-[profile.dev.overrides.synstructure]
-opt-level = 0
-debug = false
+[package.metadata.rust-analyzer]
+rustc_private = true