Skip to content

powerpc64-ibm-aix: fix cfg(target_abi) value #162325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 2 commits into from
Sep 22, 2026
Merged

powerpc64-ibm-aix: fix cfg(target_abi) value #162325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22e16a4
powerpc64-ibm-aix: fix cfg(target_abi) value
RalfJung Sep 5, 2026
7dc9aee
remove incorrect cfg_abi check from asm/powerpc; that makes CfgAbi::V…
RalfJung Sep 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions compiler/rustc_target/src/asm/powerpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use rustc_data_structures::fx::FxIndexSet;
use rustc_span::Symbol;

use super::{InlineAsmArch, InlineAsmType, ModifierInfo};
use crate::spec::{CfgAbi, RelocModel, RustcAbi, Target};
use crate::spec::{RelocModel, RustcAbi, Target};

def_reg_class! {
PowerPC PowerPCInlineAsmRegClass {
Expand Down Expand Up @@ -107,11 +107,8 @@ fn reserved_v20to31(
_is_clobber: bool,
) -> Result<(), &'static str> {
if target.is_like_aix {
match &target.options.cfg_abi {
CfgAbi::VecDefault => Err("v20-v31 (vs52-vs63) are reserved on vec-default ABI"),
CfgAbi::VecExtAbi => Ok(()),
abi => unreachable!("unrecognized AIX ABI: {abi}"),
}
// We do not support the vec-extabi at the moment.
Err("v20-v31 (vs52-vs63) are reserved on vec-default ABI")
} else {
Ok(())
}
Expand Down
8 changes: 7 additions & 1 deletion compiler/rustc_target/src/spec/base/aix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ use crate::spec::{

pub(crate) fn opts() -> TargetOptions {
TargetOptions {
cfg_abi: CfgAbi::VecExtAbi,
// It makes no sense to set "vec-extabi" here without also actually configuring LLVM to use
// that ABI. Since https://github.com/llvm/llvm-project/pull/221670 this probably just needs
// `llvm_abiname` to be set properly. If you are doing that, make sure to also:
// - adjust the logic in `reserved_v20to31` in `asm/powerpc.rs` to allow the extra registers
// to be used depending on `llvm_abiname`.
// - adjust the logic in `spec/consistency.rs` to correlate `llvm_abiname` with `cfg_abi`.
cfg_abi: CfgAbi::VecDefault,
code_model: Some(CodeModel::Large),
cpu: "pwr7".into(),
os: Os::Aix,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/consistency.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ impl Target {
// (vec-default vs vec-ext).
check_matches!(
(&self.llvm_abiname, &self.cfg_abi),
(LlvmAbi::Unspecified, CfgAbi::VecDefault | CfgAbi::VecExtAbi),
(LlvmAbi::Unspecified, CfgAbi::VecDefault),
"invalid PowerPC64 AIX ABI name and `cfg(target_abi)` combination:\n\
ABI name: {}\n\
cfg(target_abi): {}",
Expand Down
1 change: 0 additions & 1 deletion compiler/rustc_target/src/spec/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1950,7 +1950,6 @@ crate::target_spec_enum! {
Spe = "spe",
Uwp = "uwp",
VecDefault = "vec-default",
VecExtAbi = "vec-extabi",
X32 = "x32",
V8Plus = "v8plus",
Unspecified = "",
Expand Down
Loading
Loading