Skip to content

Commit

Permalink
Auto merge of rust-lang#109771 - uweigand:s390x-miri-libffi, r=oli-obk
Browse files Browse the repository at this point in the history
Increase libffi version to 3.2 to support s390x

libffi versions prior to 3.2 have no support for s390x, causing the Miri build to fail on our platform.
  • Loading branch information
bors committed Apr 3, 2023
2 parents bf41e75 + 09541b5 commit 48829ea
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2950,19 +2950,19 @@ dependencies = [

[[package]]
name = "libffi"
version = "3.0.1"
version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e454b3efb16fba3b17810ae5e41df02b649e564ab3c5a34b3b93ed07ad287e6"
checksum = "ce826c243048e3d5cec441799724de52e2d42f820468431fc3fceee2341871e2"
dependencies = [
"libc",
"libffi-sys",
]

[[package]]
name = "libffi-sys"
version = "2.0.0"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab4106b7f09d7b87d021334d5618fac1dfcfb824d4c5fe111ff0074dfd242e15"
checksum = "dc65067b78c0fc069771e8b9a9e02df71e08858bec92c1f101377c67b9dca7c7"
dependencies = [
"cc",
]
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ measureme = "10.0.0"
libc = "0.2"

[target.'cfg(target_os = "linux")'.dependencies]
libffi = "3.0.0"
libffi = "3.2.0"
libloading = "0.7"

[dev-dependencies]
Expand Down

0 comments on commit 48829ea

Please sign in to comment.