QNX target renaming

- aarch64-unknown-nto-qnx800 becomes simply aarch64-unknown-qnx
- x86_64-pc-nto-qnx800 becomes simply x86_64-pc-qnx
- references to QNX OS and QNX Neutrino RTOS are replaced with QNX SDP for uniformity
- various nto_qnx modules are named to qnx_sdp to match the above

The new target names are more consistent with those used by the QNX SDP 8.0 toolchain, and reflect a level on ongoing API stability similar to that for macOS and Linux (which simply have minimum supported versions record for their targets).

Once the compiler knows about the new target names, libc and backtrace can be updated to match, and then building libstd for the new targets can be fixed.

With these changes I can run:

```console
$ ./x build library/std --stage 2 --target x86_64-pc-nto-qnx710,aarch64-unknown-nto-qnx710,x86_64-pc-nto-qnx710_iosock,aarch64-unknown-nto-qnx710_iosock,aarch64-unknown-nto-qnx700
$ ./x build library/core --stage 1 --target x86_64-pc-qnx,aarch64-unknown-qnx
```

Author: jonathanpallant

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

@@ -26,8 +26,8 @@ pub(crate) mod managarm_mlibc;
 pub(crate) mod motor;
 pub(crate) mod msvc;
 pub(crate) mod netbsd;
-pub(crate) mod nto_qnx;
 pub(crate) mod openbsd;
+pub(crate) mod qnx_sdp;
 pub(crate) mod redox;
 pub(crate) mod solaris;
 pub(crate) mod solid;

…er/rustc_target/src/spec/base/nto_qnx.rs …er/rustc_target/src/spec/base/qnx_sdp.rscompiler/rustc_target/src/spec/base/nto_qnx.rs renamed to compiler/rustc_target/src/spec/base/qnx_sdp.rs compiler/rustc_target/src/spec/base/nto_qnx.rs renamed to compiler/rustc_target/src/spec/base/qnx_sdp.rs

@@ -1790,10 +1790,10 @@ supported_targets! {
     ("aarch64-unknown-nto-qnx700", aarch64_unknown_nto_qnx700),
     ("aarch64-unknown-nto-qnx710", aarch64_unknown_nto_qnx710),
     ("aarch64-unknown-nto-qnx710_iosock", aarch64_unknown_nto_qnx710_iosock),
-    ("aarch64-unknown-nto-qnx800", aarch64_unknown_nto_qnx800),
+    ("aarch64-unknown-qnx", aarch64_unknown_qnx),
     ("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),
+    ("x86_64-pc-qnx", x86_64_pc_qnx),
     ("i686-pc-nto-qnx700", i686_pc_nto_qnx700),
 
     ("aarch64-unknown-linux-ohos", aarch64_unknown_linux_ohos),
@@ -1994,6 +1994,7 @@ crate::target_spec_enum! {
         OpenBsd = "openbsd",
         Psp = "psp",
         Psx = "psx",
+        Qnx = "qnx",
         Qurt = "qurt",
         Redox = "redox",
         Rtems = "rtems",
@@ -2034,7 +2035,6 @@ crate::target_spec_enum! {
         Nto70 = "nto70",
         Nto71 = "nto71",
         Nto71IoSock = "nto71_iosock",
-        Nto80 = "nto80",
         Ohos = "ohos",
         Relibc = "relibc",
         Sgx = "sgx",

compiler/rustc_target/src/spec/mod.rs

@@ -1,11 +1,12 @@
-use crate::spec::base::nto_qnx;
+use crate::spec::base::qnx_sdp;
 use crate::spec::{Env, Target};
 
 pub(crate) fn target() -> Target {
-    let mut target = nto_qnx::aarch64();
-    target.metadata.description = Some("ARM64 QNX Neutrino 7.0 RTOS".into());
+    let mut target = qnx_sdp::aarch64();
+    target.metadata.description = Some("ARM64 QNX SDP 7.0".into());
     target.options.pre_link_args =
-        nto_qnx::pre_link_args(nto_qnx::ApiVariant::Default, nto_qnx::Arch::Aarch64);
+        qnx_sdp::pre_link_args(qnx_sdp::ApiVariant::Default, qnx_sdp::Arch::Aarch64);
+    // for QNX SDP 7.x, we keep target_os = "nto" for backwards compatibility, and use target_env to specify which version
     target.options.env = Env::Nto70;
     target
 }

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

@@ -1,12 +1,12 @@
-use crate::spec::base::nto_qnx;
+use crate::spec::base::qnx_sdp;
 use crate::spec::{Env, Target};
 
 pub(crate) fn target() -> Target {
-    let mut target = nto_qnx::aarch64();
-    target.metadata.description =
-        Some("ARM64 QNX Neutrino 7.1 RTOS with io-pkt network stack".into());
+    let mut target = qnx_sdp::aarch64();
+    target.metadata.description = Some("ARM64 QNX SDP 7.1 with io-pkt network stack".into());
     target.options.pre_link_args =
-        nto_qnx::pre_link_args(nto_qnx::ApiVariant::Default, nto_qnx::Arch::Aarch64);
+        qnx_sdp::pre_link_args(qnx_sdp::ApiVariant::Default, qnx_sdp::Arch::Aarch64);
+    // for QNX SDP 7.x, we keep target_os = "nto" for backwards compatibility, and use target_env to specify which version
     target.options.env = Env::Nto71;
     target
 }

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

@@ -1,12 +1,12 @@
-use crate::spec::base::nto_qnx;
+use crate::spec::base::qnx_sdp;
 use crate::spec::{Env, Target};
 
 pub(crate) fn target() -> Target {
-    let mut target = nto_qnx::aarch64();
-    target.metadata.description =
-        Some("ARM64 QNX Neutrino 7.1 RTOS with io-sock network stack".into());
+    let mut target = qnx_sdp::aarch64();
+    target.metadata.description = Some("ARM64 QNX SDP 7.1 with io-sock network stack".into());
     target.options.pre_link_args =
-        nto_qnx::pre_link_args(nto_qnx::ApiVariant::IoSock, nto_qnx::Arch::Aarch64);
+        qnx_sdp::pre_link_args(qnx_sdp::ApiVariant::IoSock, qnx_sdp::Arch::Aarch64);
+    // for QNX SDP 7.x, we keep target_os = "nto" for backwards compatibility, and use target_env to specify which version
     target.options.env = Env::Nto71IoSock;
     target
 }

compiler/rustc_target/src/spec/targets/aarch64_unknown_nto_qnx710_iosock.rs

@@ -0,0 +1,12 @@
+use crate::spec::base::qnx_sdp;
+use crate::spec::{Os, Target};
+
+pub(crate) fn target() -> Target {
+    let mut target = qnx_sdp::aarch64();
+    target.metadata.description = Some("ARM64 QNX SDP 8.0+".into());
+    target.options.pre_link_args =
+        qnx_sdp::pre_link_args(qnx_sdp::ApiVariant::Default, qnx_sdp::Arch::Aarch64);
+    // for QNX SDP 8.0, we have target_os = "qnx" and no target_env
+    target.options.os = Os::Qnx;
+    target
+}

compiler/rustc_target/src/spec/targets/aarch64_unknown_nto_qnx800.rs

@@ -1,9 +1,9 @@
-use crate::spec::base::nto_qnx;
+use crate::spec::base::qnx_sdp;
 use crate::spec::{Arch, Env, RustcAbi, StackProbeType, Target, TargetOptions, base};
 
 pub(crate) fn target() -> Target {
-    let mut meta = nto_qnx::meta();
-    meta.description = Some("32-bit x86 QNX Neutrino 7.0 RTOS".into());
+    let mut meta = qnx_sdp::meta();
+    meta.description = Some("32-bit x86 QNX SDP 7.0".into());
     meta.std = Some(false);
     Target {
         llvm_target: "i586-pc-unknown".into(),
@@ -17,14 +17,15 @@ pub(crate) fn target() -> Target {
             rustc_abi: Some(RustcAbi::X86Sse2),
             cpu: "pentium4".into(),
             max_atomic_width: Some(64),
-            pre_link_args: nto_qnx::pre_link_args(
-                nto_qnx::ApiVariant::Default,
-                nto_qnx::Arch::I586,
+            pre_link_args: qnx_sdp::pre_link_args(
+                qnx_sdp::ApiVariant::Default,
+                qnx_sdp::Arch::I586,
             ),
+            // for QNX SDP 7.x, we keep target_os = "nto" for backwards compatibility, and use target_env to specify which version
             env: Env::Nto70,
             vendor: "pc".into(),
             stack_probes: StackProbeType::Inline,
-            ..base::nto_qnx::opts()
+            ..base::qnx_sdp::opts()
         },
     }
 }

compiler/rustc_target/src/spec/targets/aarch64_unknown_qnx.rs

@@ -1,12 +1,12 @@
-use crate::spec::base::nto_qnx;
+use crate::spec::base::qnx_sdp;
 use crate::spec::{Env, Target};
 
 pub(crate) fn target() -> Target {
-    let mut target = nto_qnx::x86_64();
-    target.metadata.description =
-        Some("x86 64-bit QNX Neutrino 7.1 RTOS with io-pkt network stack".into());
+    let mut target = qnx_sdp::x86_64();
+    target.metadata.description = Some("x86 64-bit QNX SDP 7.1 with io-pkt network stack".into());
     target.options.pre_link_args =
-        nto_qnx::pre_link_args(nto_qnx::ApiVariant::Default, nto_qnx::Arch::X86_64);
+        qnx_sdp::pre_link_args(qnx_sdp::ApiVariant::Default, qnx_sdp::Arch::X86_64);
+    // for QNX SDP 7.x, we keep target_os = "nto" for backwards compatibility, and use target_env to specify which version
     target.options.env = Env::Nto71;
     target
 }