Use target_env = "musl" & target_abi = "pauthtest"

jchlanda · jchlanda · commit e0c6f736fcff · 2026-05-13T11:47:16.000Z
diff --git a/compiler/rustc_codegen_llvm/src/attributes.rs b/compiler/rustc_codegen_llvm/src/attributes.rs
@@ -9,7 +9,9 @@ use rustc_middle::ty::{self, TyCtxt};
 use rustc_session::config::{BranchProtection, FunctionReturn, OptLevel, PAuthKey, PacRet};
 use rustc_span::sym;
 use rustc_symbol_mangling::mangle_internal_symbol;
-use rustc_target::spec::{Arch, Env, FramePointer, SanitizerSet, StackProbeType, StackProtector};
+use rustc_target::spec::{
+    Arch, CfgAbi, FramePointer, SanitizerSet, StackProbeType, StackProtector,
+};
 use smallvec::SmallVec;
 
 use crate::common::pauth_fn_attrs;
@@ -606,7 +608,7 @@ pub(crate) fn llfn_attrs_from_instance<'ll, 'tcx>(
         }
     }
 
-    if sess.target.env == Env::Pauthtest {
+    if sess.target.cfg_abi == CfgAbi::Pauthtest {
         for &ptrauth_attr in pauth_fn_attrs() {
             to_add.push(llvm::CreateAttrString(cx.llcx, ptrauth_attr));
         }
diff --git a/compiler/rustc_codegen_llvm/src/base.rs b/compiler/rustc_codegen_llvm/src/base.rs
@@ -25,7 +25,7 @@ use rustc_middle::mono::Visibility;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::config::{DebugInfo, Offload};
 use rustc_span::Symbol;
-use rustc_target::spec::{Env, SanitizerSet};
+use rustc_target::spec::{CfgAbi, SanitizerSet};
 
 use super::ModuleLlvm;
 use crate::attributes;
@@ -127,7 +127,7 @@ pub(crate) fn compile_codegen_unit(
                 let mut attrs = attributes::sanitize_attrs(&cx, tcx, SanitizerFnAttrs::default());
                 // When pointer authentication is enabled, ensure that the ptrauth-* attributes are
                 // also attached to the entry wrapper.
-                if cx.sess().target.env == Env::Pauthtest {
+                if cx.sess().target.cfg_abi == CfgAbi::Pauthtest {
                     for &ptrauth_attr in pauth_fn_attrs() {
                         attrs.push(llvm::CreateAttrString(cx.llcx, ptrauth_attr));
                     }
@@ -148,14 +148,14 @@ pub(crate) fn compile_codegen_unit(
                 cx.add_objc_module_flags();
             }
 
-            if cx.sess().target.env == Env::Pauthtest {
+            if cx.sess().target.cfg_abi == CfgAbi::Pauthtest {
                 // FIXME(jchlanda): In LLVM/Clang, there are also `aarch64-elf-pauthabi-platform`
                 // and `aarch64-elf-pauthabi-version` module flags. These are emitted into the
                 // PAuth core info section of the resulting ELF, which the linker uses to enforce
                 // binary compatibility.
                 //
                 // We intentionally do not emit these flags now, since only a subset of features
-                // included in pauthtest ABI is currently supported. By default, the absence of
+                // included in clang's pauthtest is currently supported. By default, the absence of
                 // this info is treated as compatible with any binary.
                 //
                 // Please note, that this would cause compatibility issues, specifically runtime
diff --git a/compiler/rustc_codegen_llvm/src/builder.rs b/compiler/rustc_codegen_llvm/src/builder.rs
@@ -25,7 +25,7 @@ use rustc_sanitizers::{cfi, kcfi};
 use rustc_session::config::OptLevel;
 use rustc_span::Span;
 use rustc_target::callconv::{FnAbi, PassMode};
-use rustc_target::spec::{Arch, Env, HasTargetSpec, SanitizerSet, Target};
+use rustc_target::spec::{Arch, CfgAbi, HasTargetSpec, SanitizerSet, Target};
 use smallvec::SmallVec;
 use tracing::{debug, instrument};
 
@@ -1987,7 +1987,7 @@ impl<'a, 'll, 'tcx> Builder<'a, 'll, 'tcx> {
         llfn: &'ll Value,
         fn_abi: Option<&FnAbi<'tcx, Ty<'tcx>>>,
     ) -> Option<llvm::OperandBundleBox<'ll>> {
-        if self.sess().target.env != Env::Pauthtest {
+        if self.sess().target.cfg_abi != CfgAbi::Pauthtest {
             return None;
         }
         // Pointer authentication support is currently limited to extern "C" calls; filter out other
diff --git a/compiler/rustc_codegen_llvm/src/common.rs b/compiler/rustc_codegen_llvm/src/common.rs
@@ -16,7 +16,7 @@ use rustc_middle::bug;
 use rustc_middle::mir::interpret::{GlobalAlloc, PointerArithmetic, Scalar};
 use rustc_middle::ty::{Instance, TyCtxt};
 use rustc_session::cstore::DllImport;
-use rustc_target::spec::Env;
+use rustc_target::spec::CfgAbi;
 use tracing::debug;
 
 use crate::consts::{IsInitOrFini, IsStatic, const_alloc_to_llvm};
@@ -46,7 +46,7 @@ pub(crate) fn maybe_sign_fn_ptr<'ll, 'tcx>(
     llfn: &'ll llvm::Value,
     pac: PacMetadata,
 ) -> &'ll llvm::Value {
-    if cx.sess().target.env != Env::Pauthtest {
+    if cx.sess().target.cfg_abi != CfgAbi::Pauthtest {
         return llfn;
     }
 
diff --git a/compiler/rustc_codegen_llvm/src/consts.rs b/compiler/rustc_codegen_llvm/src/consts.rs
@@ -17,7 +17,7 @@ use rustc_middle::ty::layout::{HasTypingEnv, LayoutOf};
 use rustc_middle::ty::{self, Instance};
 use rustc_middle::{bug, span_bug};
 use rustc_span::Symbol;
-use rustc_target::spec::{Arch, Env};
+use rustc_target::spec::{Arch, CfgAbi};
 use tracing::{debug, instrument, trace};
 
 use crate::common::CodegenCx;
@@ -123,7 +123,9 @@ pub(crate) fn const_alloc_to_llvm<'ll>(
         // Under pointer authentication, function pointers stored in init/fini arrays need special
         // handling.
         let pac_metadata = Some(
-            if cx.sess().target.env == Env::Pauthtest && matches!(is_init_fini, IsInitOrFini::Yes) {
+            if cx.sess().target.cfg_abi == CfgAbi::Pauthtest
+                && matches!(is_init_fini, IsInitOrFini::Yes)
+            {
                 PacMetadata {
                     // Must correspond to ptrauth_key_init_fini_pointer from `ptrauth.h`.
                     key: 0,
@@ -217,7 +219,7 @@ fn check_and_apply_linkage<'ll, 'tcx>(
                 let fn_sig = sig.with(*header);
                 let fn_abi = cx.fn_abi_of_fn_ptr(fn_sig, ty::List::empty());
                 // Decide if the initializer needs to be signed
-                if cx.sess().target.env == Env::Pauthtest
+                if cx.sess().target.cfg_abi == CfgAbi::Pauthtest
                     && matches!(fn_sig.abi(), ExternAbi::C { .. } | ExternAbi::System { .. })
                 {
                     should_sign = true;
diff --git a/compiler/rustc_codegen_llvm/src/intrinsic.rs b/compiler/rustc_codegen_llvm/src/intrinsic.rs
@@ -26,7 +26,7 @@ use rustc_session::lint::builtin::DEPRECATED_LLVM_INTRINSIC;
 use rustc_span::{Span, Symbol, sym};
 use rustc_symbol_mangling::{mangle_internal_symbol, symbol_name_for_instance_in_crate};
 use rustc_target::callconv::PassMode;
-use rustc_target::spec::{Arch, Env, Os};
+use rustc_target::spec::{Arch, CfgAbi, Os};
 use tracing::debug;
 
 use crate::abi::FnAbiLlvmExt;
@@ -1760,7 +1760,7 @@ fn get_rust_try_fn<'a, 'll, 'tcx>(
         hir::Safety::Unsafe,
     ));
     let rust_try = gen_fn(cx, "__rust_try", rust_fn_sig, codegen);
-    if cx.sess().target.env == Env::Pauthtest {
+    if cx.sess().target.cfg_abi == CfgAbi::Pauthtest {
         let attrs: Vec<&Attribute> =
             pauth_fn_attrs().iter().map(|name| llvm::CreateAttrString(cx.llcx, name)).collect();
         let (_ty, rust_try_fn) = rust_try;
diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs
@@ -424,8 +424,8 @@ fn update_target_reliable_float_cfg(sess: &Session, cfg: &mut TargetConfig) {
         // (ld is `f64`), anything other than Linux (Windows and MacOS use `f64`), and `x86`
         // (ld is 80-bit extended precision).
         //
-        // musl and pauthtest do not implement the symbols required for f128 math at all.
-        _ if (*target_env == Env::Musl || *target_env == Env::Pauthtest) => false,
+        // musl does not implement the symbols required for f128 math at all.
+        _ if *target_env == Env::Musl => false,
         (Arch::X86_64, _) => false,
         (_, Os::Linux) if target_pointer_width == 64 => true,
         _ => false,
diff --git a/compiler/rustc_metadata/src/native_libs.rs b/compiler/rustc_metadata/src/native_libs.rs
@@ -193,7 +193,7 @@ pub(crate) fn collect(tcx: TyCtxt<'_>, LocalCrate: LocalCrate) -> Vec<NativeLib>
     }
     collector.process_command_line();
     for lib in &mut collector.libs {
-        if tcx.sess.target.env == Env::Pauthtest {
+        if tcx.sess.target.cfg_abi == CfgAbi::Pauthtest {
             if let NativeLibKind::Static { .. } = lib.kind {
                 if !tcx.sess.opts.unstable_opts.ui_testing {
                     let diag = if lib.foreign_module.is_none() {
diff --git a/compiler/rustc_session/src/session.rs b/compiler/rustc_session/src/session.rs
@@ -29,9 +29,9 @@ use rustc_span::source_map::{FilePathMapping, SourceMap};
 use rustc_span::{RealFileName, Span, Symbol};
 use rustc_target::asm::InlineAsmArch;
 use rustc_target::spec::{
-    Arch, CodeModel, DebuginfoKind, Env, Os, PanicStrategy, RelocModel, RelroLevel, SanitizerSet,
-    SmallDataThresholdSupport, SplitDebuginfo, StackProtector, SymbolVisibility, Target,
-    TargetTuple, TlsModel, apple,
+    Arch, CfgAbi, CodeModel, DebuginfoKind, Os, PanicStrategy, RelocModel, RelroLevel,
+    SanitizerSet, SmallDataThresholdSupport, SplitDebuginfo, StackProtector, SymbolVisibility,
+    Target, TargetTuple, TlsModel, apple,
 };
 
 use crate::code_stats::CodeStats;
@@ -1211,7 +1211,7 @@ fn validate_commandline_args_with_session_available(sess: &Session) {
     }
 
     // Using static linking is prohibited on pauthtest target
-    if sess.crt_static(None) && sess.target.env == Env::Pauthtest {
+    if sess.crt_static(None) && sess.target.cfg_abi == CfgAbi::Pauthtest {
         sess.dcx().emit_err(errors::CannotEnableCrtStaticPointerAuth);
     }
 
diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
@@ -2059,7 +2059,6 @@ crate::target_spec_enum! {
         P1 = "p1",
         P2 = "p2",
         P3 = "p3",
-        Pauthtest = "pauthtest",
         Uclibc = "uclibc",
         V5 = "v5",
         Unspecified = "",
@@ -2090,6 +2089,7 @@ crate::target_spec_enum! {
         Ilp32e = "ilp32e",
         Llvm = "llvm",
         MacAbi = "macabi",
+        Pauthtest = "pauthtest",
         Sim = "sim",
         SoftFloat = "softfloat",
         Spe = "spe",
@@ -3429,6 +3429,7 @@ impl Target {
                             CfgAbi::Ilp32
                                 | CfgAbi::Llvm
                                 | CfgAbi::MacAbi
+                                | CfgAbi::Pauthtest
                                 | CfgAbi::Sim
                                 | CfgAbi::Uwp
                                 | CfgAbi::Unspecified
diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_pauthtest.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_pauthtest.rs
@@ -1,6 +1,6 @@
 use crate::spec::{
-    Arch, Env, FramePointer, LinkSelfContainedDefault, StackProbeType, Target, TargetMetadata,
-    TargetOptions, base,
+    Arch, CfgAbi, Env, FramePointer, LinkSelfContainedDefault, StackProbeType, Target,
+    TargetMetadata, TargetOptions, base,
 };
 
 pub(crate) fn target() -> Target {
@@ -17,7 +17,8 @@ pub(crate) fn target() -> Target {
         arch: Arch::AArch64,
 
         options: TargetOptions {
-            env: Env::Pauthtest,
+            env: Env::Musl,
+            cfg_abi: CfgAbi::Pauthtest,
             // `pauthtest` requires v8.3a, which includes lse, no need for outline-atomics
             features: "+v8.3a,+pauth".into(),
             max_atomic_width: Some(128),
diff --git a/src/doc/rustc/src/platform-support/aarch64-unknown-linux-pauthtest.md b/src/doc/rustc/src/platform-support/aarch64-unknown-linux-pauthtest.md
@@ -165,7 +165,7 @@ index 0564f2e..a8a0d1a 100644
          // clause, and if this is fixed that test in theory can be run on macOS!
          if cfg!(target_vendor = "apple") {
              self.ip()
-+        } else if cfg!(target_env = "pauthtest") {
++        } else if cfg!(target_abi = "pauthtest") {
 +            // NOTE: ip here is an unsigned (raw) pointer, so we must not use
 +            // uw::_Unwind_FindEnclosingFunction.
 +            //
diff --git a/src/librustdoc/clean/cfg.rs b/src/librustdoc/clean/cfg.rs
@@ -605,7 +605,6 @@ fn human_readable_target_env(env: Symbol) -> Option<&'static str> {
         P1 => "WASIp1",
         P2 => "WASIp2",
         P3 => "WASIp3",
-        Pauthtest => "pauthtest",
         Relibc => "relibc",
         Sgx => "SGX",
         Sim => "Simulator",
diff --git a/tests/ui/check-cfg/well-known-values.stderr b/tests/ui/check-cfg/well-known-values.stderr
@@ -129,7 +129,7 @@ warning: unexpected `cfg` condition value: `_UNEXPECTED_VALUE`
 LL |     target_abi = "_UNEXPECTED_VALUE",
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: expected values for `target_abi` are: ``, `abi64`, `abiv2`, `abiv2hf`, `eabi`, `eabihf`, `elfv1`, `elfv2`, `fortanix`, `ilp32`, `ilp32e`, `llvm`, `macabi`, `sim`, `softfloat`, `spe`, `uwp`, `vec-extabi`, and `x32`
+   = note: expected values for `target_abi` are: ``, `abi64`, `abiv2`, `abiv2hf`, `eabi`, `eabihf`, `elfv1`, `elfv2`, `fortanix`, `ilp32`, `ilp32e`, `llvm`, `macabi`, `pauthtest`, `sim`, `softfloat`, `spe`, `uwp`, `vec-extabi`, and `x32`
    = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
 
 warning: unexpected `cfg` condition value: `_UNEXPECTED_VALUE`
@@ -156,7 +156,7 @@ warning: unexpected `cfg` condition value: `_UNEXPECTED_VALUE`
 LL |     target_env = "_UNEXPECTED_VALUE",
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: expected values for `target_env` are: ``, `gnu`, `macabi`, `mlibc`, `msvc`, `musl`, `newlib`, `nto70`, `nto71`, `nto71_iosock`, `nto80`, `ohos`, `p1`, `p2`, `p3`, `pauthtest`, `relibc`, `sgx`, `sim`, `uclibc`, and `v5`
+   = note: expected values for `target_env` are: ``, `gnu`, `macabi`, `mlibc`, `msvc`, `musl`, `newlib`, `nto70`, `nto71`, `nto71_iosock`, `nto80`, `ohos`, `p1`, `p2`, `p3`, `relibc`, `sgx`, `sim`, `uclibc`, and `v5`
    = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
 
 warning: unexpected `cfg` condition value: `_UNEXPECTED_VALUE`
diff --git a/tests/ui/float/target-has-reliable-nightly-float.rs b/tests/ui/float/target-has-reliable-nightly-float.rs
@@ -21,7 +21,7 @@ pub fn has_f128_math() {}
 fn main() {
     if cfg!(target_arch = "aarch64") &&
         cfg!(target_os = "linux") &&
-        cfg!(not(any(target_env = "musl", target_env = "pauthtest"))) {
+        cfg!(not(target_env = "musl")) {
         // Aarch64+GNU+Linux is one target that has support for all features, so use it to spot
         // check that the compiler does indeed enable these gates.
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,9 @@ use rustc_middle::ty::{self, TyCtxt};`
`9`	`9`	`use rustc_session::config::{BranchProtection, FunctionReturn, OptLevel, PAuthKey, PacRet};`
`10`	`10`	`use rustc_span::sym;`
`11`	`11`	`use rustc_symbol_mangling::mangle_internal_symbol;`
`12`		`-use rustc_target::spec::{Arch, Env, FramePointer, SanitizerSet, StackProbeType, StackProtector};`
	`12`	`+use rustc_target::spec::{`
	`13`	`+ Arch, CfgAbi, FramePointer, SanitizerSet, StackProbeType, StackProtector,`
	`14`	`+};`
`13`	`15`	`use smallvec::SmallVec;`
`14`	`16`
`15`	`17`	`use crate::common::pauth_fn_attrs;`
`@@ -606,7 +608,7 @@ pub(crate) fn llfn_attrs_from_instance<'ll, 'tcx>(`
`606`	`608`	`}`
`607`	`609`	`}`
`608`	`610`
`609`		`- if sess.target.env == Env::Pauthtest {`
	`611`	`+ if sess.target.cfg_abi == CfgAbi::Pauthtest {`
`610`	`612`	`for &ptrauth_attr in pauth_fn_attrs() {`
`611`	`613`	`to_add.push(llvm::CreateAttrString(cx.llcx, ptrauth_attr));`
`612`	`614`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ pub(crate) fn collect(tcx: TyCtxt<'_>, LocalCrate: LocalCrate) -> Vec<NativeLib>`
`193`	`193`	`}`
`194`	`194`	`collector.process_command_line();`
`195`	`195`	`for lib in &mut collector.libs {`
`196`		`- if tcx.sess.target.env == Env::Pauthtest {`
	`196`	`+ if tcx.sess.target.cfg_abi == CfgAbi::Pauthtest {`
`197`	`197`	`if let NativeLibKind::Static { .. } = lib.kind {`
`198`	`198`	`if !tcx.sess.opts.unstable_opts.ui_testing {`
`199`	`199`	`let diag = if lib.foreign_module.is_none() {`