add mips64r6 target_arch detection

rust-lang · Jun 7, 2023 · 1ad5a79 · 1ad5a79
1 parent f171596
commit 1ad5a79
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 13 deletions.
diff --git a/build.rs b/build.rs
@@ -34,7 +34,7 @@ const ALLOWED_CFGS: &'static [&'static str] = &[
 const CHECK_CFG_EXTRA: &'static [(&'static str, &'static [&'static str])] = &[
     ("target_os", &["switch", "aix", "ohos"]),
     ("target_env", &["illumos", "wasi", "aix", "ohos"]),
-    ("target_arch", &["loongarch64"]),
+    ("target_arch", &["loongarch64", "mips64r6"]),
 ];
 
 fn main() {

diff --git a/src/unix/bsd/netbsdlike/openbsd/mod.rs b/src/unix/bsd/netbsdlike/openbsd/mod.rs
@@ -1961,7 +1961,7 @@ cfg_if! {
     } else if #[cfg(target_arch = "arm")] {
         mod arm;
         pub use self::arm::*;
-    } else if #[cfg(target_arch = "mips64")] {
+    } else if #[cfg(any(target_arch = "mips64", target_arch = "mips64r6"))] {
         mod mips64;
         pub use self::mips64::*;
     } else if #[cfg(target_arch = "powerpc")] {

diff --git a/src/unix/linux_like/linux/align.rs b/src/unix/linux_like/linux/align.rs
@@ -5,6 +5,7 @@ macro_rules! expand_align {
                            target_arch = "x86_64",
                            target_arch = "powerpc64",
                            target_arch = "mips64",
+                           target_arch = "mips64r6",
                            target_arch = "s390x",
                            target_arch = "sparc64",
                            target_arch = "aarch64",
@@ -16,6 +17,7 @@ macro_rules! expand_align {
                                target_arch = "x86_64",
                                target_arch = "powerpc64",
                                target_arch = "mips64",
+                               target_arch = "mips64r6",
                                target_arch = "s390x",
                                target_arch = "sparc64",
                                target_arch = "aarch64",

diff --git a/src/unix/linux_like/linux/arch/mips/mod.rs b/src/unix/linux_like/linux/arch/mips/mod.rs
@@ -272,7 +272,7 @@ cfg_if! {
 }
 
 cfg_if! {
-    if #[cfg(target_arch = "mips64",
+    if #[cfg(any(target_arch = "mips64", target_arch = "mips64r6"),
          any(target_env = "gnu",
              target_env = "uclibc"))] {
         pub const RLIM_INFINITY: ::rlim_t = !0;

diff --git a/src/unix/linux_like/linux/arch/mod.rs b/src/unix/linux_like/linux/arch/mod.rs
@@ -1,5 +1,5 @@
 cfg_if! {
-    if #[cfg(any(target_arch = "mips", target_arch = "mips64"))] {
+    if #[cfg(any(target_arch = "mips", target_arch = "mips64", target_arch = "mips64r6"))] {
         mod mips;
         pub use self::mips::*;
     } else if #[cfg(any(target_arch = "powerpc", target_arch = "powerpc64"))] {

diff --git a/src/unix/linux_like/linux/gnu/b64/mod.rs b/src/unix/linux_like/linux/gnu/b64/mod.rs
@@ -72,6 +72,7 @@ s! {
             target_arch = "aarch64",
             target_arch = "loongarch64",
             target_arch = "mips64",
+            target_arch = "mips64r6",
             target_arch = "powerpc64",
             target_arch = "riscv64",
             target_arch = "sparc64")))]
@@ -81,6 +82,7 @@ s! {
             target_arch = "aarch64",
             target_arch = "loongarch64",
             target_arch = "mips64",
+            target_arch = "mips64r6",
             target_arch = "powerpc64",
             target_arch = "riscv64",
             target_arch = "sparc64")))]
@@ -105,7 +107,7 @@ cfg_if! {
     } else if #[cfg(any(target_arch = "sparc64"))] {
         mod sparc64;
         pub use self::sparc64::*;
-    } else if #[cfg(any(target_arch = "mips64"))] {
+    } else if #[cfg(any(target_arch = "mips64", target_arch = "mips64r6"))] {
         mod mips64;
         pub use self::mips64::*;
     } else if #[cfg(any(target_arch = "s390x"))] {

diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs
@@ -116,13 +116,15 @@ s! {
             target_arch = "sparc",
             target_arch = "sparc64",
             target_arch = "mips",
-            target_arch = "mips64")))]
+            target_arch = "mips64",
+            target_arch = "mips64r6")))]
         pub c_ispeed: ::speed_t,
         #[cfg(not(any(
             target_arch = "sparc",
             target_arch = "sparc64",
             target_arch = "mips",
-            target_arch = "mips64")))]
+            target_arch = "mips64",
+            target_arch = "mips64r6")))]
         pub c_ospeed: ::speed_t,
     }
 
@@ -954,7 +956,7 @@ pub const KEYCTL_SUPPORTS_DECRYPT: u32 = 0x02;
 pub const KEYCTL_SUPPORTS_SIGN: u32 = 0x04;
 pub const KEYCTL_SUPPORTS_VERIFY: u32 = 0x08;
 cfg_if! {
-    if #[cfg(not(any(target_arch="mips", target_arch="mips64")))] {
+    if #[cfg(not(any(target_arch="mips", target_arch="mips64", target_arch = "mips64r6")))] {
         pub const KEYCTL_MOVE: u32 = 30;
         pub const KEYCTL_CAPABILITIES: u32 = 31;
 
@@ -1388,6 +1390,7 @@ cfg_if! {
                         target_arch = "aarch64",
                         target_arch = "powerpc64",
                         target_arch = "mips64",
+                        target_arch = "mips64r6",
                         target_arch = "s390x",
                         target_arch = "sparc64",
                         target_arch = "riscv64",

diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs
@@ -789,6 +789,7 @@ cfg_if! {
     if #[cfg(any(target_arch = "x86_64",
                  target_arch = "aarch64",
                  target_arch = "mips64",
+                 target_arch = "mips64r6",
                  target_arch = "powerpc64",
                  target_arch = "s390x",
                  target_arch = "riscv64"))] {

diff --git a/src/unix/linux_like/linux/no_align.rs b/src/unix/linux_like/linux/no_align.rs
@@ -5,6 +5,7 @@ macro_rules! expand_align {
                 #[cfg(any(target_arch = "x86_64",
                           target_arch = "powerpc64",
                           target_arch = "mips64",
+                          target_arch = "mips64r6",
                           target_arch = "s390x",
                           target_arch = "sparc64",
                           target_arch = "riscv64",
@@ -16,6 +17,7 @@ macro_rules! expand_align {
                 #[cfg(not(any(target_arch = "x86_64",
                               target_arch = "powerpc64",
                               target_arch = "mips64",
+                              target_arch = "mips64r6",
                               target_arch = "s390x",
                               target_arch = "sparc64",
                               target_arch = "riscv64",

diff --git a/src/unix/linux_like/linux/uclibc/align.rs b/src/unix/linux_like/linux/uclibc/align.rs
@@ -5,13 +5,15 @@ macro_rules! expand_align {
                            target_arch = "x86_64",
                            target_arch = "powerpc64",
                            target_arch = "mips64",
+                           target_arch = "mips64r6",
                            target_arch = "s390x",
                            target_arch = "sparc64"),
                        repr(align(4)))]
             #[cfg_attr(not(any(target_pointer_width = "32",
                                target_arch = "x86_64",
                                target_arch = "powerpc64",
                                target_arch = "mips64",
+                               target_arch = "mips64r6",
                                target_arch = "s390x",
                                target_arch = "sparc64")),
                        repr(align(8)))]

diff --git a/src/unix/linux_like/linux/uclibc/mips/mod.rs b/src/unix/linux_like/linux/uclibc/mips/mod.rs
@@ -301,7 +301,7 @@ cfg_if! {
     if #[cfg(target_arch = "mips")] {
         mod mips32;
         pub use self::mips32::*;
-    } else if #[cfg(target_arch = "mips64")] {
+    } else if #[cfg(any(target_arch = "mips64", target_arch = "mips64r6"))] {
         mod mips64;
         pub use self::mips64::*;
     } else {

diff --git a/src/unix/newlib/no_align.rs b/src/unix/newlib/no_align.rs
@@ -27,12 +27,12 @@ macro_rules! expand_align {
 
             pub struct pthread_mutexattr_t { // Unverified
                 #[cfg(any(target_arch = "x86_64", target_arch = "powerpc64",
-                          target_arch = "mips64", target_arch = "s390x",
-                          target_arch = "sparc64"))]
+                          target_arch = "mips64", target_arch = "mips64r6",
+                          target_arch = "s390x", target_arch = "sparc64"))]
                 __align: [::c_int; 0],
                 #[cfg(not(any(target_arch = "x86_64", target_arch = "powerpc64",
-                              target_arch = "mips64", target_arch = "s390x",
-                              target_arch = "sparc64")))]
+                              target_arch = "mips64", target_arch = "mips64r6",
+                              target_arch = "s390x", target_arch = "sparc64")))]
                 __align: [::c_long; 0],
                 size: [u8; ::__SIZEOF_PTHREAD_MUTEXATTR_T],
             }