Use target_env = "musl" & target_abi = "pauthtest" instead of env

Author: jchlanda

library/std/src/sys/pal/unix/stack_overflow.rs

@@ -409,15 +409,9 @@ mod imp {
 
         unsafe {
             // this way someone on any unix-y OS can check that all these compile
-            if cfg!(all(
-                target_os = "linux",
-                not(any(target_env = "musl", target_env = "pauthtest"))
-            )) {
+            if cfg!(all(target_os = "linux", not(target_env = "musl"))) {
                 install_main_guard_linux(page_size)
-            } else if cfg!(all(
-                target_os = "linux",
-                any(target_env = "musl", target_env = "pauthtest")
-            )) {
+            } else if cfg!(all(target_os = "linux", target_env = "musl")) {
                 install_main_guard_linux_musl(page_size)
             } else if cfg!(target_os = "freebsd") {
                 #[cfg(not(target_os = "freebsd"))]
@@ -594,10 +588,7 @@ mod imp {
             let mut guardsize = 0;
             assert_eq!(libc::pthread_attr_getguardsize(attr.as_ptr(), &mut guardsize), 0);
             if guardsize == 0 {
-                if cfg!(all(
-                    target_os = "linux",
-                    any(target_env = "musl", target_env = "pauthtest")
-                )) {
+                if cfg!(all(target_os = "linux", target_env = "musl")) {
                     // musl versions before 1.1.19 always reported guard
                     // size obtained from pthread_attr_get_np as zero.
                     // Use page size as a fallback.
@@ -613,10 +604,7 @@ mod imp {
             let stackaddr = stackptr.addr();
             ret = if cfg!(any(target_os = "freebsd", target_os = "netbsd", target_os = "hurd")) {
                 Some(stackaddr - guardsize..stackaddr)
-            } else if cfg!(all(
-                target_os = "linux",
-                any(target_env = "musl", target_env = "pauthtest")
-            )) {
+            } else if cfg!(all(target_os = "linux", target_env = "musl")) {
                 Some(stackaddr - guardsize..stackaddr)
             } else if cfg!(all(target_os = "linux", any(target_env = "gnu", target_env = "uclibc")))
             {

library/std/src/sys/personality/gcc.rs

@@ -91,7 +91,7 @@ const UNWIND_DATA_REG: (i32, i32) = (4, 5); // a0, a1
 
 unsafe fn sign_lpad(context: *mut uw::_Unwind_Context, lpad: *const u8) -> *const u8 {
     cfg_select! {
-        all(target_env = "pauthtest", target_arch = "aarch64") => {
+        all(target_abi = "pauthtest", target_arch = "aarch64") => {
             // DWARF register number for SP on AArch64.
             const SP_REG: i32 = 31;
 

library/std_detect/src/detect/os/linux/auxvec.rs

@@ -51,7 +51,7 @@ pub(crate) struct AuxVec {
 /// Note that run-time feature detection is not invoked for features that can
 /// be detected at compile-time.
 ///
-///  Note: We always directly use `getauxval` on `*-linux-{gnu,musl,ohos,pauthtest}*` and
+///  Note: We always directly use `getauxval` on `*-linux-{gnu,musl,ohos}*` and
 /// `*-android*` targets rather than `dlsym` it because we can safely assume
 /// `getauxval` is linked to the binary.
 /// - `*-linux-gnu*` targets ([since Rust 1.64](https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html))
@@ -125,7 +125,7 @@ fn getauxval(key: usize) -> Result<usize, ()> {
         any(
             all(
                 target_os = "linux",
-                any(target_env = "gnu", target_env = "musl", target_env = "ohos", target_env = "pauthtest"),
+                any(target_env = "gnu", target_env = "musl", target_env = "ohos"),
             ),
             target_os = "android",
         ) => {

library/unwind/src/lib.rs

@@ -57,7 +57,12 @@ cfg_select! {
     }
 }
 
-#[cfg(target_env = "musl")]
+// For pauthtest the only supported unwinding mechanism is provided by libunwind.
+#[cfg(target_abi = "pauthtest")]
+#[link(name = "unwind")]
+unsafe extern "C" {}
+
+#[cfg(all(target_env = "musl", not(target_abi = "pauthtest")))]
 cfg_select! {
     all(feature = "llvm-libunwind", feature = "system-llvm-libunwind") => {
         compile_error!("`llvm-libunwind` and `system-llvm-libunwind` cannot be enabled at the same time");
@@ -95,11 +100,6 @@ cfg_select! {
     }
 }
 
-// For pauthtest the only supported unwinding mechanism is provided by libunwind.
-#[cfg(target_env = "pauthtest")]
-#[link(name = "unwind")]
-unsafe extern "C" {}
-
 // This is the same as musl except that we default to using the system libunwind
 // instead of libgcc.
 #[cfg(target_env = "ohos")]