Skip to content

Commit 614d5e2

Browse files
borsbors
committed
Auto merge of #3429 - JohnTitor:mips-is-now-tier3, r=JohnTitor
Downgrade CI support for MIPS MIPS targets are now tier 3, this downgrades CI support for MIPS just like other tier 3 targets.
2 parents a17ff20 + ef3a782 commit 614d5e2

File tree

13 files changed

+20
-196
lines changed

13 files changed

+20
-196
lines changed

‎.github/workflows/bors.yml

-7
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,6 @@ jobs:
136136
asmjs-unknown-emscripten,
137137
i686-linux-android,
138138
i686-unknown-linux-musl,
139-
mips-unknown-linux-gnu,
140-
mips-unknown-linux-musl,
141-
# FIXME: Somehow failed on CI
142-
# https://github.com/rust-lang/libc/runs/1659882216
143-
# mips64-unknown-linux-gnuabi64,
144-
# mips64el-unknown-linux-gnuabi64,
145-
mipsel-unknown-linux-musl,
146139
powerpc-unknown-linux-gnu,
147140
powerpc64-unknown-linux-gnu,
148141
powerpc64le-unknown-linux-gnu,

‎ci/build.sh

+7-9
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,6 @@ x86_64-unknown-linux-musl \
112112
x86_64-unknown-netbsd \
113113
"
114114

115-
# FIXME: builds of MIPS targets are currently broken on nightly.
116-
# mips-unknown-linux-gnu \
117-
# mips-unknown-linux-musl \
118-
# mips64-unknown-linux-gnuabi64 \
119-
# mips64el-unknown-linux-gnuabi64 \
120-
# mipsel-unknown-linux-gnu \
121-
# mipsel-unknown-linux-musl \
122-
123115
RUST_GT_1_13_LINUX_TARGETS="\
124116
arm-unknown-linux-musleabi \
125117
arm-unknown-linux-musleabihf \
@@ -238,9 +230,15 @@ i686-unknown-haiku \
238230
i686-unknown-netbsd \
239231
i686-unknown-openbsd \
240232
i686-wrs-vxworks \
241-
mipsel-sony-psp \
233+
mips-unknown-linux-gnu \
234+
mips-unknown-linux-musl \
235+
mips64-unknown-linux-gnuabi64 \
242236
mips64-unknown-linux-muslabi64 \
237+
mips64el-unknown-linux-gnuabi64 \
243238
mips64el-unknown-linux-muslabi64 \
239+
mipsel-unknown-linux-gnu \
240+
mipsel-unknown-linux-musl \
241+
mipsel-sony-psp \
244242
nvptx64-nvidia-cuda \
245243
powerpc-unknown-linux-gnuspe \
246244
powerpc-unknown-netbsd \

‎ci/docker/mips-unknown-linux-gnu/Dockerfile

-10
This file was deleted.

‎ci/docker/mips-unknown-linux-musl/Dockerfile

-25
This file was deleted.

‎ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile

-11
This file was deleted.

‎ci/docker/mips64-unknown-linux-muslabi64/Dockerfile

-15
This file was deleted.

‎ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile

-11
This file was deleted.

‎ci/docker/mips64el-unknown-linux-muslabi64/Dockerfile

-15
This file was deleted.

‎ci/docker/mipsel-unknown-linux-musl/Dockerfile

-25
This file was deleted.

‎ci/docker/mipsel-unknown-linux-uclibc/Dockerfile

-22
This file was deleted.

‎ci/install-musl.sh

-14
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,6 @@ case ${1} in
4646
./configure --prefix="/musl-${musl_arch}"
4747
make install -j4
4848
;;
49-
mips64)
50-
musl_arch=mips64
51-
kernel_arch=mips
52-
CC=mips64-linux-gnuabi64-gcc CFLAGS="-march=mips64r2 -mabi=64" \
53-
./configure --prefix="/musl-${musl_arch}" --enable-wrapper=yes
54-
make install -j4
55-
;;
56-
mips64el)
57-
musl_arch=mips64el
58-
kernel_arch=mips
59-
CC=mips64el-linux-gnuabi64-gcc CFLAGS="-march=mips64r2 -mabi=64" \
60-
./configure --prefix="/musl-${musl_arch}" --enable-wrapper=yes
61-
make install -j4
62-
;;
6349
s390x)
6450
musl_arch=s390x
6551
kernel_arch=s390

‎ci/install-rust.sh

-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ else
1212
# https://github.com/rust-lang/rust/issues/103673 contains related information.
1313
case "$TARGET" in
1414
*android*) toolchain=nightly-2022-10-09;;
15-
# FIXME: Unpin once mips' components are available on nightly.
16-
# https://rust-lang.github.io/rustup-components-history/mips-unknown-linux-gnu.html
17-
*mips*) toolchain=nightly-2023-07-04;;
1815
*) toolchain=nightly;;
1916
esac
2017
fi

‎libc-test/build.rs

+13-29
Original file line numberDiff line numberDiff line change
@@ -3223,9 +3223,6 @@ fn test_linux(target: &str) {
32233223
let arm = target.contains("arm");
32243224
let aarch64 = target.contains("aarch64");
32253225
let i686 = target.contains("i686");
3226-
let mips = target.contains("mips");
3227-
let mips32 = mips && !target.contains("64");
3228-
let mips64 = mips && target.contains("64");
32293226
let ppc = target.contains("powerpc");
32303227
let ppc64 = target.contains("powerpc64");
32313228
let s390x = target.contains("s390x");
@@ -3596,17 +3593,15 @@ fn test_linux(target: &str) {
35963593
// FIXME: Requires >= 5.1 kernel headers.
35973594
// Everything that uses install-musl.sh has 4.19 kernel headers.
35983595
"tls12_crypto_info_aes_gcm_256"
3599-
if (aarch64 || arm || i686 || mips64 || s390x || x86_64) && musl =>
3596+
if (aarch64 || arm || i686 || s390x || x86_64) && musl =>
36003597
{
36013598
true
36023599
}
36033600

36043601
// FIXME: Requires >= 5.11 kernel headers.
36053602
// Everything that uses install-musl.sh has 4.19 kernel headers.
3606-
// mips-unknown-linux-musl and mips64-unknown-linux-musl use
3607-
// openwrt-sdk which has 5.4 kernel headers.
36083603
"tls12_crypto_info_chacha20_poly1305"
3609-
if (aarch64 || arm || i686 || mips || s390x || x86_64) && musl =>
3604+
if (aarch64 || arm || i686 || s390x || x86_64) && musl =>
36103605
{
36113606
true
36123607
}
@@ -3727,16 +3722,11 @@ fn test_linux(target: &str) {
37273722
| "IPPROTO_ETHERNET"
37283723
| "IPPROTO_MPTCP" => true,
37293724

3730-
// FIXME: Not currently available in headers
3731-
"P_PIDFD" if mips => true,
3732-
"SYS_pidfd_open" if mips => true,
3725+
// FIXME: Not yet implemented on sparc64
3726+
"SYS_clone3" if sparc64 => true,
37333727

3734-
// FIXME: Not currently available in headers on MIPS
3735-
// Not yet implemented on sparc64
3736-
"SYS_clone3" if mips | sparc64 => true,
3737-
3738-
// FIXME: Not defined on ARM, gnueabihf, MIPS, musl, PowerPC, riscv64, s390x, and sparc64.
3739-
"SYS_memfd_secret" if arm | gnueabihf | mips | musl | ppc | riscv64 | s390x | sparc64 => true,
3728+
// FIXME: Not defined on ARM, gnueabihf, musl, PowerPC, riscv64, s390x, and sparc64.
3729+
"SYS_memfd_secret" if arm | gnueabihf | musl | ppc | riscv64 | s390x | sparc64 => true,
37403730

37413731
// FIXME: Added in Linux 5.16
37423732
// https://github.com/torvalds/linux/commit/039c0ec9bb77446d7ada7f55f90af9299b28ca49
@@ -3754,10 +3744,10 @@ fn test_linux(target: &str) {
37543744
| "UINPUT_VERSION"
37553745
| "SW_MAX"
37563746
| "SW_CNT"
3757-
if mips || ppc64 || riscv64 => true,
3747+
if ppc64 || riscv64 => true,
37583748

3759-
// FIXME: Not currently available in headers on ARM, MIPS and musl.
3760-
"NETLINK_GET_STRICT_CHK" if arm || mips || musl => true,
3749+
// FIXME: Not currently available in headers on ARM and musl.
3750+
"NETLINK_GET_STRICT_CHK" if arm || musl => true,
37613751

37623752
// kernel constants not available in uclibc 1.0.34
37633753
| "EXTPROC"
@@ -3946,22 +3936,20 @@ fn test_linux(target: &str) {
39463936
| "TLS_CIPHER_AES_GCM_256_SALT_SIZE"
39473937
| "TLS_CIPHER_AES_GCM_256_TAG_SIZE"
39483938
| "TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE"
3949-
if (aarch64 || arm || i686 || mips64 || s390x || x86_64) && musl =>
3939+
if (aarch64 || arm || i686 || s390x || x86_64) && musl =>
39503940
{
39513941
true
39523942
}
39533943

39543944
// FIXME: Requires >= 5.11 kernel headers.
39553945
// Everything that uses install-musl.sh has 4.19 kernel headers.
3956-
// mips-unknown-linux-musl and mips64-unknown-linux-musl use
3957-
// openwrt-sdk which has 5.4 kernel headers.
39583946
"TLS_CIPHER_CHACHA20_POLY1305"
39593947
| "TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE"
39603948
| "TLS_CIPHER_CHACHA20_POLY1305_KEY_SIZE"
39613949
| "TLS_CIPHER_CHACHA20_POLY1305_SALT_SIZE"
39623950
| "TLS_CIPHER_CHACHA20_POLY1305_TAG_SIZE"
39633951
| "TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE"
3964-
if (aarch64 || arm || i686 || mips || s390x || x86_64) && musl =>
3952+
if (aarch64 || arm || i686 || s390x || x86_64) && musl =>
39653953
{
39663954
true
39673955
}
@@ -4155,15 +4143,11 @@ fn test_linux(target: &str) {
41554143
});
41564144

41574145
cfg.skip_roundtrip(move |s| match s {
4158-
// FIXME:
4159-
"utsname" if mips32 || mips64 => true,
41604146
// FIXME:
41614147
"mcontext_t" if s390x => true,
41624148
// FIXME: This is actually a union.
41634149
"fpreg_t" if s390x => true,
41644150

4165-
"sockaddr_un" | "sembuf" | "ff_constant_effect" if mips32 && (gnu || musl) => true,
4166-
41674151
// The test doesn't work on some env:
41684152
"ipv6_mreq"
41694153
| "ip_mreq_source"
@@ -4183,7 +4167,7 @@ fn test_linux(target: &str) {
41834167
| "sockaddr_nl"
41844168
| "termios"
41854169
| "nlmsgerr"
4186-
if (mips64 || sparc64) && gnu =>
4170+
if sparc64 && gnu =>
41874171
{
41884172
true
41894173
}
@@ -4196,7 +4180,7 @@ fn test_linux(target: &str) {
41964180
"cmsghdr" => true,
41974181

41984182
// FIXME: the call ABI of max_align_t is incorrect on these platforms:
4199-
"max_align_t" if i686 || mips64 || ppc64 => true,
4183+
"max_align_t" if i686 || ppc64 => true,
42004184

42014185
_ => false,
42024186
});

0 commit comments

Comments
 (0)