Skip to content

Commit 1ad5a79

Browse files
chenx97chenx97
committed
add mips64r6 target_arch detection
1 parent f171596 commit 1ad5a79

File tree

12 files changed

+25
-13
lines changed

12 files changed

+25
-13
lines changed

‎build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const ALLOWED_CFGS: &'static [&'static str] = &[
3434
const CHECK_CFG_EXTRA: &'static [(&'static str, &'static [&'static str])] = &[
3535
("target_os", &["switch", "aix", "ohos"]),
3636
("target_env", &["illumos", "wasi", "aix", "ohos"]),
37-
("target_arch", &["loongarch64"]),
37+
("target_arch", &["loongarch64", "mips64r6"]),
3838
];
3939

4040
fn main() {

‎src/unix/bsd/netbsdlike/openbsd/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1961,7 +1961,7 @@ cfg_if! {
19611961
} else if #[cfg(target_arch = "arm")] {
19621962
mod arm;
19631963
pub use self::arm::*;
1964-
} else if #[cfg(target_arch = "mips64")] {
1964+
} else if #[cfg(any(target_arch = "mips64", target_arch = "mips64r6"))] {
19651965
mod mips64;
19661966
pub use self::mips64::*;
19671967
} else if #[cfg(target_arch = "powerpc")] {

‎src/unix/linux_like/linux/align.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ macro_rules! expand_align {
55
target_arch = "x86_64",
66
target_arch = "powerpc64",
77
target_arch = "mips64",
8+
target_arch = "mips64r6",
89
target_arch = "s390x",
910
target_arch = "sparc64",
1011
target_arch = "aarch64",
@@ -16,6 +17,7 @@ macro_rules! expand_align {
1617
target_arch = "x86_64",
1718
target_arch = "powerpc64",
1819
target_arch = "mips64",
20+
target_arch = "mips64r6",
1921
target_arch = "s390x",
2022
target_arch = "sparc64",
2123
target_arch = "aarch64",

‎src/unix/linux_like/linux/arch/mips/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ cfg_if! {
272272
}
273273

274274
cfg_if! {
275-
if #[cfg(target_arch = "mips64",
275+
if #[cfg(any(target_arch = "mips64", target_arch = "mips64r6"),
276276
any(target_env = "gnu",
277277
target_env = "uclibc"))] {
278278
pub const RLIM_INFINITY: ::rlim_t = !0;

‎src/unix/linux_like/linux/arch/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cfg_if! {
2-
if #[cfg(any(target_arch = "mips", target_arch = "mips64"))] {
2+
if #[cfg(any(target_arch = "mips", target_arch = "mips64", target_arch = "mips64r6"))] {
33
mod mips;
44
pub use self::mips::*;
55
} else if #[cfg(any(target_arch = "powerpc", target_arch = "powerpc64"))] {

‎src/unix/linux_like/linux/gnu/b64/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ s! {
7272
target_arch = "aarch64",
7373
target_arch = "loongarch64",
7474
target_arch = "mips64",
75+
target_arch = "mips64r6",
7576
target_arch = "powerpc64",
7677
target_arch = "riscv64",
7778
target_arch = "sparc64")))]
@@ -81,6 +82,7 @@ s! {
8182
target_arch = "aarch64",
8283
target_arch = "loongarch64",
8384
target_arch = "mips64",
85+
target_arch = "mips64r6",
8486
target_arch = "powerpc64",
8587
target_arch = "riscv64",
8688
target_arch = "sparc64")))]
@@ -105,7 +107,7 @@ cfg_if! {
105107
} else if #[cfg(any(target_arch = "sparc64"))] {
106108
mod sparc64;
107109
pub use self::sparc64::*;
108-
} else if #[cfg(any(target_arch = "mips64"))] {
110+
} else if #[cfg(any(target_arch = "mips64", target_arch = "mips64r6"))] {
109111
mod mips64;
110112
pub use self::mips64::*;
111113
} else if #[cfg(any(target_arch = "s390x"))] {

‎src/unix/linux_like/linux/gnu/mod.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,15 @@ s! {
116116
target_arch = "sparc",
117117
target_arch = "sparc64",
118118
target_arch = "mips",
119-
target_arch = "mips64")))]
119+
target_arch = "mips64",
120+
target_arch = "mips64r6")))]
120121
pub c_ispeed: ::speed_t,
121122
#[cfg(not(any(
122123
target_arch = "sparc",
123124
target_arch = "sparc64",
124125
target_arch = "mips",
125-
target_arch = "mips64")))]
126+
target_arch = "mips64",
127+
target_arch = "mips64r6")))]
126128
pub c_ospeed: ::speed_t,
127129
}
128130

@@ -954,7 +956,7 @@ pub const KEYCTL_SUPPORTS_DECRYPT: u32 = 0x02;
954956
pub const KEYCTL_SUPPORTS_SIGN: u32 = 0x04;
955957
pub const KEYCTL_SUPPORTS_VERIFY: u32 = 0x08;
956958
cfg_if! {
957-
if #[cfg(not(any(target_arch="mips", target_arch="mips64")))] {
959+
if #[cfg(not(any(target_arch="mips", target_arch="mips64", target_arch = "mips64r6")))] {
958960
pub const KEYCTL_MOVE: u32 = 30;
959961
pub const KEYCTL_CAPABILITIES: u32 = 31;
960962

@@ -1388,6 +1390,7 @@ cfg_if! {
13881390
target_arch = "aarch64",
13891391
target_arch = "powerpc64",
13901392
target_arch = "mips64",
1393+
target_arch = "mips64r6",
13911394
target_arch = "s390x",
13921395
target_arch = "sparc64",
13931396
target_arch = "riscv64",

‎src/unix/linux_like/linux/musl/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,7 @@ cfg_if! {
789789
if #[cfg(any(target_arch = "x86_64",
790790
target_arch = "aarch64",
791791
target_arch = "mips64",
792+
target_arch = "mips64r6",
792793
target_arch = "powerpc64",
793794
target_arch = "s390x",
794795
target_arch = "riscv64"))] {

‎src/unix/linux_like/linux/no_align.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ macro_rules! expand_align {
55
#[cfg(any(target_arch = "x86_64",
66
target_arch = "powerpc64",
77
target_arch = "mips64",
8+
target_arch = "mips64r6",
89
target_arch = "s390x",
910
target_arch = "sparc64",
1011
target_arch = "riscv64",
@@ -16,6 +17,7 @@ macro_rules! expand_align {
1617
#[cfg(not(any(target_arch = "x86_64",
1718
target_arch = "powerpc64",
1819
target_arch = "mips64",
20+
target_arch = "mips64r6",
1921
target_arch = "s390x",
2022
target_arch = "sparc64",
2123
target_arch = "riscv64",

‎src/unix/linux_like/linux/uclibc/align.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ macro_rules! expand_align {
55
target_arch = "x86_64",
66
target_arch = "powerpc64",
77
target_arch = "mips64",
8+
target_arch = "mips64r6",
89
target_arch = "s390x",
910
target_arch = "sparc64"),
1011
repr(align(4)))]
1112
#[cfg_attr(not(any(target_pointer_width = "32",
1213
target_arch = "x86_64",
1314
target_arch = "powerpc64",
1415
target_arch = "mips64",
16+
target_arch = "mips64r6",
1517
target_arch = "s390x",
1618
target_arch = "sparc64")),
1719
repr(align(8)))]

‎src/unix/linux_like/linux/uclibc/mips/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ cfg_if! {
301301
if #[cfg(target_arch = "mips")] {
302302
mod mips32;
303303
pub use self::mips32::*;
304-
} else if #[cfg(target_arch = "mips64")] {
304+
} else if #[cfg(any(target_arch = "mips64", target_arch = "mips64r6"))] {
305305
mod mips64;
306306
pub use self::mips64::*;
307307
} else {

‎src/unix/newlib/no_align.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ macro_rules! expand_align {
2727

2828
pub struct pthread_mutexattr_t { // Unverified
2929
#[cfg(any(target_arch = "x86_64", target_arch = "powerpc64",
30-
target_arch = "mips64", target_arch = "s390x",
31-
target_arch = "sparc64"))]
30+
target_arch = "mips64", target_arch = "mips64r6",
31+
target_arch = "s390x", target_arch = "sparc64"))]
3232
__align: [::c_int; 0],
3333
#[cfg(not(any(target_arch = "x86_64", target_arch = "powerpc64",
34-
target_arch = "mips64", target_arch = "s390x",
35-
target_arch = "sparc64")))]
34+
target_arch = "mips64", target_arch = "mips64r6",
35+
target_arch = "s390x", target_arch = "sparc64")))]
3636
__align: [::c_long; 0],
3737
size: [u8; ::__SIZEOF_PTHREAD_MUTEXATTR_T],
3838
}

0 commit comments

Comments
 (0)