STD support for the Nintendo 3DS

compiler/rustc_target/src/spec/armv6k_nintendo_3ds.rs

@@ -37,7 +37,8 @@ pub fn target() -> Target {
  pre_link_args,
  exe_suffix: ".elf".into(),
  no_default_libraries: false,
- has_thread_local: true,
+ // There are some issues in debug builds with this enabled in certain programs.
+ has_thread_local: false,
  ..Default::default()
  },
  }

library/core/src/ffi/mod.rs

@@ -143,7 +143,8 @@ mod c_char_definition {
  target_arch = "powerpc"
  )
  ),
- all(target_os = "fuchsia", target_arch = "aarch64")
+ all(target_os = "fuchsia", target_arch = "aarch64"),
+ target_os = "horizon"
  ))] {
  pub type c_char = u8;
  pub type NonZero_c_char = crate::num::NonZeroU8;

library/std/build.rs

@@ -29,6 +29,7 @@ fn main() {
  || target.contains("asmjs")
  || target.contains("espidf")
  || target.contains("solid")
+ || target.contains("nintendo-3ds")
  {
  // These platforms don't have any special requirements.
  } else {

library/std/src/os/horizon/fs.rs

@@ -0,0 +1,95 @@
+#![stable(feature = "metadata_ext", since = "1.1.0")]
+
+use crate::fs::Metadata;
+use crate::sys_common::AsInner;
+
+/// OS-specific extensions to [`fs::Metadata`].
+///
+/// [`fs::Metadata`]: crate::fs::Metadata
+#[stable(feature = "metadata_ext", since = "1.1.0")]
+pub trait MetadataExt {
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_dev(&self) -> u64;
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_ino(&self) -> u64;
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_mode(&self) -> u32;
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_nlink(&self) -> u64;
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_uid(&self) -> u32;
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_gid(&self) -> u32;
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_rdev(&self) -> u64;
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_size(&self) -> u64;
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_atime(&self) -> i64;
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_atime_nsec(&self) -> i64;
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_mtime(&self) -> i64;
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_mtime_nsec(&self) -> i64;
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_ctime(&self) -> i64;
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_ctime_nsec(&self) -> i64;
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_blksize(&self) -> u64;
+ #[stable(feature = "metadata_ext2", since = "1.8.0")]
+ fn st_blocks(&self) -> u64;
+}
+
+#[stable(feature = "metadata_ext", since = "1.1.0")]
+impl MetadataExt for Metadata {
+ fn st_dev(&self) -> u64 {
+ self.as_inner().as_inner().st_dev as u64
+ }
+ fn st_ino(&self) -> u64 {
+ self.as_inner().as_inner().st_ino as u64
+ }
+ fn st_mode(&self) -> u32 {
+ self.as_inner().as_inner().st_mode as u32
+ }
+ fn st_nlink(&self) -> u64 {
+ self.as_inner().as_inner().st_nlink as u64
+ }
+ fn st_uid(&self) -> u32 {
+ self.as_inner().as_inner().st_uid as u32
+ }
+ fn st_gid(&self) -> u32 {
+ self.as_inner().as_inner().st_gid as u32
+ }
+ fn st_rdev(&self) -> u64 {
+ self.as_inner().as_inner().st_rdev as u64
+ }
+ fn st_size(&self) -> u64 {
+ self.as_inner().as_inner().st_size as u64
+ }
+ fn st_atime(&self) -> i64 {
+ self.as_inner().as_inner().st_atim.tv_sec
+ }
+ fn st_atime_nsec(&self) -> i64 {
+ self.as_inner().as_inner().st_atim.tv_nsec as i64
+ }
+ fn st_mtime(&self) -> i64 {
+ self.as_inner().as_inner().st_mtim.tv_sec
+ }
+ fn st_mtime_nsec(&self) -> i64 {
+ self.as_inner().as_inner().st_mtim.tv_nsec as i64
+ }
+ fn st_ctime(&self) -> i64 {
+ self.as_inner().as_inner().st_ctim.tv_sec
+ }
+ fn st_ctime_nsec(&self) -> i64 {
+ self.as_inner().as_inner().st_ctim.tv_nsec as i64
+ }
+ fn st_blksize(&self) -> u64 {
+ self.as_inner().as_inner().st_blksize as u64
+ }
+ fn st_blocks(&self) -> u64 {
+ self.as_inner().as_inner().st_blocks as u64
+ }
+}

library/std/src/os/horizon/mod.rs

@@ -0,0 +1,6 @@
+//! Definitions for Horizon OS
+
+#![stable(feature = "raw_ext", since = "1.1.0")]
+
+pub mod fs;
+pub(crate) mod raw;

library/std/src/os/horizon/raw.rs

@@ -0,0 +1,70 @@
+//! Horizon OS raw type definitions
+
+#![stable(feature = "raw_ext", since = "1.1.0")]
+#![deprecated(
+ since = "1.8.0",
+ note = "these type aliases are no longer supported by \
+ the standard library, the `libc` crate on \
+ crates.io should be used instead for the correct \
+ definitions"
+)]
+#![allow(deprecated)]
+
+use crate::os::raw::c_long;
+use crate::os::unix::raw::{gid_t, uid_t};
+
+#[stable(feature = "pthread_t", since = "1.8.0")]
+pub type pthread_t = libc::pthread_t;
+
+#[stable(feature = "raw_ext", since = "1.1.0")]
+pub type blkcnt_t = libc::blkcnt_t;
+
+#[stable(feature = "raw_ext", since = "1.1.0")]
+pub type blksize_t = libc::blksize_t;
+#[stable(feature = "raw_ext", since = "1.1.0")]
+pub type dev_t = libc::dev_t;
+#[stable(feature = "raw_ext", since = "1.1.0")]
+pub type ino_t = libc::ino_t;
+#[stable(feature = "raw_ext", since = "1.1.0")]
+pub type mode_t = libc::mode_t;
+#[stable(feature = "raw_ext", since = "1.1.0")]
+pub type nlink_t = libc::nlink_t;
+#[stable(feature = "raw_ext", since = "1.1.0")]
+pub type off_t = libc::off_t;
+
+#[stable(feature = "raw_ext", since = "1.1.0")]
+pub type time_t = libc::time_t;
+
+#[repr(C)]
+#[derive(Clone)]
+#[stable(feature = "raw_ext", since = "1.1.0")]
+pub struct stat {
+ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_dev: dev_t,
+ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_ino: ino_t,
+ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_mode: mode_t,
+ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_nlink: nlink_t,
+ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_uid: uid_t,
+ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_gid: gid_t,
+ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_rdev: dev_t,
+ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_size: off_t,
+ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_atime: time_t,
+ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_mtime: time_t,
+ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_ctime: time_t,
+ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_blksize: blksize_t,
+ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_blocks: blkcnt_t,
+ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_spare4: [c_long; 2usize],
+}

library/std/src/os/mod.rs

@@ -123,6 +123,8 @@ pub mod freebsd;
 pub mod fuchsia;
 #[cfg(target_os = "haiku")]
 pub mod haiku;
+#[cfg(target_os = "horizon")]
+pub mod horizon;
 #[cfg(target_os = "illumos")]
 pub mod illumos;
 #[cfg(target_os = "ios")]

library/std/src/os/unix/mod.rs

@@ -51,6 +51,8 @@ mod platform {
  pub use crate::os::fuchsia::*;
  #[cfg(target_os = "haiku")]
  pub use crate::os::haiku::*;
+ #[cfg(target_os = "horizon")]
+ pub use crate::os::horizon::*;
  #[cfg(target_os = "illumos")]
  pub use crate::os::illumos::*;
  #[cfg(target_os = "ios")]

library/std/src/os/unix/process.rs

@@ -12,6 +12,16 @@ use crate::sealed::Sealed;
 use crate::sys;
 use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
 
+#[cfg(not(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon")))]
+type UserId = u32;
+#[cfg(not(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon")))]
+type GroupId = u32;
+
+#[cfg(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon"))]
+type UserId = u16;
+#[cfg(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon"))]
+type GroupId = u16;
+
 /// Unix-specific extensions to the [`process::Command`] builder.
 ///
 /// This trait is sealed: it cannot be implemented outside the standard library.
@@ -22,29 +32,17 @@ pub trait CommandExt: Sealed {
  /// `setuid` call in the child process. Failure in the `setuid`
  /// call will cause the spawn to fail.
  #[stable(feature = "rust1", since = "1.0.0")]
- fn uid(
- &mut self,
- #[cfg(not(any(target_os = "vxworks", target_os = "espidf")))] id: u32,
- #[cfg(any(target_os = "vxworks", target_os = "espidf"))] id: u16,
- ) -> &mut process::Command;
+ fn uid(&mut self, id: UserId) -> &mut process::Command;
 
  /// Similar to `uid`, but sets the group ID of the child process. This has
  /// the same semantics as the `uid` field.
  #[stable(feature = "rust1", since = "1.0.0")]
- fn gid(
- &mut self,
- #[cfg(not(any(target_os = "vxworks", target_os = "espidf")))] id: u32,
- #[cfg(any(target_os = "vxworks", target_os = "espidf"))] id: u16,
- ) -> &mut process::Command;
+ fn gid(&mut self, id: GroupId) -> &mut process::Command;
 
  /// Sets the supplementary group IDs for the calling process. Translates to
  /// a `setgroups` call in the child process.
  #[unstable(feature = "setgroups", issue = "90747")]
- fn groups(
- &mut self,
- #[cfg(not(any(target_os = "vxworks", target_os = "espidf")))] groups: &[u32],
- #[cfg(any(target_os = "vxworks", target_os = "espidf"))] groups: &[u16],
- ) -> &mut process::Command;
+ fn groups(&mut self, groups: &[GroupId]) -> &mut process::Command;
 
  /// Schedules a closure to be run just before the `exec` function is
  /// invoked.
@@ -158,29 +156,17 @@ pub trait CommandExt: Sealed {
 
 #[stable(feature = "rust1", since = "1.0.0")]
 impl CommandExt for process::Command {
- fn uid(
- &mut self,
- #[cfg(not(any(target_os = "vxworks", target_os = "espidf")))] id: u32,
- #[cfg(any(target_os = "vxworks", target_os = "espidf"))] id: u16,
- ) -> &mut process::Command {
+ fn uid(&mut self, id: UserId) -> &mut process::Command {
  self.as_inner_mut().uid(id);
  self
  }
 
- fn gid(
- &mut self,
- #[cfg(not(any(target_os = "vxworks", target_os = "espidf")))] id: u32,
- #[cfg(any(target_os = "vxworks", target_os = "espidf"))] id: u16,
- ) -> &mut process::Command {
+ fn gid(&mut self, id: GroupId) -> &mut process::Command {
  self.as_inner_mut().gid(id);
  self
  }
 
- fn groups(
- &mut self,
- #[cfg(not(any(target_os = "vxworks", target_os = "espidf")))] groups: &[u32],
- #[cfg(any(target_os = "vxworks", target_os = "espidf"))] groups: &[u16],
- ) -> &mut process::Command {
+ fn groups(&mut self, groups: &[GroupId]) -> &mut process::Command {
  self.as_inner_mut().groups(groups);
  self
  }

library/std/src/sys/unix/alloc.rs

@@ -58,7 +58,8 @@ cfg_if::cfg_if! {
  target_os = "illumos",
  target_os = "redox",
  target_os = "solaris",
- target_os = "espidf"
+ target_os = "espidf",
+ target_os = "horizon"
  ))] {
  #[inline]
  unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 {

library/std/src/sys/unix/args.rs

@@ -68,7 +68,8 @@ impl DoubleEndedIterator for Args {
  target_os = "l4re",
  target_os = "fuchsia",
  target_os = "redox",
- target_os = "vxworks"
+ target_os = "vxworks",
+ target_os = "horizon"
 ))]
 mod imp {
  use super::Args;

library/std/src/sys/unix/env.rs

@@ -119,6 +119,17 @@ pub mod os {
  pub const EXE_EXTENSION: &str = "";
 }
 
+#[cfg(target_os = "horizon")]
+pub mod os {
+ pub const FAMILY: &str = "unix";
+ pub const OS: &str = "horizon";
+ pub const DLL_PREFIX: &str = "lib";
+ pub const DLL_SUFFIX: &str = ".so";
+ pub const DLL_EXTENSION: &str = "so";
+ pub const EXE_SUFFIX: &str = ".elf";
+ pub const EXE_EXTENSION: &str = "elf";
+}
+
 #[cfg(all(target_os = "emscripten", target_arch = "asmjs"))]
 pub mod os {
  pub const FAMILY: &str = "unix";