rustc_target: Use rustc_abi instead of cfg_abi to detect powerpcspe

Author: taiki-e

compiler/rustc_target/src/asm/mod.rs

@@ -5,7 +5,7 @@ use rustc_data_structures::fx::{FxHashMap, FxIndexSet};
 use rustc_macros::{Decodable, Encodable, StableHash};
 use rustc_span::Symbol;
 
-use crate::spec::{Arch, CfgAbi, RelocModel, Target};
+use crate::spec::{Arch, RelocModel, Target};
 
 pub struct ModifierInfo {
     pub modifier: char,
@@ -1001,7 +1001,7 @@ impl InlineAsmClobberAbi {
                 _ => Err(&["C", "system", "efiapi"]),
             },
             InlineAsmArch::PowerPC | InlineAsmArch::PowerPC64 => match name {
-                "C" | "system" => Ok(if target.cfg_abi == CfgAbi::Spe {
+                "C" | "system" => Ok(if powerpc::is_spe(target) {
                     InlineAsmClobberAbi::PowerPCSPE
                 } else {
                     InlineAsmClobberAbi::PowerPC

compiler/rustc_target/src/asm/powerpc.rs

@@ -4,7 +4,7 @@ use rustc_data_structures::fx::FxIndexSet;
 use rustc_span::Symbol;
 
 use super::{InlineAsmArch, InlineAsmType, ModifierInfo};
-use crate::spec::{CfgAbi, RelocModel, Target};
+use crate::spec::{CfgAbi, RelocModel, RustcAbi, Target};
 
 def_reg_class! {
     PowerPC PowerPCInlineAsmRegClass {
@@ -115,18 +115,18 @@ fn reserved_v20to31(
     }
 }
 
+pub(crate) fn is_spe(target: &Target) -> bool {
+    target.rustc_abi == Some(RustcAbi::PowerPcSpe)
+}
+
 fn spe_acc_target_check(
     _arch: InlineAsmArch,
     _reloc_model: RelocModel,
     _target_features: &FxIndexSet<Symbol>,
     target: &Target,
     _is_clobber: bool,
 ) -> Result<(), &'static str> {
-    if target.cfg_abi == CfgAbi::Spe {
-        Ok(())
-    } else {
-        Err("spe_acc is only available on spe targets")
-    }
+    if is_spe(target) { Ok(()) } else { Err("spe_acc is only available on spe targets") }
 }
 
 def_regs! {