Skip to content

Commit 7a60a7e

Browse files
authored
Rollup merge of #130868 - taiki-e:s390x-fixme, r=jieyouxu
Update FIXME comment in s390x_unknown_linux_*.rs - Remove comment about "LLVM < 16" since the minimum external LLVM version is 16+ since #117947 - Reflect rename of cabi_s390x.rs in 030244c (renamed to [abi/call/s390x.rs](030244c#diff-20136d4a18fa0ef9bd4fc2e6f92e88daad6be88bfb156e5702af39ee87ca4879), and it is currently [still in the same location](https://github.com/rust-lang/rust/blob/9e394f551c050ff03c6fc57f190e0761cf0be6e8/compiler/rustc_target/src/abi/call/s390x.rs)). r? `@cuviper` `@rustbot` label +O-SystemZ
2 parents 71dd2e9 + 1bef68c commit 7a60a7e

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ pub(crate) fn target() -> Target {
66
base.endian = Endian::Big;
77
// z10 is the oldest CPU supported by LLVM
88
base.cpu = "z10".into();
9-
// FIXME: The ABI implementation in cabi_s390x.rs is for now hard-coded to assume the no-vector
10-
// ABI. Pass the -vector feature string to LLVM to respect this assumption. On LLVM < 16, we
11-
// also strip v128 from the data_layout below to match the older LLVM's expectation.
9+
// FIXME: The ABI implementation in abi/call/s390x.rs is for now hard-coded to assume the no-vector
10+
// ABI. Pass the -vector feature string to LLVM to respect this assumption.
1211
base.features = "-vector".into();
1312
base.max_atomic_width = Some(128);
1413
base.min_global_align = Some(16);

compiler/rustc_target/src/spec/targets/s390x_unknown_linux_musl.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ pub(crate) fn target() -> Target {
66
base.endian = Endian::Big;
77
// z10 is the oldest CPU supported by LLVM
88
base.cpu = "z10".into();
9-
// FIXME: The ABI implementation in cabi_s390x.rs is for now hard-coded to assume the no-vector
10-
// ABI. Pass the -vector feature string to LLVM to respect this assumption. On LLVM < 16, we
11-
// also strip v128 from the data_layout below to match the older LLVM's expectation.
9+
// FIXME: The ABI implementation in abi/call/s390x.rs is for now hard-coded to assume the no-vector
10+
// ABI. Pass the -vector feature string to LLVM to respect this assumption.
1211
base.features = "-vector".into();
1312
base.max_atomic_width = Some(128);
1413
base.min_global_align = Some(16);

0 commit comments

Comments
 (0)