Skip to content

Commit 13e275c

Browse files
authored
Unrolled build for rust-lang#137324
Rollup merge of rust-lang#137324 - flba-eb:rename_qnx_target_name_i586, r=workingjubilee Make x86 QNX target name consistent with other Rust targets Rename target to be consistent with other Rust targets: Use `i686` instead of `i586` See also - rust-lang#136495 - rust-lang#109173 CC: `@jonathanpallant` `@japaric` `@gh-tr` `@samkearney`
2 parents f04bbc6 + 32a1ff1 commit 13e275c

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

compiler/rustc_target/src/spec/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2001,7 +2001,7 @@ supported_targets! {
20012001
("x86_64-pc-nto-qnx710", x86_64_pc_nto_qnx710),
20022002
("x86_64-pc-nto-qnx710_iosock", x86_64_pc_nto_qnx710_iosock),
20032003
("x86_64-pc-nto-qnx800", x86_64_pc_nto_qnx800),
2004-
("i586-pc-nto-qnx700", i586_pc_nto_qnx700),
2004+
("i686-pc-nto-qnx700", i686_pc_nto_qnx700),
20052005

20062006
("aarch64-unknown-linux-ohos", aarch64_unknown_linux_ohos),
20072007
("armv7-unknown-linux-ohos", armv7_unknown_linux_ohos),

src/doc/rustc/src/platform-support.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,10 +309,10 @@ target | std | host | notes
309309
[`hexagon-unknown-linux-musl`](platform-support/hexagon-unknown-linux-musl.md) | ✓ | | Hexagon Linux with musl 1.2.3
310310
[`hexagon-unknown-none-elf`](platform-support/hexagon-unknown-none-elf.md)| * | | Bare Hexagon (v60+, HVX)
311311
[`i386-apple-ios`](platform-support/apple-ios.md) | ✓ | | 32-bit x86 iOS (Penryn) [^x86_32-floats-return-ABI]
312-
[`i586-pc-nto-qnx700`](platform-support/nto-qnx.md) | * | | 32-bit x86 QNX Neutrino 7.0 RTOS (Pentium 4) [^x86_32-floats-return-ABI]
313312
[`i586-unknown-netbsd`](platform-support/netbsd.md) | ✓ | | 32-bit x86 (original Pentium) [^x86_32-floats-x87]
314313
[`i586-unknown-redox`](platform-support/redox.md) | ✓ | | 32-bit x86 Redox OS (PentiumPro) [^x86_32-floats-x87]
315314
[`i686-apple-darwin`](platform-support/apple-darwin.md) | ✓ | ✓ | 32-bit macOS (10.12+, Sierra+, Penryn) [^x86_32-floats-return-ABI]
315+
[`i686-pc-nto-qnx700`](platform-support/nto-qnx.md) | * | | 32-bit x86 QNX Neutrino 7.0 RTOS (Pentium 4) [^x86_32-floats-return-ABI]
316316
`i686-unknown-haiku` | ✓ | ✓ | 32-bit Haiku (Pentium 4) [^x86_32-floats-return-ABI]
317317
[`i686-unknown-hurd-gnu`](platform-support/hurd.md) | ✓ | ✓ | 32-bit GNU/Hurd (Pentium 4) [^x86_32-floats-return-ABI]
318318
[`i686-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | NetBSD/i386 (Pentium 4) [^x86_32-floats-return-ABI]

src/doc/rustc/src/platform-support/nto-qnx.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Currently, the following QNX versions and compilation targets are supported:
3131
| `aarch64-unknown-nto-qnx710_iosock` | QNX Neutrino 7.1 with io-sock | AArch64 | ? ||
3232
| `x86_64-pc-nto-qnx710_iosock` | QNX Neutrino 7.1 with io-sock | x86_64 | ? ||
3333
| `aarch64-unknown-nto-qnx700` | QNX Neutrino 7.0 | AArch64 | ? ||
34-
| `i586-pc-nto-qnx700` | QNX Neutrino 7.0 | x86 | ||
34+
| `i686-pc-nto-qnx700` | QNX Neutrino 7.0 | x86 | ||
3535

3636
On QNX Neutrino 7.0 and 7.1, `io-pkt` is used as network stack by default.
3737
QNX Neutrino 7.1 includes the optional network stack `io-sock`.

src/tools/tidy/src/target_policy.rs

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const EXCEPTIONS: &[&str] = &[
2121
"xtensa_esp32s2_espidf",
2222
"xtensa_esp32s3_none_elf",
2323
"xtensa_esp32s3_espidf",
24+
"i586_pc_nto_qnx700", // Renamed to i686-pc-nto-qnx700, see https://github.com/rust-lang/rust/issues/136495
2425
];
2526

2627
pub fn check(root_path: &Path, bad: &mut bool) {

tests/assembly/targets/targets-elf.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@
216216
//@ revisions: hexagon_unknown_none_elf
217217
//@ [hexagon_unknown_none_elf] compile-flags: --target hexagon-unknown-none-elf
218218
//@ [hexagon_unknown_none_elf] needs-llvm-components: hexagon
219-
//@ revisions: i586_pc_nto_qnx700
220-
//@ [i586_pc_nto_qnx700] compile-flags: --target i586-pc-nto-qnx700
221-
//@ [i586_pc_nto_qnx700] needs-llvm-components: x86
219+
//@ revisions: i686_pc_nto_qnx700
220+
//@ [i686_pc_nto_qnx700] compile-flags: --target i686-pc-nto-qnx700
221+
//@ [i686_pc_nto_qnx700] needs-llvm-components: x86
222222
//@ revisions: i586_unknown_linux_gnu
223223
//@ [i586_unknown_linux_gnu] compile-flags: --target i586-unknown-linux-gnu
224224
//@ [i586_unknown_linux_gnu] needs-llvm-components: x86

0 commit comments

Comments
 (0)