Skip to content

Commit 48829ea

Browse files
committedApr 3, 2023
Auto merge of rust-lang#109771 - uweigand:s390x-miri-libffi, r=oli-obk
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.
2 parents bf41e75 + 09541b5 commit 48829ea

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed
 

‎Cargo.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -2950,19 +2950,19 @@ dependencies = [
29502950

29512951
[[package]]
29522952
name = "libffi"
2953-
version = "3.0.1"
2953+
version = "3.2.0"
29542954
source = "registry+https://github.com/rust-lang/crates.io-index"
2955-
checksum = "1e454b3efb16fba3b17810ae5e41df02b649e564ab3c5a34b3b93ed07ad287e6"
2955+
checksum = "ce826c243048e3d5cec441799724de52e2d42f820468431fc3fceee2341871e2"
29562956
dependencies = [
29572957
"libc",
29582958
"libffi-sys",
29592959
]
29602960

29612961
[[package]]
29622962
name = "libffi-sys"
2963-
version = "2.0.0"
2963+
version = "2.2.1"
29642964
source = "registry+https://github.com/rust-lang/crates.io-index"
2965-
checksum = "ab4106b7f09d7b87d021334d5618fac1dfcfb824d4c5fe111ff0074dfd242e15"
2965+
checksum = "dc65067b78c0fc069771e8b9a9e02df71e08858bec92c1f101377c67b9dca7c7"
29662966
dependencies = [
29672967
"cc",
29682968
]

‎src/tools/miri/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ measureme = "10.0.0"
3434
libc = "0.2"
3535

3636
[target.'cfg(target_os = "linux")'.dependencies]
37-
libffi = "3.0.0"
37+
libffi = "3.2.0"
3838
libloading = "0.7"
3939

4040
[dev-dependencies]

0 commit comments

Comments
 (0)
Please sign in to comment.