Update Cranelift

diff --git a/Cargo.lock b/Cargo.lock
index f54157234da636cf32bdd6ace42004475434c29b..55ea61170f24d253788fd0d1c3b8abc741b8fd41 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -44,7 +44,7 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 [[package]]
 name = "cranelift-bforest"
 version = "0.66.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#693c6ea7715060950702d85f2dcf16627026b0da"
+source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#32db4dcbe98098e5be2e457339d6d1946c73225c"
 dependencies = [
  "cranelift-entity",
 ]
@@ -52,7 +52,7 @@ dependencies = [
 [[package]]
 name = "cranelift-codegen"
 version = "0.66.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#693c6ea7715060950702d85f2dcf16627026b0da"
+source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#32db4dcbe98098e5be2e457339d6d1946c73225c"
 dependencies = [
  "byteorder",
  "cranelift-bforest",
@@ -70,7 +70,7 @@ dependencies = [
 [[package]]
 name = "cranelift-codegen-meta"
 version = "0.66.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#693c6ea7715060950702d85f2dcf16627026b0da"
+source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#32db4dcbe98098e5be2e457339d6d1946c73225c"
 dependencies = [
  "cranelift-codegen-shared",
  "cranelift-entity",
@@ -79,17 +79,17 @@ dependencies = [
 [[package]]
 name = "cranelift-codegen-shared"
 version = "0.66.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#693c6ea7715060950702d85f2dcf16627026b0da"
+source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#32db4dcbe98098e5be2e457339d6d1946c73225c"
 
 [[package]]
 name = "cranelift-entity"
 version = "0.66.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#693c6ea7715060950702d85f2dcf16627026b0da"
+source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#32db4dcbe98098e5be2e457339d6d1946c73225c"
 
 [[package]]
 name = "cranelift-frontend"
 version = "0.66.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#693c6ea7715060950702d85f2dcf16627026b0da"
+source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#32db4dcbe98098e5be2e457339d6d1946c73225c"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -100,7 +100,7 @@ dependencies = [
 [[package]]
 name = "cranelift-module"
 version = "0.66.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#693c6ea7715060950702d85f2dcf16627026b0da"
+source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#32db4dcbe98098e5be2e457339d6d1946c73225c"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -112,7 +112,7 @@ dependencies = [
 [[package]]
 name = "cranelift-native"
 version = "0.66.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#693c6ea7715060950702d85f2dcf16627026b0da"
+source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#32db4dcbe98098e5be2e457339d6d1946c73225c"
 dependencies = [
  "cranelift-codegen",
  "raw-cpuid",
@@ -122,7 +122,7 @@ dependencies = [
 [[package]]
 name = "cranelift-object"
 version = "0.66.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#693c6ea7715060950702d85f2dcf16627026b0da"
+source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#32db4dcbe98098e5be2e457339d6d1946c73225c"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -134,7 +134,7 @@ dependencies = [
 [[package]]
 name = "cranelift-simplejit"
 version = "0.66.0"
-source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#693c6ea7715060950702d85f2dcf16627026b0da"
+source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#32db4dcbe98098e5be2e457339d6d1946c73225c"
 dependencies = [
  "cranelift-codegen",
  "cranelift-module",
@@ -371,9 +371,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d"
+checksum = "fe2635952a442a01fd4cb53d98858b5e4bb461b02c0d111f22f31772e3e7a8b2"
 
 [[package]]
 name = "thiserror"

diff --git a/Cargo.toml b/Cargo.toml
index 60f9a29960f63962f96dabf86da10abe8bf01e40..d57556ef1912bb72d647ab520c66ca1bd5b3b5c9 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime/", br
 cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main" }
 cranelift-simplejit = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main", optional = true }
 cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main" }
-target-lexicon = "0.10.0"
+target-lexicon = "0.11.0"
 gimli = { version = "0.21.0", default-features = false, features = ["write"]}
 object = { version = "0.21.1", default-features = false, features = ["std", "read_core", "write", "coff", "elf", "macho", "pe"] }
 

diff --git a/src/backend.rs b/src/backend.rs
index 0d654aed160ca2f68835180c05eb80d5dc194f76..bf4e8d6e02ea1ad182f467ab135f4a3d1a14da46 100644 (file)
--- a/src/backend.rs
+++ b/src/backend.rs
@@ -159,13 +159,10 @@ pub(crate) fn with_object(sess: &Session, name: &str, f: impl FnOnce(&mut Object
         target_lexicon::BinaryFormat::Elf => object::BinaryFormat::Elf,
         target_lexicon::BinaryFormat::Coff => object::BinaryFormat::Coff,
         target_lexicon::BinaryFormat::Macho => object::BinaryFormat::MachO,
-        target_lexicon::BinaryFormat::Wasm => sess.fatal("binary format wasm is unsupported"),
-        target_lexicon::BinaryFormat::Unknown => sess.fatal("binary format is unknown"),
+        binary_format => sess.fatal(&format!("binary format {} is unsupported", binary_format)),
     };
     let architecture = match triple.architecture {
-        target_lexicon::Architecture::I386
-        | target_lexicon::Architecture::I586
-        | target_lexicon::Architecture::I686 => object::Architecture::I386,
+        target_lexicon::Architecture::X86_32(_) => object::Architecture::I386,
         target_lexicon::Architecture::X86_64 => object::Architecture::X86_64,
         target_lexicon::Architecture::Arm(_) => object::Architecture::Arm,
         target_lexicon::Architecture::Aarch64(_) => object::Architecture::Aarch64,