use aapcs as system abi

Author: max-niederman

compiler/rustc_target/src/spec/mod.rs

@@ -2262,6 +2262,8 @@ pub struct TargetOptions {
     pub is_like_wasm: bool,
     /// Whether a target toolchain is like Android, implying a Linux kernel and a Bionic libc
     pub is_like_android: bool,
+    /// Whether a target toolchain is like VEXos.
+    pub is_like_vexos: bool,
     /// Default supported version of DWARF on this platform.
     /// Useful because some platforms (osx, bsd) only want up to DWARF2.
     pub default_dwarf_version: u32,
@@ -2617,6 +2619,7 @@ impl Default for TargetOptions {
             is_like_msvc: false,
             is_like_wasm: false,
             is_like_android: false,
+            is_like_vexos: false,
             default_dwarf_version: 4,
             allows_weak_linkage: true,
             has_rpath: false,
@@ -2724,6 +2727,7 @@ impl Target {
             Abi::System { unwind } if self.is_like_windows && self.arch == "x86" && !c_variadic => {
                 Abi::Stdcall { unwind }
             }
+            Abi::System { unwind } if self.is_like_vexos && !c_variadic => Abi::Aapcs { unwind },
             Abi::System { unwind } => Abi::C { unwind },
             Abi::EfiApi if self.arch == "arm" => Abi::Aapcs { unwind: false },
             Abi::EfiApi if self.arch == "x86_64" => Abi::Win64 { unwind: false },
@@ -3377,6 +3381,7 @@ impl Target {
         key!(is_like_msvc, bool);
         key!(is_like_wasm, bool);
         key!(is_like_android, bool);
+        key!(is_like_vexos, bool);
         key!(default_dwarf_version, u32);
         key!(allows_weak_linkage, bool);
         key!(has_rpath, bool);
@@ -3657,6 +3662,7 @@ impl ToJson for Target {
         target_option_val!(is_like_msvc);
         target_option_val!(is_like_wasm);
         target_option_val!(is_like_android);
+        target_option_val!(is_like_vexos);
         target_option_val!(default_dwarf_version);
         target_option_val!(allows_weak_linkage);
         target_option_val!(has_rpath);

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

@@ -16,6 +16,7 @@ pub(crate) fn target() -> Target {
         arch: "arm".into(),
         options: TargetOptions {
             os: "vexos".into(),
+            is_like_vexos: true,
             vendor: "vex".into(),
             cpu: "cortex-a9".into(),
             abi: "eabihf".into(),

library/Cargo.lock

@@ -418,9 +418,9 @@ dependencies = [
 
 [[package]]
 name = "vex-sdk"
-version = "0.17.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f285bbc2b96fc4c7fae42ebe365dd2e9121e7002a58b1a9e0e4b1d14dba4d6d0"
+checksum = "79ec210898aed247c0fb1ae4834b4648669050ae8275423a1ce5cc3d6f07649a"
 dependencies = [
  "compiler_builtins",
  "rustc-std-workspace-core",

library/std/Cargo.toml

@@ -91,7 +91,7 @@ r-efi = { version = "4.5.0", features = ['rustc-dep-of-std'] }
 r-efi-alloc = { version = "1.0.0", features = ['rustc-dep-of-std'] }
 
 [target.'cfg(target_os = "vexos")'.dependencies]
-vex-sdk = { version = "0.17.0", features = ['rustc-dep-of-std'] }
+vex-sdk = { version = "0.21.0", features = ['rustc-dep-of-std'] }
 
 [features]
 backtrace = [

library/std/src/sys/pal/vexos/alloc.rs

@@ -1,8 +1,6 @@
-use crate::{
-    alloc::{GlobalAlloc, Layout, System},
-    ptr,
-    sync::atomic::{AtomicBool, Ordering},
-};
+use crate::alloc::{GlobalAlloc, Layout, System};
+use crate::ptr;
+use crate::sync::atomic::{AtomicBool, Ordering};
 
 static mut DLMALLOC: dlmalloc::Dlmalloc<Vexos> = dlmalloc::Dlmalloc::new_with_allocator(Vexos);