Update for the merge of Cranelift into Wasmtime

This commit is contained in:
bjorn3 2020-02-29 14:24:29 +01:00
parent d07767b5c1
commit dc1165300d
2 changed files with 21 additions and 21 deletions

20
Cargo.lock generated
View File

@ -39,7 +39,7 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]]
name = "cranelift-bforest"
version = "0.59.0"
source = "git+https://github.com/bytecodealliance/cranelift/#1d144eeacffb1997cc567b7d518f195932ee3d92"
source = "git+https://github.com/bytecodealliance/wasmtime/#2c5be49af0a2dca6e116010e57720eacddb14e0f"
dependencies = [
"cranelift-entity",
]
@ -47,7 +47,7 @@ dependencies = [
[[package]]
name = "cranelift-codegen"
version = "0.59.0"
source = "git+https://github.com/bytecodealliance/cranelift/#1d144eeacffb1997cc567b7d518f195932ee3d92"
source = "git+https://github.com/bytecodealliance/wasmtime/#2c5be49af0a2dca6e116010e57720eacddb14e0f"
dependencies = [
"byteorder",
"cranelift-bforest",
@ -64,7 +64,7 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
version = "0.59.0"
source = "git+https://github.com/bytecodealliance/cranelift/#1d144eeacffb1997cc567b7d518f195932ee3d92"
source = "git+https://github.com/bytecodealliance/wasmtime/#2c5be49af0a2dca6e116010e57720eacddb14e0f"
dependencies = [
"cranelift-codegen-shared",
"cranelift-entity",
@ -73,17 +73,17 @@ dependencies = [
[[package]]
name = "cranelift-codegen-shared"
version = "0.59.0"
source = "git+https://github.com/bytecodealliance/cranelift/#1d144eeacffb1997cc567b7d518f195932ee3d92"
source = "git+https://github.com/bytecodealliance/wasmtime/#2c5be49af0a2dca6e116010e57720eacddb14e0f"
[[package]]
name = "cranelift-entity"
version = "0.59.0"
source = "git+https://github.com/bytecodealliance/cranelift/#1d144eeacffb1997cc567b7d518f195932ee3d92"
source = "git+https://github.com/bytecodealliance/wasmtime/#2c5be49af0a2dca6e116010e57720eacddb14e0f"
[[package]]
name = "cranelift-frontend"
version = "0.59.0"
source = "git+https://github.com/bytecodealliance/cranelift/#1d144eeacffb1997cc567b7d518f195932ee3d92"
source = "git+https://github.com/bytecodealliance/wasmtime/#2c5be49af0a2dca6e116010e57720eacddb14e0f"
dependencies = [
"cranelift-codegen",
"log",
@ -94,7 +94,7 @@ dependencies = [
[[package]]
name = "cranelift-module"
version = "0.59.0"
source = "git+https://github.com/bytecodealliance/cranelift/#1d144eeacffb1997cc567b7d518f195932ee3d92"
source = "git+https://github.com/bytecodealliance/wasmtime/#2c5be49af0a2dca6e116010e57720eacddb14e0f"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@ -105,7 +105,7 @@ dependencies = [
[[package]]
name = "cranelift-native"
version = "0.59.0"
source = "git+https://github.com/bytecodealliance/cranelift/#1d144eeacffb1997cc567b7d518f195932ee3d92"
source = "git+https://github.com/bytecodealliance/wasmtime/#2c5be49af0a2dca6e116010e57720eacddb14e0f"
dependencies = [
"cranelift-codegen",
"raw-cpuid",
@ -115,7 +115,7 @@ dependencies = [
[[package]]
name = "cranelift-object"
version = "0.59.0"
source = "git+https://github.com/bytecodealliance/cranelift/#1d144eeacffb1997cc567b7d518f195932ee3d92"
source = "git+https://github.com/bytecodealliance/wasmtime/#2c5be49af0a2dca6e116010e57720eacddb14e0f"
dependencies = [
"cranelift-codegen",
"cranelift-module",
@ -127,7 +127,7 @@ dependencies = [
[[package]]
name = "cranelift-simplejit"
version = "0.59.0"
source = "git+https://github.com/bytecodealliance/cranelift/#1d144eeacffb1997cc567b7d518f195932ee3d92"
source = "git+https://github.com/bytecodealliance/wasmtime/#2c5be49af0a2dca6e116010e57720eacddb14e0f"
dependencies = [
"cranelift-codegen",
"cranelift-module",

View File

@ -9,10 +9,10 @@ crate-type = ["dylib"]
[dependencies]
# These have to be in sync with each other
cranelift-codegen = { git = "https://github.com/bytecodealliance/cranelift/" }
cranelift-frontend = { git = "https://github.com/bytecodealliance/cranelift/" }
cranelift-module = { git = "https://github.com/bytecodealliance/cranelift/" }
cranelift-object = { git = "https://github.com/bytecodealliance/cranelift/" }
cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime/" }
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"
@ -30,18 +30,18 @@ default-features = false
features = ["write"] # We don't need read support
# Uncomment to use local checkout of cranelift
#[patch."https://github.com/bytecodealliance/cranelift/"]
#cranelift-codegen = { path = "../cranelift/cranelift-codegen" }
#cranelift-frontend = { path = "../cranelift/cranelift-frontend" }
#cranelift-module = { path = "../cranelift/cranelift-module" }
#cranelift-simplejit = { path = "../cranelift/cranelift-simplejit" }
#cranelift-object = { path = "../cranelift/cranelift-object" }
#[patch."https://github.com/bytecodealliance/wasmtime/"]
#cranelift-codegen = { path = "../wasmtime/cranelift/cranelift-codegen" }
#cranelift-frontend = { path = "../wasmtime/cranelift/cranelift-frontend" }
#cranelift-module = { path = "../wasmtime/cranelift/cranelift-module" }
#cranelift-simplejit = { path = "../wasmtime/cranelift/cranelift-simplejit" }
#cranelift-object = { path = "../wasmtime/cranelift/cranelift-object" }
#[patch.crates-io]
#gimli = { path = "../" }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
cranelift-simplejit = { git = "https://github.com/bytecodealliance/cranelift/" }
cranelift-simplejit = { git = "https://github.com/bytecodealliance/wasmtime/" }
libloading = "0.5.1"
[profile.dev]