From 4bd9eb7402671b02a52290c22a09d9b8e6bd8428 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 28 Feb 2020 16:08:49 -0800 Subject: [PATCH] Fix build of cranelift-tools Accidentally left it out of the workspace members! --- Cargo.lock | 233 +++++++++++++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 1 + 2 files changed, 234 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index debe8fbd6a..cec542b105 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -311,6 +311,18 @@ dependencies = [ "vec_map", ] +[[package]] +name = "clicolors-control" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" +dependencies = [ + "atty", + "lazy_static", + "libc", + "winapi", +] + [[package]] name = "cmake" version = "0.1.42" @@ -320,6 +332,22 @@ dependencies = [ "cc", ] +[[package]] +name = "console" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45e0f3986890b3acbc782009e2629dfe2baa430ac091519ce3be26164a2ae6c0" +dependencies = [ + "clicolors-control", + "encode_unicode", + "lazy_static", + "libc", + "regex", + "termios", + "unicode-width", + "winapi", +] + [[package]] name = "const-random" version = "0.1.8" @@ -356,6 +384,14 @@ dependencies = [ "winapi", ] +[[package]] +name = "cranelift" +version = "0.59.0" +dependencies = [ + "cranelift-codegen", + "cranelift-frontend", +] + [[package]] name = "cranelift-bforest" version = "0.59.0" @@ -400,6 +436,36 @@ dependencies = [ "serde", ] +[[package]] +name = "cranelift-faerie" +version = "0.59.0" +dependencies = [ + "anyhow", + "cranelift-codegen", + "cranelift-module", + "faerie", + "goblin", + "target-lexicon", +] + +[[package]] +name = "cranelift-filetests" +version = "0.59.0" +dependencies = [ + "byteorder", + "cranelift-codegen", + "cranelift-native", + "cranelift-preopt", + "cranelift-reader", + "file-per-thread-logger", + "filecheck", + "gimli", + "log", + "memmap", + "num_cpus", + "region", +] + [[package]] name = "cranelift-frontend" version = "0.59.0" @@ -411,6 +477,17 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "cranelift-module" +version = "0.59.0" +dependencies = [ + "cranelift-codegen", + "cranelift-entity", + "hashbrown", + "log", + "thiserror", +] + [[package]] name = "cranelift-native" version = "0.59.0" @@ -420,6 +497,25 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "cranelift-object" +version = "0.59.0" +dependencies = [ + "cranelift-codegen", + "cranelift-module", + "goblin", + "object", + "target-lexicon", +] + +[[package]] +name = "cranelift-preopt" +version = "0.59.0" +dependencies = [ + "cranelift-codegen", + "cranelift-entity", +] + [[package]] name = "cranelift-reader" version = "0.59.0" @@ -428,6 +524,68 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "cranelift-serde" +version = "0.59.0" +dependencies = [ + "clap", + "cranelift-codegen", + "cranelift-reader", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "cranelift-simplejit" +version = "0.59.0" +dependencies = [ + "cranelift", + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "cranelift-module", + "cranelift-native", + "errno", + "libc", + "memmap", + "region", + "target-lexicon", + "winapi", +] + +[[package]] +name = "cranelift-tools" +version = "0.59.0" +dependencies = [ + "capstone", + "cfg-if", + "clap", + "cranelift", + "cranelift-codegen", + "cranelift-entity", + "cranelift-faerie", + "cranelift-filetests", + "cranelift-frontend", + "cranelift-module", + "cranelift-native", + "cranelift-object", + "cranelift-preopt", + "cranelift-reader", + "cranelift-serde", + "cranelift-simplejit", + "cranelift-wasm", + "file-per-thread-logger", + "filecheck", + "indicatif", + "pretty_env_logger", + "serde", + "target-lexicon", + "term", + "walkdir", + "wat", +] + [[package]] name = "cranelift-wasm" version = "0.59.0" @@ -555,6 +713,16 @@ dependencies = [ "dirs-sys", ] +[[package]] +name = "dirs" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +dependencies = [ + "cfg-if", + "dirs-sys", +] + [[package]] name = "dirs-sys" version = "0.3.4" @@ -598,6 +766,12 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + [[package]] name = "env_logger" version = "0.6.2" @@ -860,6 +1034,18 @@ dependencies = [ "autocfg 1.0.0", ] +[[package]] +name = "indicatif" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8572bccfb0665e70b7faf44ee28841b8e0823450cd4ad562a76b5a3c4bf48487" +dependencies = [ + "console", + "lazy_static", + "number_prefix", + "regex", +] + [[package]] name = "indoc" version = "0.3.4" @@ -1150,14 +1336,22 @@ dependencies = [ "libc", ] +[[package]] +name = "number_prefix" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" + [[package]] name = "object" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea44a4fd660ab0f38434934ca0212e90fbeaaee54126ef20a3451c30c95bafae" dependencies = [ + "crc32fast", "flate2", "goblin", + "indexmap", "parity-wasm", "scroll", "target-lexicon", @@ -1555,6 +1749,15 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "scopeguard" version = "1.1.0" @@ -1756,6 +1959,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "term" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0863a3345e70f61d613eab32ee046ccd1bcc5f9105fe402c61fcd0c13eeb8b5" +dependencies = [ + "dirs", + "winapi", +] + [[package]] name = "termcolor" version = "1.1.0" @@ -1765,6 +1978,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "termios" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625" +dependencies = [ + "libc", +] + [[package]] name = "test-programs" version = "0.12.0" @@ -1917,6 +2139,17 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" +[[package]] +name = "walkdir" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + [[package]] name = "walrus" version = "0.15.0" diff --git a/Cargo.toml b/Cargo.toml index 6aa979ad64..16191f5af9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -62,6 +62,7 @@ opt-level = 0 [workspace] members = [ + "cranelift", "crates/fuzzing", "crates/misc/rust", "crates/misc/py",