From 13426f444746f028e7f2bfa7420fd769b67be191 Mon Sep 17 00:00:00 2001 From: Till Wegmueller Date: Thu, 22 Jun 2023 21:11:10 +0200 Subject: [PATCH 1/3] Add illumos aarch64 target Signed-off-by: Till Wegmueller --- .../src/spec/aarch64_unknown_illumos.rs | 19 +++++++++++++++++++ compiler/rustc_target/src/spec/mod.rs | 1 + src/doc/rustc/src/platform-support.md | 1 + 3 files changed, 21 insertions(+) create mode 100644 compiler/rustc_target/src/spec/aarch64_unknown_illumos.rs diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_illumos.rs b/compiler/rustc_target/src/spec/aarch64_unknown_illumos.rs new file mode 100644 index 0000000000000..25ce3c77c6f1e --- /dev/null +++ b/compiler/rustc_target/src/spec/aarch64_unknown_illumos.rs @@ -0,0 +1,19 @@ +use crate::spec::{Cc, LinkerFlavor, SanitizerSet, Target}; + +pub fn target() -> Target { + let mut base = super::illumos_base::opts(); + base.add_pre_link_args(LinkerFlavor::Unix(Cc::Yes), &["-std=c99"]); + base.cpu = "aarch64".into(); + base.max_atomic_width = Some(128); + base.supported_sanitizers = SanitizerSet::ADDRESS | SanitizerSet::CFI; + + Target { + // LLVM does not currently have a separate illumos target, + // so we still pass Solaris to it + llvm_target: "aarch64-unknown-solaris2.11".into(), + pointer_width: 64, + data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".into(), + arch: "aarch64".into(), + options: base, + } +} diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs index dbce2f30f9397..a2215f26df964 100644 --- a/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs @@ -1586,6 +1586,7 @@ supported_targets! { ("sparcv9-sun-solaris", sparcv9_sun_solaris), ("x86_64-unknown-illumos", x86_64_unknown_illumos), + ("aarch64-unknown-illumos", aarch64_unknown_illumos), ("x86_64-pc-windows-gnu", x86_64_pc_windows_gnu), ("i686-pc-windows-gnu", i686_pc_windows_gnu), diff --git a/src/doc/rustc/src/platform-support.md b/src/doc/rustc/src/platform-support.md index 3671fdd3fd2be..b4b2060d4874a 100644 --- a/src/doc/rustc/src/platform-support.md +++ b/src/doc/rustc/src/platform-support.md @@ -229,6 +229,7 @@ target | std | host | notes [`aarch64-unknown-nto-qnx710`](platform-support/nto-qnx.md) | ✓ | | ARM64 QNX Neutrino 7.1 RTOS | `aarch64-unknown-freebsd` | ✓ | ✓ | ARM64 FreeBSD [`aarch64-unknown-hermit`](platform-support/hermit.md) | ✓ | | ARM64 Hermit +`aarch64-unknown-illumos` | ✓ | ✓ | ARM64 illumos `aarch64-unknown-linux-gnu_ilp32` | ✓ | ✓ | ARM64 Linux (ILP32 ABI) [`aarch64-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | ARM64 NetBSD [`aarch64-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | ARM64 OpenBSD From 5af05f8dfdf0873381806eb470ae3d1f7bcc06b2 Mon Sep 17 00:00:00 2001 From: Till Wegmueller Date: Mon, 4 Dec 2023 12:48:57 -0800 Subject: [PATCH 2/3] Update target to be in line with recent target refactors Signed-off-by: Till Wegmueller --- .../src/spec/{ => targets}/aarch64_unknown_illumos.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename compiler/rustc_target/src/spec/{ => targets}/aarch64_unknown_illumos.rs (84%) diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_illumos.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_illumos.rs similarity index 84% rename from compiler/rustc_target/src/spec/aarch64_unknown_illumos.rs rename to compiler/rustc_target/src/spec/targets/aarch64_unknown_illumos.rs index 25ce3c77c6f1e..f4e4ac51ae720 100644 --- a/compiler/rustc_target/src/spec/aarch64_unknown_illumos.rs +++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_illumos.rs @@ -1,7 +1,7 @@ -use crate::spec::{Cc, LinkerFlavor, SanitizerSet, Target}; +use crate::spec::{base, Cc, LinkerFlavor, SanitizerSet, Target}; pub fn target() -> Target { - let mut base = super::illumos_base::opts(); + let mut base = base::illumos::opts(); base.add_pre_link_args(LinkerFlavor::Unix(Cc::Yes), &["-std=c99"]); base.cpu = "aarch64".into(); base.max_atomic_width = Some(128); From 074809bc8174341887340eff814677fa40362813 Mon Sep 17 00:00:00 2001 From: Till Wegmueller Date: Thu, 21 Dec 2023 11:59:05 -0800 Subject: [PATCH 3/3] Removing unneeded cpu defintion and add features analogous to netbsd/freebsd Signed-off-by: Till Wegmueller --- .../rustc_target/src/spec/targets/aarch64_unknown_illumos.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_illumos.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_illumos.rs index f4e4ac51ae720..634cb063a49b2 100644 --- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_illumos.rs +++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_illumos.rs @@ -3,9 +3,9 @@ use crate::spec::{base, Cc, LinkerFlavor, SanitizerSet, Target}; pub fn target() -> Target { let mut base = base::illumos::opts(); base.add_pre_link_args(LinkerFlavor::Unix(Cc::Yes), &["-std=c99"]); - base.cpu = "aarch64".into(); base.max_atomic_width = Some(128); base.supported_sanitizers = SanitizerSet::ADDRESS | SanitizerSet::CFI; + base.features = "+v8a".into(); Target { // LLVM does not currently have a separate illumos target,