diff --git a/Cargo.lock b/Cargo.lock
index 2aefb947a1f..c2d458cb8e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -66,30 +66,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "cranelift"
 version = "0.49.0"
-source = "git+https://github.com/CraneStation/cranelift.git#5d617f5e96dd91d87c5af38cf7fb8eae547c29a3"
+source = "git+https://github.com/bytecodealliance/cranelift/#047e1eed82080299ed160344d2ee11a4af2de8eb"
 dependencies = [
- "cranelift-codegen 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-frontend 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-codegen 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
+ "cranelift-frontend 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
 ]
 
 [[package]]
 name = "cranelift-bforest"
 version = "0.49.0"
-source = "git+https://github.com/CraneStation/cranelift.git#5d617f5e96dd91d87c5af38cf7fb8eae547c29a3"
+source = "git+https://github.com/bytecodealliance/cranelift/#047e1eed82080299ed160344d2ee11a4af2de8eb"
 dependencies = [
- "cranelift-entity 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-entity 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
 ]
 
 [[package]]
 name = "cranelift-codegen"
 version = "0.49.0"
-source = "git+https://github.com/CraneStation/cranelift.git#5d617f5e96dd91d87c5af38cf7fb8eae547c29a3"
+source = "git+https://github.com/bytecodealliance/cranelift/#047e1eed82080299ed160344d2ee11a4af2de8eb"
 dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "cranelift-bforest 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-codegen-meta 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-codegen-shared 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-entity 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-bforest 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
+ "cranelift-codegen-meta 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
+ "cranelift-codegen-shared 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
+ "cranelift-entity 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -99,29 +99,33 @@ dependencies = [
 [[package]]
 name = "cranelift-codegen-meta"
 version = "0.49.0"
-source = "git+https://github.com/CraneStation/cranelift.git#5d617f5e96dd91d87c5af38cf7fb8eae547c29a3"
+source = "git+https://github.com/bytecodealliance/cranelift/#047e1eed82080299ed160344d2ee11a4af2de8eb"
 dependencies = [
- "cranelift-codegen-shared 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-entity 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-codegen-shared 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
+ "cranelift-entity 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
 version = "0.49.0"
-source = "git+https://github.com/CraneStation/cranelift.git#5d617f5e96dd91d87c5af38cf7fb8eae547c29a3"
+source = "git+https://github.com/bytecodealliance/cranelift/#047e1eed82080299ed160344d2ee11a4af2de8eb"
+dependencies = [
+ "packed_struct 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "packed_struct_codegen 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "cranelift-entity"
 version = "0.49.0"
-source = "git+https://github.com/CraneStation/cranelift.git#5d617f5e96dd91d87c5af38cf7fb8eae547c29a3"
+source = "git+https://github.com/bytecodealliance/cranelift/#047e1eed82080299ed160344d2ee11a4af2de8eb"
 
 [[package]]
 name = "cranelift-faerie"
 version = "0.49.0"
-source = "git+https://github.com/CraneStation/cranelift.git#5d617f5e96dd91d87c5af38cf7fb8eae547c29a3"
+source = "git+https://github.com/bytecodealliance/cranelift/#047e1eed82080299ed160344d2ee11a4af2de8eb"
 dependencies = [
- "cranelift-codegen 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-module 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-codegen 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
+ "cranelift-module 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
  "faerie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "goblin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -131,9 +135,9 @@ dependencies = [
 [[package]]
 name = "cranelift-frontend"
 version = "0.49.0"
-source = "git+https://github.com/CraneStation/cranelift.git#5d617f5e96dd91d87c5af38cf7fb8eae547c29a3"
+source = "git+https://github.com/bytecodealliance/cranelift/#047e1eed82080299ed160344d2ee11a4af2de8eb"
 dependencies = [
- "cranelift-codegen 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-codegen 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -142,10 +146,10 @@ dependencies = [
 [[package]]
 name = "cranelift-module"
 version = "0.49.0"
-source = "git+https://github.com/CraneStation/cranelift.git#5d617f5e96dd91d87c5af38cf7fb8eae547c29a3"
+source = "git+https://github.com/bytecodealliance/cranelift/#047e1eed82080299ed160344d2ee11a4af2de8eb"
 dependencies = [
- "cranelift-codegen 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-entity 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-codegen 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
+ "cranelift-entity 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "thiserror 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -153,9 +157,9 @@ dependencies = [
 [[package]]
 name = "cranelift-native"
 version = "0.49.0"
-source = "git+https://github.com/CraneStation/cranelift.git#5d617f5e96dd91d87c5af38cf7fb8eae547c29a3"
+source = "git+https://github.com/bytecodealliance/cranelift/#047e1eed82080299ed160344d2ee11a4af2de8eb"
 dependencies = [
- "cranelift-codegen 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-codegen 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
  "raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -163,10 +167,10 @@ dependencies = [
 [[package]]
 name = "cranelift-object"
 version = "0.49.0"
-source = "git+https://github.com/CraneStation/cranelift.git#5d617f5e96dd91d87c5af38cf7fb8eae547c29a3"
+source = "git+https://github.com/bytecodealliance/cranelift/#047e1eed82080299ed160344d2ee11a4af2de8eb"
 dependencies = [
- "cranelift-codegen 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-module 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-codegen 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
+ "cranelift-module 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
  "object 0.15.0 (git+https://github.com/gimli-rs/object?rev=cba3ed4932e4c594c5eab4f5ef6c51838f4a5056)",
  "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -174,11 +178,11 @@ dependencies = [
 [[package]]
 name = "cranelift-simplejit"
 version = "0.49.0"
-source = "git+https://github.com/CraneStation/cranelift.git#5d617f5e96dd91d87c5af38cf7fb8eae547c29a3"
+source = "git+https://github.com/bytecodealliance/cranelift/#047e1eed82080299ed160344d2ee11a4af2de8eb"
 dependencies = [
- "cranelift-codegen 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-module 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-native 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift-codegen 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
+ "cranelift-module 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
+ "cranelift-native 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
  "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
  "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -355,6 +359,25 @@ dependencies = [
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "packed_struct"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "packed_struct_codegen"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "packed_struct 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "plain"
 version = "0.2.3"
@@ -368,6 +391,11 @@ dependencies = [
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "quote"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "quote"
 version = "1.0.2"
@@ -408,11 +436,11 @@ version = "0.1.0"
 dependencies = [
  "ar 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "cranelift 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-faerie 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-module 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-object 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
- "cranelift-simplejit 0.49.0 (git+https://github.com/CraneStation/cranelift.git)",
+ "cranelift 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
+ "cranelift-faerie 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
+ "cranelift-module 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
+ "cranelift-object 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
+ "cranelift-simplejit 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)",
  "faerie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -466,6 +494,16 @@ name = "serde"
 version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "serde_derive"
+version = "1.0.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "smallvec"
 version = "1.0.0"
@@ -484,6 +522,16 @@ dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "syn"
+version = "0.11.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.7"
@@ -494,6 +542,14 @@ dependencies = [
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "synom"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "synstructure"
 version = "0.12.1"
@@ -528,6 +584,11 @@ dependencies = [
  "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "unicode-xid"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.0"
@@ -568,18 +629,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
 "checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c"
 "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-"checksum cranelift 0.49.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-bforest 0.49.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-codegen 0.49.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-codegen-meta 0.49.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-codegen-shared 0.49.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-entity 0.49.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-faerie 0.49.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-frontend 0.49.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-module 0.49.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-native 0.49.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-object 0.49.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
-"checksum cranelift-simplejit 0.49.0 (git+https://github.com/CraneStation/cranelift.git)" = "<none>"
+"checksum cranelift 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)" = "<none>"
+"checksum cranelift-bforest 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)" = "<none>"
+"checksum cranelift-codegen 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)" = "<none>"
+"checksum cranelift-codegen-meta 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)" = "<none>"
+"checksum cranelift-codegen-shared 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)" = "<none>"
+"checksum cranelift-entity 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)" = "<none>"
+"checksum cranelift-faerie 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)" = "<none>"
+"checksum cranelift-frontend 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)" = "<none>"
+"checksum cranelift-module 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)" = "<none>"
+"checksum cranelift-native 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)" = "<none>"
+"checksum cranelift-object 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)" = "<none>"
+"checksum cranelift-simplejit 0.49.0 (git+https://github.com/bytecodealliance/cranelift/)" = "<none>"
 "checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 "checksum errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e"
 "checksum errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067"
@@ -599,8 +660,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625"
 "checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 "checksum object 0.15.0 (git+https://github.com/gimli-rs/object?rev=cba3ed4932e4c594c5eab4f5ef6c51838f4a5056)" = "<none>"
+"checksum packed_struct 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "90caf80e74380d94f2aabc83edb900b49123b3132442fb147f9155c87a756281"
+"checksum packed_struct_codegen 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f6fda15ebe37b7b28889bd4aa75bb134652eaec9eb99d1bf02f806fca4357fc"
 "checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 "checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
+"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
 "checksum raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4a349ca83373cfa5d6dbb66fd76e58b2cca08da71a5f6400de0a0a6a9bceeaf"
 "checksum region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "448e868c6e4cfddfa49b6a72c95906c04e8547465e9536575b95c70a4044f856"
@@ -611,14 +675,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0"
+"checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8"
 "checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum string-interner 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd710eadff449a1531351b0e43eb81ea404336fa2f56c777427ab0e32a4cf183"
+"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
 "checksum syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7bedb3320d0f3035594b0b723c8a28d7d336a3eda3881db79e61d676fb644c"
+"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
 "checksum synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203"
 "checksum target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f4c118a7a38378f305a9e111fcb2f7f838c0be324bfb31a77ea04f7f6e684b4"
 "checksum thiserror 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9fe148fa0fc3363a27092d48f7787363ded15bb8623c5d5dd4e2e9f23e4b21bc"
 "checksum thiserror-impl 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "258da67e99e590650fa541ac6be764313d23e80cefb6846b516deb8de6b6d921"
+"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 "checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
diff --git a/Cargo.toml b/Cargo.toml
index 320f15f245a..5c980c40a3c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,10 +14,10 @@ backend_object = ["object/write", "cranelift-object"]
 
 [dependencies]
 # These have to be in sync with each other
-cranelift = { git = "https://github.com/CraneStation/cranelift.git", default-features = false, features = ["std"] }
-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 }
+cranelift = { git = "https://github.com/bytecodealliance/cranelift/", default-features = false, features = ["std"] }
+cranelift-module = { git = "https://github.com/bytecodealliance/cranelift/" }
+cranelift-faerie = { git = "https://github.com/bytecodealliance/cranelift/" }
+cranelift-object = { git = "https://github.com/bytecodealliance/cranelift/", optional = true }
 target-lexicon = "0.9.0"
 faerie = "0.12.0"
 
@@ -39,7 +39,7 @@ default-features = false
 features = ["compression", "read", "std"] # We don't need WASM support
 
 # Uncomment to use local checkout of cranelift
-#[patch."https://github.com/CraneStation/cranelift.git"]
+#[patch."https://github.com/bytecodealliance/cranelift/"]
 #cranelift = { path = "../cranelift/cranelift-umbrella", default-features = false, features = ["std"] }
 #cranelift-module = { path = "../cranelift/cranelift-module" }
 #cranelift-simplejit = { path = "../cranelift/cranelift-simplejit" }
@@ -50,7 +50,7 @@ features = ["compression", "read", "std"] # We don't need WASM support
 #gimli = { path = "../" }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-cranelift-simplejit = { git = "https://github.com/CraneStation/cranelift.git" }
+cranelift-simplejit = { git = "https://github.com/bytecodealliance/cranelift/" }
 
 [profile.dev]
 # By compiling dependencies with optimizations, performing tests gets much faster.