Skip to content

Commit 3620eec

Browse files
AkhilTThomasflba-eb
authored andcommitted
add nto80 x86-64 and aarch64 target
Signed-off-by: Florian Bartels <[email protected]>
1 parent 9bb1668 commit 3620eec

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

std/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ test = true
139139
level = "warn"
140140
check-cfg = [
141141
'cfg(bootstrap)',
142-
'cfg(target_arch, values("xtensa", "aarch64-unknown-nto-qnx710_iosock", "x86_64-pc-nto-qnx710_iosock"))',
143-
'cfg(target_env, values("nto71_iosock"))',
142+
'cfg(target_arch, values("xtensa", "aarch64-unknown-nto-qnx710_iosock", "x86_64-pc-nto-qnx710_iosock", "x86_64-pc-nto-qnx800","aarch64-unknown-nto-qnx800"))',
143+
'cfg(target_env, values("nto71_iosock", "nto80"))',
144144
# std use #[path] imports to portable-simd `std_float` crate
145145
# and to the `backtrace` crate which messes-up with Cargo list
146146
# of declared features, we therefor expect any feature cfg

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

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

2121
cfg_if::cfg_if! {
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", target_env = "nto71_iosock"))] {
22+
if #[cfg(target_os = "nto")] {
2423
use crate::thread;
2524
use libc::{c_char, posix_spawn_file_actions_t, posix_spawnattr_t};
2625
use crate::time::Duration;
@@ -187,13 +186,7 @@ impl Command {
187186

188187
// Attempts to fork the process. If successful, returns Ok((0, -1))
189188
// in the child, and Ok((child_pid, -1)) in the parent.
190-
#[cfg(not(any(
191-
target_os = "watchos",
192-
target_os = "tvos",
193-
target_env = "nto70",
194-
target_env = "nto71",
195-
target_env = "nto71_iosock",
196-
)))]
189+
#[cfg(not(any(target_os = "watchos", target_os = "tvos", target_os = "nto")))]
197190
unsafe fn do_fork(&mut self) -> Result<pid_t, io::Error> {
198191
cvt(libc::fork())
199192
}
@@ -202,8 +195,7 @@ impl Command {
202195
// or closed a file descriptor while the fork() was occurring".
203196
// Documentation says "... or try calling fork() again". This is what we do here.
204197
// See also https://www.qnx.com/developers/docs/7.1/#com.qnx.doc.neutrino.lib_ref/topic/f/fork.html
205-
// This workaround is only needed for QNX 7.0 and 7.1. The bug should have been fixed in 8.0
206-
#[cfg(any(target_env = "nto70", target_env = "nto71", target_env = "nto71_iosock"))]
198+
#[cfg(target_os = "nto")]
207199
unsafe fn do_fork(&mut self) -> Result<pid_t, io::Error> {
208200
use crate::sys::os::errno;
209201

0 commit comments

Comments
 (0)