Skip to content

Commit f41e0bb

Browse files
nyuriknyurik
committed
Squashed aarch64_unknown_nto_qnx700 support
1 parent ac77e88 commit f41e0bb

File tree

10 files changed

+84
-40
lines changed

10 files changed

+84
-40
lines changed

‎compiler/rustc_target/src/spec/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1837,6 +1837,7 @@ supported_targets! {
18371837

18381838
("mips64-openwrt-linux-musl", mips64_openwrt_linux_musl),
18391839

1840+
("aarch64-unknown-nto-qnx700", aarch64_unknown_nto_qnx700),
18401841
("aarch64-unknown-nto-qnx710", aarch64_unknown_nto_qnx710),
18411842
("x86_64-pc-nto-qnx710", x86_64_pc_nto_qnx710),
18421843
("i586-pc-nto-qnx700", i586_pc_nto_qnx700),

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_nto_qnx700.rs

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
use crate::spec::{base, Cc, LinkerFlavor, Lld, Target, TargetOptions};
2+
3+
pub fn target() -> Target {
4+
// In QNX, libc does not provide a compatible ABI between versions.
5+
// To distinguish between QNX versions, we needed a stable conditional compilation switch,
6+
// which is why we needed to implement different targets in the compiler.
7+
Target {
8+
llvm_target: "aarch64-unknown-unknown".into(),
9+
metadata: crate::spec::TargetMetadata {
10+
description: Some("ARM64 QNX Neutrino 7.0 RTOS".into()),
11+
tier: Some(3),
12+
host_tools: Some(false),
13+
std: Some(true),
14+
},
15+
pointer_width: 64,
16+
// from: https://llvm.org/docs/LangRef.html#data-layout
17+
// e = little endian
18+
// m:e = ELF mangling: Private symbols get a .L prefix
19+
// i8:8:32 = 8-bit-integer, minimum_alignment=8, preferred_alignment=32
20+
// i16:16:32 = 16-bit-integer, minimum_alignment=16, preferred_alignment=32
21+
// i64:64 = 64-bit-integer, minimum_alignment=64, preferred_alignment=64
22+
// i128:128 = 128-bit-integer, minimum_alignment=128, preferred_alignment=128
23+
// n32:64 = 32 and 64 are native integer widths; Elements of this set are considered to support most general arithmetic operations efficiently.
24+
// S128 = 128 bits are the natural alignment of the stack in bits.
25+
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
26+
arch: "aarch64".into(),
27+
options: TargetOptions {
28+
features: "+v8a".into(),
29+
max_atomic_width: Some(128),
30+
pre_link_args: TargetOptions::link_args(
31+
LinkerFlavor::Gnu(Cc::Yes, Lld::No),
32+
&["-Vgcc_ntoaarch64le_cxx"],
33+
),
34+
env: "nto70".into(),
35+
..base::nto_qnx::opts()
36+
},
37+
}
38+
}

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_nto_qnx710.rs

+5-32
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,8 @@
1-
use crate::spec::{base, Cc, LinkerFlavor, Lld, Target, TargetOptions};
1+
use crate::spec::Target;
22

33
pub fn target() -> Target {
4-
Target {
5-
llvm_target: "aarch64-unknown-unknown".into(),
6-
metadata: crate::spec::TargetMetadata {
7-
description: Some("ARM64 QNX Neutrino 7.1 RTOS".into()),
8-
tier: Some(3),
9-
host_tools: Some(false),
10-
std: Some(true),
11-
},
12-
pointer_width: 64,
13-
// from: https://llvm.org/docs/LangRef.html#data-layout
14-
// e = little endian
15-
// m:e = ELF mangling: Private symbols get a .L prefix
16-
// i8:8:32 = 8-bit-integer, minimum_alignment=8, preferred_alignment=32
17-
// i16:16:32 = 16-bit-integer, minimum_alignment=16, preferred_alignment=32
18-
// i64:64 = 64-bit-integer, minimum_alignment=64, preferred_alignment=64
19-
// i128:128 = 128-bit-integer, minimum_alignment=128, preferred_alignment=128
20-
// n32:64 = 32 and 64 are native integer widths; Elements of this set are considered to support most general arithmetic operations efficiently.
21-
// S128 = 128 bits are the natural alignment of the stack in bits.
22-
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),
23-
arch: "aarch64".into(),
24-
options: TargetOptions {
25-
features: "+v8a".into(),
26-
max_atomic_width: Some(128),
27-
pre_link_args: TargetOptions::link_args(
28-
LinkerFlavor::Gnu(Cc::Yes, Lld::No),
29-
&["-Vgcc_ntoaarch64le_cxx"],
30-
),
31-
env: "nto71".into(),
32-
..base::nto_qnx::opts()
33-
},
34-
}
4+
let mut base = super::aarch64_unknown_nto_qnx700::target();
5+
base.metadata.description = Some("ARM64 QNX Neutrino 7.1 RTOS".into());
6+
base.options.env = "nto71".into();
7+
base
358
}

‎library/std/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ miniz_oxide = { version = "0.7.0", optional = true, default-features = false }
3535
addr2line = { version = "0.22.0", optional = true, default-features = false }
3636

3737
[target.'cfg(not(all(windows, target_env = "msvc")))'.dependencies]
38-
libc = { version = "0.2.153", default-features = false, features = [
38+
libc = { version = "0.2.156", default-features = false, features = [
3939
'rustc-dep-of-std',
4040
], public = true }
4141

‎library/std/src/sys/pal/unix/fs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1717,7 +1717,7 @@ pub fn link(original: &Path, link: &Path) -> io::Result<()> {
17171717
run_path_with_cstr(original, &|original| {
17181718
run_path_with_cstr(link, &|link| {
17191719
cfg_if::cfg_if! {
1720-
if #[cfg(any(target_os = "vxworks", target_os = "redox", target_os = "android", target_os = "espidf", target_os = "horizon", target_os = "vita"))] {
1720+
if #[cfg(any(target_os = "vxworks", target_os = "redox", target_os = "android", target_os = "espidf", target_os = "horizon", target_os = "vita", target_os = "nto"))] {
17211721
// VxWorks, Redox and ESP-IDF lack `linkat`, so use `link` instead. POSIX leaves
17221722
// it implementation-defined whether `link` follows symlinks, so rely on the
17231723
// `symlink_hard_link` test in library/std/src/fs/tests.rs to check the behavior.

‎library/std/src/sys/pal/unix/process/process_unix.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ use crate::sys::process::process_common::*;
1919
use crate::{fmt, mem, sys};
2020

2121
cfg_if::cfg_if! {
22-
if #[cfg(all(target_os = "nto", target_env = "nto71"))] {
22+
// This workaround is only needed for QNX 7.0 and 7.1. The bug should have been fixed in 8.0
23+
if #[cfg(any(target_env = "nto70", target_env = "nto71"))] {
2324
use crate::thread;
2425
use libc::{c_char, posix_spawn_file_actions_t, posix_spawnattr_t};
2526
use crate::time::Duration;
@@ -189,7 +190,8 @@ impl Command {
189190
#[cfg(not(any(
190191
target_os = "watchos",
191192
target_os = "tvos",
192-
all(target_os = "nto", target_env = "nto71"),
193+
target_env = "nto70",
194+
target_env = "nto71"
193195
)))]
194196
unsafe fn do_fork(&mut self) -> Result<pid_t, io::Error> {
195197
cvt(libc::fork())
@@ -199,7 +201,8 @@ impl Command {
199201
// or closed a file descriptor while the fork() was occurring".
200202
// Documentation says "... or try calling fork() again". This is what we do here.
201203
// See also https://www.qnx.com/developers/docs/7.1/#com.qnx.doc.neutrino.lib_ref/topic/f/fork.html
202-
#[cfg(all(target_os = "nto", target_env = "nto71"))]
204+
// This workaround is only needed for QNX 7.0 and 7.1. The bug should have been fixed in 8.0
205+
#[cfg(any(target_env = "nto70", target_env = "nto71"))]
203206
unsafe fn do_fork(&mut self) -> Result<pid_t, io::Error> {
204207
use crate::sys::os::errno;
205208

@@ -537,7 +540,7 @@ impl Command {
537540
// or closed a file descriptor while the posix_spawn() was occurring".
538541
// Documentation says "... or try calling posix_spawn() again". This is what we do here.
539542
// See also http://www.qnx.com/developers/docs/7.1/#com.qnx.doc.neutrino.lib_ref/topic/p/posix_spawn.html
540-
#[cfg(all(target_os = "nto", target_env = "nto71"))]
543+
#[cfg(target_os = "nto")]
541544
unsafe fn retrying_libc_posix_spawnp(
542545
pid: *mut pid_t,
543546
file: *const c_char,

‎library/unwind/src/lib.rs

+9-2
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,15 @@ extern "C" {}
165165
extern "C" {}
166166

167167
#[cfg(target_os = "nto")]
168-
#[link(name = "gcc_s")]
169-
extern "C" {}
168+
cfg_if::cfg_if! {
169+
if #[cfg(target_env = "nto70")] {
170+
#[link(name = "gcc")]
171+
extern "C" {}
172+
} else {
173+
#[link(name = "gcc_s")]
174+
extern "C" {}
175+
}
176+
}
170177

171178
#[cfg(target_os = "hurd")]
172179
#[link(name = "gcc_s")]

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

+1
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ target | std | host | notes
256256
[`aarch64-kmc-solid_asp3`](platform-support/kmc-solid.md) | ✓ | | ARM64 SOLID with TOPPERS/ASP3
257257
[`aarch64-nintendo-switch-freestanding`](platform-support/aarch64-nintendo-switch-freestanding.md) | * | | ARM64 Nintendo Switch, Horizon
258258
[`aarch64-unknown-teeos`](platform-support/aarch64-unknown-teeos.md) | ? | | ARM64 TEEOS |
259+
[`aarch64-unknown-nto-qnx700`](platform-support/nto-qnx.md) | ? | | ARM64 QNX Neutrino 7.0 RTOS |
259260
[`aarch64-unknown-nto-qnx710`](platform-support/nto-qnx.md) | ✓ | | ARM64 QNX Neutrino 7.1 RTOS |
260261
`aarch64-unknown-freebsd` | ✓ | ✓ | ARM64 FreeBSD
261262
[`aarch64-unknown-hermit`](platform-support/hermit.md) | ✓ | | ARM64 Hermit

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

+18
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Currently, the following QNX Neutrino versions and compilation targets are suppo
2424
|----------------------|---------------------|:------------:|:----------------:|
2525
| 7.1 | AArch64 | ✓ | ✓ |
2626
| 7.1 | x86_64 | ✓ | ✓ |
27+
| 7.0 | AArch64 | ? | ✓ |
2728
| 7.0 | x86 | | ✓ |
2829

2930
Adding other architectures that are supported by QNX Neutrino is possible.
@@ -43,6 +44,23 @@ When linking `no_std` applications, they must link against `libc.so` (see exampl
4344
required because applications always link against the `crt` library and `crt` depends on `libc.so`.
4445
This is done automatically when using the standard library.
4546

47+
### Disabling RELocation Read-Only (RELRO)
48+
49+
While not recommended by default, some QNX kernel setups may require the `RELRO` to be disabled with `-C relro_level=off`, e.g. by adding it to the `.cargo/config.toml` file:
50+
51+
```toml
52+
[target.aarch64-unknown-nto-qnx700]
53+
rustflags = ["-C", "relro_level=off"]
54+
```
55+
56+
If your QNX kernel does not allow it, and `relro` is not disabled, running compiled binary would fail with `syntax error: ... unexpected` or similar. This is due to kernel trying to interpret compiled binary with `/bin/sh`, and obviously failing. To verify that this is really the case, run your binary with the `DL_DEBUG=all` env var, and look for this output. If you see it, you should disable `relro` as described above.
57+
58+
```text
59+
Resolution scope for Executable->/bin/sh:
60+
Executable->/bin/sh
61+
libc.so.4->/usr/lib/ldqnx-64.so.2
62+
```
63+
4664
### Small example application
4765

4866
Small `no_std` example is shown below. Applications using the standard library work as well.

‎tests/assembly/targets/targets-elf.rs

+3
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@
5454
//@ revisions: aarch64_unknown_none_softfloat
5555
//@ [aarch64_unknown_none_softfloat] compile-flags: --target aarch64-unknown-none-softfloat
5656
//@ [aarch64_unknown_none_softfloat] needs-llvm-components: aarch64
57+
//@ revisions: aarch64_unknown_nto_qnx700
58+
//@ [aarch64_unknown_nto_qnx700] compile-flags: --target aarch64-unknown-nto-qnx700
59+
//@ [aarch64_unknown_nto_qnx700] needs-llvm-components: aarch64
5760
//@ revisions: aarch64_unknown_nto_qnx710
5861
//@ [aarch64_unknown_nto_qnx710] compile-flags: --target aarch64-unknown-nto-qnx710
5962
//@ [aarch64_unknown_nto_qnx710] needs-llvm-components: aarch64

0 commit comments

Comments
 (0)