Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make x86 QNX target name consistent with other Rust targets #137324

Merged
merged 1 commit into from
Feb 21, 2025
Merged

Make x86 QNX target name consistent with other Rust targets #137324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2001,7 +2001,7 @@ supported_targets! {
("x86_64-pc-nto-qnx710", x86_64_pc_nto_qnx710),
("x86_64-pc-nto-qnx710_iosock", x86_64_pc_nto_qnx710_iosock),
("x86_64-pc-nto-qnx800", x86_64_pc_nto_qnx800),
("i586-pc-nto-qnx700", i586_pc_nto_qnx700),
("i686-pc-nto-qnx700", i686_pc_nto_qnx700),

("aarch64-unknown-linux-ohos", aarch64_unknown_linux_ohos),
("armv7-unknown-linux-ohos", armv7_unknown_linux_ohos),
Expand Down
0 ...et/src/spec/targets/i586_pc_nto_qnx700.rs → ...et/src/spec/targets/i686_pc_nto_qnx700.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/doc/rustc/src/platform-support.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,10 @@ target | std | host | notes
[`hexagon-unknown-linux-musl`](platform-support/hexagon-unknown-linux-musl.md) | ✓ | | Hexagon Linux with musl 1.2.3
[`hexagon-unknown-none-elf`](platform-support/hexagon-unknown-none-elf.md)| * | | Bare Hexagon (v60+, HVX)
[`i386-apple-ios`](platform-support/apple-ios.md) | ✓ | | 32-bit x86 iOS (Penryn) [^x86_32-floats-return-ABI]
[`i586-pc-nto-qnx700`](platform-support/nto-qnx.md) | * | | 32-bit x86 QNX Neutrino 7.0 RTOS (Pentium 4) [^x86_32-floats-return-ABI]
[`i586-unknown-netbsd`](platform-support/netbsd.md) | ✓ | | 32-bit x86 (original Pentium) [^x86_32-floats-x87]
[`i586-unknown-redox`](platform-support/redox.md) | ✓ | | 32-bit x86 Redox OS (PentiumPro) [^x86_32-floats-x87]
[`i686-apple-darwin`](platform-support/apple-darwin.md) | ✓ | ✓ | 32-bit macOS (10.12+, Sierra+, Penryn) [^x86_32-floats-return-ABI]
[`i686-pc-nto-qnx700`](platform-support/nto-qnx.md) | * | | 32-bit x86 QNX Neutrino 7.0 RTOS (Pentium 4) [^x86_32-floats-return-ABI]
`i686-unknown-haiku` | ✓ | ✓ | 32-bit Haiku (Pentium 4) [^x86_32-floats-return-ABI]
[`i686-unknown-hurd-gnu`](platform-support/hurd.md) | ✓ | ✓ | 32-bit GNU/Hurd (Pentium 4) [^x86_32-floats-return-ABI]
[`i686-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | NetBSD/i386 (Pentium 4) [^x86_32-floats-return-ABI]
Expand Down
2 changes: 1 addition & 1 deletion src/doc/rustc/src/platform-support/nto-qnx.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Currently, the following QNX versions and compilation targets are supported:
| `aarch64-unknown-nto-qnx710_iosock` | QNX Neutrino 7.1 with io-sock | AArch64 | ? | ✓ |
| `x86_64-pc-nto-qnx710_iosock` | QNX Neutrino 7.1 with io-sock | x86_64 | ? | ✓ |
| `aarch64-unknown-nto-qnx700` | QNX Neutrino 7.0 | AArch64 | ? | ✓ |
| `i586-pc-nto-qnx700` | QNX Neutrino 7.0 | x86 | | ✓ |
| `i686-pc-nto-qnx700` | QNX Neutrino 7.0 | x86 | | ✓ |

On QNX Neutrino 7.0 and 7.1, `io-pkt` is used as network stack by default.
QNX Neutrino 7.1 includes the optional network stack `io-sock`.
Expand Down
1 change: 1 addition & 0 deletions src/tools/tidy/src/target_policy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const EXCEPTIONS: &[&str] = &[
"xtensa_esp32s2_espidf",
"xtensa_esp32s3_none_elf",
"xtensa_esp32s3_espidf",
"i586_pc_nto_qnx700", // Renamed to i686-pc-nto-qnx700, see https://github.com/rust-lang/rust/issues/136495
Copy link
Member

@Noratrieb Noratrieb Feb 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this necessary? The old target is supposed to be gone, from the diff.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was necessary as otherwise the test and the end failed (I got the missing assembly test error message).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe tidy uses the bootstrap rustc to determine the list of targets it expects tests for

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought so too but #137367 seems to work so

];

pub fn check(root_path: &Path, bad: &mut bool) {
Expand Down
6 changes: 3 additions & 3 deletions tests/assembly/targets/targets-elf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,9 @@
//@ revisions: hexagon_unknown_none_elf
//@ [hexagon_unknown_none_elf] compile-flags: --target hexagon-unknown-none-elf
//@ [hexagon_unknown_none_elf] needs-llvm-components: hexagon
//@ revisions: i586_pc_nto_qnx700
//@ [i586_pc_nto_qnx700] compile-flags: --target i586-pc-nto-qnx700
//@ [i586_pc_nto_qnx700] needs-llvm-components: x86
//@ revisions: i686_pc_nto_qnx700
//@ [i686_pc_nto_qnx700] compile-flags: --target i686-pc-nto-qnx700
//@ [i686_pc_nto_qnx700] needs-llvm-components: x86
//@ revisions: i586_unknown_linux_gnu
//@ [i586_unknown_linux_gnu] compile-flags: --target i586-unknown-linux-gnu
//@ [i586_unknown_linux_gnu] needs-llvm-components: x86
Expand Down
Loading