Skip to content

Commit 9ebd925

Browse files
chenx97chenx97
committed
sys: add MIPS R6 support
Currently R6 targets are almost identical to their R2/R5 counterparts.
1 parent 154a8a4 commit 9ebd925

File tree

10 files changed

+103
-14
lines changed

10 files changed

+103
-14
lines changed

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ targets = [
2828
]
2929

3030
[dependencies]
31-
libc = { version = "0.2.147", features = ["extra_traits"] }
31+
libc = { version = "0.2.148", features = ["extra_traits"] }
3232
bitflags = "2.3.1"
3333
cfg-if = "1.0"
3434
pin-utils = { version = "0.1.0", optional = true }

‎README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ The following targets are supported by `nix`:
9292
</td>
9393
<td>
9494
<li>armv7-unknown-linux-uclibceabihf</li>
95+
<li>mipsisa32r6-unknown-linux-gnu</li>
96+
<li>mipsisa32r6el-unknown-linux-gnu</li>
97+
<li>mipsisa64r6-unknown-linux-gnuabi64</li>
98+
<li>mipsisa64r6el-unknown-linux-gnuabi64</li>
9599
<li>powerpc64-unknown-linux-gnu</li>
96100
<li>x86_64-fuchsia</li>
97101
<li>x86_64-unknown-dragonfly</li>

‎src/sys/ioctl/linux.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ pub const TYPEBITS: ioctl_num_type = 8;
1919
cfg_if! {
2020
if #[cfg(any(
2121
target_arch = "mips",
22+
target_arch = "mips32r6",
2223
target_arch = "mips64",
24+
target_arch = "mips64r6",
2325
target_arch = "powerpc",
2426
target_arch = "powerpc64",
2527
target_arch = "sparc64"

‎src/sys/ptrace/linux.rs

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,42 +53,54 @@ libc_enum! {
5353
#[cfg(any(all(target_os = "android", target_pointer_width = "32"),
5454
all(target_os = "linux", any(target_env = "musl",
5555
target_arch = "mips",
56+
target_arch = "mips32r6",
5657
target_arch = "mips64",
58+
target_arch = "mips64r6",
5759
target_arch = "x86_64",
5860
target_pointer_width = "32"))))]
5961
PTRACE_GETREGS,
6062
#[cfg(any(all(target_os = "android", target_pointer_width = "32"),
6163
all(target_os = "linux", any(target_env = "musl",
6264
target_arch = "mips",
65+
target_arch = "mips32r6",
6366
target_arch = "mips64",
67+
target_arch = "mips64r6",
6468
target_arch = "x86_64",
6569
target_pointer_width = "32"))))]
6670
PTRACE_SETREGS,
6771
#[cfg(any(all(target_os = "android", target_pointer_width = "32"),
6872
all(target_os = "linux", any(target_env = "musl",
6973
target_arch = "mips",
74+
target_arch = "mips32r6",
7075
target_arch = "mips64",
76+
target_arch = "mips64r6",
7177
target_arch = "x86_64",
7278
target_pointer_width = "32"))))]
7379
PTRACE_GETFPREGS,
7480
#[cfg(any(all(target_os = "android", target_pointer_width = "32"),
7581
all(target_os = "linux", any(target_env = "musl",
7682
target_arch = "mips",
83+
target_arch = "mips32r6",
7784
target_arch = "mips64",
85+
target_arch = "mips64r6",
7886
target_arch = "x86_64",
7987
target_pointer_width = "32"))))]
8088
PTRACE_SETFPREGS,
8189
PTRACE_ATTACH,
8290
PTRACE_DETACH,
8391
#[cfg(all(target_os = "linux", any(target_env = "musl",
8492
target_arch = "mips",
93+
target_arch = "mips32r6",
8594
target_arch = "mips64",
95+
target_arch = "mips64r6",
8696
target_arch = "x86",
8797
target_arch = "x86_64")))]
8898
PTRACE_GETFPXREGS,
8999
#[cfg(all(target_os = "linux", any(target_env = "musl",
90100
target_arch = "mips",
101+
target_arch = "mips32r6",
91102
target_arch = "mips64",
103+
target_arch = "mips64r6",
92104
target_arch = "x86",
93105
target_arch = "x86_64")))]
94106
PTRACE_SETFPXREGS,
@@ -98,10 +110,14 @@ libc_enum! {
98110
PTRACE_GETSIGINFO,
99111
PTRACE_SETSIGINFO,
100112
#[cfg(all(target_os = "linux", not(any(target_arch = "mips",
101-
target_arch = "mips64"))))]
113+
target_arch = "mips32r6",
114+
target_arch = "mips64",
115+
target_arch = "mips64r6"))))]
102116
PTRACE_GETREGSET,
103117
#[cfg(all(target_os = "linux", not(any(target_arch = "mips",
104-
target_arch = "mips64"))))]
118+
target_arch = "mips32r6",
119+
target_arch = "mips64",
120+
target_arch = "mips64r6"))))]
105121
PTRACE_SETREGSET,
106122
#[cfg(target_os = "linux")]
107123
#[cfg_attr(docsrs, doc(cfg(all())))]
@@ -110,10 +126,14 @@ libc_enum! {
110126
#[cfg_attr(docsrs, doc(cfg(all())))]
111127
PTRACE_INTERRUPT,
112128
#[cfg(all(target_os = "linux", not(any(target_arch = "mips",
113-
target_arch = "mips64"))))]
129+
target_arch = "mips32r6",
130+
target_arch = "mips64",
131+
target_arch = "mips64r6"))))]
114132
PTRACE_LISTEN,
115133
#[cfg(all(target_os = "linux", not(any(target_arch = "mips",
116-
target_arch = "mips64"))))]
134+
target_arch = "mips32r6",
135+
target_arch = "mips64",
136+
target_arch = "mips64r6"))))]
117137
PTRACE_PEEKSIGINFO,
118138
#[cfg(all(target_os = "linux", target_env = "gnu",
119139
any(target_arch = "x86", target_arch = "x86_64")))]

‎src/sys/signal.rs

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ libc_enum! {
6565
/// Stack fault (obsolete)
6666
#[cfg(all(any(target_os = "android", target_os = "emscripten",
6767
target_os = "fuchsia", target_os = "linux"),
68-
not(any(target_arch = "mips", target_arch = "mips64",
68+
not(any(target_arch = "mips",
69+
target_arch = "mips32r6",
70+
target_arch = "mips64",
71+
target_arch = "mips64r6",
6972
target_arch = "sparc64"))))]
7073
SIGSTKFLT,
7174
/// To parent on child stop or exit
@@ -150,7 +153,9 @@ impl FromStr for Signal {
150153
),
151154
not(any(
152155
target_arch = "mips",
156+
target_arch = "mips32r6",
153157
target_arch = "mips64",
158+
target_arch = "mips64r6",
154159
target_arch = "sparc64"
155160
))
156161
))]
@@ -234,7 +239,9 @@ impl Signal {
234239
),
235240
not(any(
236241
target_arch = "mips",
242+
target_arch = "mips32r6",
237243
target_arch = "mips64",
244+
target_arch = "mips64r6",
238245
target_arch = "sparc64"
239246
))
240247
))]
@@ -327,7 +334,9 @@ const SIGNALS: [Signal; 28] = [
327334
),
328335
not(any(
329336
target_arch = "mips",
337+
target_arch = "mips32r6",
330338
target_arch = "mips64",
339+
target_arch = "mips64r6",
331340
target_arch = "sparc64"
332341
))
333342
))]
@@ -345,7 +354,13 @@ const SIGNALS: [Signal; 31] = [
345354
target_os = "emscripten",
346355
target_os = "fuchsia"
347356
),
348-
any(target_arch = "mips", target_arch = "mips64", target_arch = "sparc64")
357+
any(
358+
target_arch = "mips",
359+
target_arch = "mips32r6",
360+
target_arch = "mips64",
361+
target_arch = "mips64r6",
362+
target_arch = "sparc64"
363+
)
349364
))]
350365
#[cfg(feature = "signal")]
351366
const SIGNALS: [Signal; 30] = [

‎test/sys/test_aio.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,9 @@ mod aio_writev {
498498
any(
499499
all(target_env = "musl", target_arch = "x86_64"),
500500
target_arch = "mips",
501-
target_arch = "mips64"
501+
target_arch = "mips32r6",
502+
target_arch = "mips64",
503+
target_arch = "mips64r6"
502504
),
503505
ignore
504506
)]

‎test/sys/test_ioctl.rs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ mod linux {
3636
fn test_op_none() {
3737
if cfg!(any(
3838
target_arch = "mips",
39+
target_arch = "mips32r6",
3940
target_arch = "mips64",
41+
target_arch = "mips64r6",
4042
target_arch = "powerpc",
4143
target_arch = "powerpc64"
4244
)) {
@@ -54,7 +56,9 @@ mod linux {
5456
fn test_op_write() {
5557
if cfg!(any(
5658
target_arch = "mips",
59+
target_arch = "mips32r6",
5760
target_arch = "mips64",
61+
target_arch = "mips64r6",
5862
target_arch = "powerpc",
5963
target_arch = "powerpc64"
6064
)) {
@@ -69,7 +73,11 @@ mod linux {
6973
#[cfg(target_pointer_width = "64")]
7074
#[test]
7175
fn test_op_write_64() {
72-
if cfg!(any(target_arch = "mips64", target_arch = "powerpc64")) {
76+
if cfg!(any(
77+
target_arch = "mips64",
78+
target_arch = "mips64r6",
79+
target_arch = "powerpc64"
80+
)) {
7381
assert_eq!(
7482
request_code_write!(b'z', 10, 1u64 << 32) as u32,
7583
0x8000_7A0A
@@ -88,7 +96,9 @@ mod linux {
8896
fn test_op_read() {
8997
if cfg!(any(
9098
target_arch = "mips",
99+
target_arch = "mips32r6",
91100
target_arch = "mips64",
101+
target_arch = "mips64r6",
92102
target_arch = "powerpc",
93103
target_arch = "powerpc64"
94104
)) {
@@ -103,7 +113,11 @@ mod linux {
103113
#[cfg(target_pointer_width = "64")]
104114
#[test]
105115
fn test_op_read_64() {
106-
if cfg!(any(target_arch = "mips64", target_arch = "powerpc64")) {
116+
if cfg!(any(
117+
target_arch = "mips64",
118+
target_arch = "mips64r6",
119+
target_arch = "powerpc64"
120+
)) {
107121
assert_eq!(
108122
request_code_read!(b'z', 10, 1u64 << 32) as u32,
109123
0x4000_7A0A

‎test/sys/test_socket.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1683,7 +1683,9 @@ fn loopback_address(
16831683
qemu,
16841684
any(
16851685
target_arch = "mips",
1686+
target_arch = "mips32r6",
16861687
target_arch = "mips64",
1688+
target_arch = "mips64r6",
16871689
target_arch = "powerpc64",
16881690
)
16891691
),
@@ -1778,7 +1780,9 @@ pub fn test_recv_ipv4pktinfo() {
17781780
qemu,
17791781
any(
17801782
target_arch = "mips",
1783+
target_arch = "mips32r6",
17811784
target_arch = "mips64",
1785+
target_arch = "mips64r6",
17821786
target_arch = "powerpc64",
17831787
)
17841788
),
@@ -2070,7 +2074,9 @@ pub fn test_recvif_ipv6() {
20702074
qemu,
20712075
any(
20722076
target_arch = "mips",
2077+
target_arch = "mips32r6",
20732078
target_arch = "mips64",
2079+
target_arch = "mips64r6",
20742080
target_arch = "powerpc64",
20752081
)
20762082
),

‎test/sys/test_wait.rs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ fn test_wait_signal() {
3333
//target_os = "haiku",
3434
all(target_os = "linux", not(target_env = "uclibc")),
3535
))]
36-
#[cfg(not(any(target_arch = "mips", target_arch = "mips64")))]
36+
#[cfg(not(any(
37+
target_arch = "mips",
38+
target_arch = "mips32r6",
39+
target_arch = "mips64",
40+
target_arch = "mips64r6"
41+
)))]
3742
fn test_waitid_signal() {
3843
let _m = crate::FORK_MTX.lock();
3944

@@ -76,7 +81,12 @@ fn test_wait_exit() {
7681
target_os = "haiku",
7782
all(target_os = "linux", not(target_env = "uclibc")),
7883
))]
79-
#[cfg(not(any(target_arch = "mips", target_arch = "mips64")))]
84+
#[cfg(not(any(
85+
target_arch = "mips",
86+
target_arch = "mips32r6",
87+
target_arch = "mips64",
88+
target_arch = "mips64r6"
89+
)))]
8090
fn test_waitid_exit() {
8191
let _m = crate::FORK_MTX.lock();
8292

‎test/test_mq.rs

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,15 @@ fn test_mq_getattr() {
112112
// FIXME: Fix failures for mips in QEMU
113113
#[test]
114114
#[cfg_attr(
115-
all(qemu, any(target_arch = "mips", target_arch = "mips64")),
115+
all(
116+
qemu,
117+
any(
118+
target_arch = "mips",
119+
target_arch = "mips32r6",
120+
target_arch = "mips64",
121+
target_arch = "mips64r6"
122+
)
123+
),
116124
ignore
117125
)]
118126
fn test_mq_setattr() {
@@ -162,7 +170,15 @@ fn test_mq_setattr() {
162170
// FIXME: Fix failures for mips in QEMU
163171
#[test]
164172
#[cfg_attr(
165-
all(qemu, any(target_arch = "mips", target_arch = "mips64")),
173+
all(
174+
qemu,
175+
any(
176+
target_arch = "mips",
177+
target_arch = "mips32r6",
178+
target_arch = "mips64",
179+
target_arch = "mips64r6"
180+
)
181+
),
166182
ignore
167183
)]
168184
fn test_mq_set_nonblocking() {

0 commit comments

Comments
 (0)