Make libstd compile.

Author: reitermarkus

compiler/rustc_target/src/spec/xtensa_esp32_none_elf.rs

@@ -10,14 +10,16 @@ pub fn target() -> Target {
         options: TargetOptions {
             endian: "little".to_string(),
             c_int_width: "32".to_string(),
-            os: "none".to_string(),
-            env: String::new(),
-            vendor: String::new(),
+            os: "freertos".to_string(),
+            target_family: Some("unix".to_string()),
+            env: "newlib".to_string(),
+            vendor: "espressif".to_string(),
             linker_flavor: LinkerFlavor::Gcc,
 
             executables: true,
             cpu: "esp32".to_string(),
             linker: Some("xtensa-esp32-elf-gcc".to_string()),
+            linker_is_gnu: true,
 
             max_atomic_width: Some(32),
 

compiler/rustc_target/src/spec/xtensa_esp8266_none_elf.rs

@@ -10,14 +10,16 @@ pub fn target() -> Target {
         options: TargetOptions {
             endian: "little".to_string(),
             c_int_width: "32".to_string(),
-            os: "none".to_string(),
-            env: String::new(),
-            vendor: String::new(),
+            os: "freertos".to_string(),
+            target_family: Some("unix".to_string()),
+            env: "newlib".to_string(),
+            vendor: "espressif".to_string(),
             linker_flavor: LinkerFlavor::Gcc,
 
             executables: true,
             cpu: "esp8266".to_string(),
             linker: Some("xtensa-lx106-elf-gcc".to_string()),
+            linker_is_gnu: true,
 
             max_atomic_width: Some(32),
 

library/panic_unwind/src/gcc.rs

@@ -123,6 +123,9 @@ const UNWIND_DATA_REG: (i32, i32) = (0, 1); // R0, R1
 #[cfg(any(target_arch = "riscv64", target_arch = "riscv32"))]
 const UNWIND_DATA_REG: (i32, i32) = (10, 11); // x10, x11
 
+#[cfg(target_arch = "xtensa")]
+const UNWIND_DATA_REG: (i32, i32) = (2, 3); // A2, A3
+
 // The following code is based on GCC's C and C++ personality routines.  For reference, see:
 // https://github.com/gcc-mirror/gcc/blob/master/libstdc++-v3/libsupc++/eh_personality.cc
 // https://github.com/gcc-mirror/gcc/blob/trunk/libgcc/unwind-c.c

library/std/build.rs

@@ -28,6 +28,10 @@ fn main() {
         || target.contains("asmjs")
     {
         // These platforms don't have any special requirements.
+    } else if target.contains("esp32") {
+        println!(r#"cargo:rustc-cfg=target_device="esp32""#);
+    } else if target.contains("esp8266") {
+        println!(r#"cargo:rustc-cfg=target_device="esp8266""#);
     } else {
         // This is for Cargo's build-std support, to mark std as unstable for
         // typically no_std platforms.

library/std/src/lib.rs

@@ -275,6 +275,7 @@
 #![feature(into_future)]
 #![feature(lang_items)]
 #![feature(link_args)]
+#![feature(linked_list_remove)]
 #![feature(linkage)]
 #![feature(llvm_asm)]
 #![feature(log_syntax)]

library/std/src/os/freertos/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`]: ../../../../std/fs/struct.Metadata.html
+#[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_atime as i64
+    }
+    fn st_atime_nsec(&self) -> i64 {
+        0
+    }
+    fn st_mtime(&self) -> i64 {
+        self.as_inner().as_inner().st_mtime as i64
+    }
+    fn st_mtime_nsec(&self) -> i64 {
+        0
+    }
+    fn st_ctime(&self) -> i64 {
+        self.as_inner().as_inner().st_ctime as i64
+    }
+    fn st_ctime_nsec(&self) -> i64 {
+        0
+    }
+    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/freertos/mod.rs

@@ -0,0 +1,6 @@
+//! FreeRTOS-specific definitions
+
+#![stable(feature = "raw_ext", since = "1.1.0")]
+
+pub mod raw;
+pub mod fs;

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

@@ -0,0 +1,17 @@
+//! FreeRTOS-specific raw type definitions
+
+#![stable(feature = "raw_ext", since = "1.1.0")]
+#![rustc_deprecated(since = "1.8.0",
+                    reason = "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)]
+#![allow(missing_debug_implementations)]
+
+#[stable(feature = "pthread_t", since = "1.8.0")]
+pub use libc::pthread_t;
+
+#[doc(inline)]
+#[stable(feature = "raw_ext", since = "1.1.0")]
+pub use libc::{dev_t, mode_t, off_t, ino_t, nlink_t, blksize_t, blkcnt_t, stat, time_t};

library/std/src/os/mod.rs

@@ -48,6 +48,8 @@ pub mod emscripten;
 pub mod fortanix_sgx;
 #[cfg(target_os = "freebsd")]
 pub mod freebsd;
+#[cfg(target_os = "freertos")]
+pub mod freertos;
 #[cfg(target_os = "fuchsia")]
 pub mod fuchsia;
 #[cfg(target_os = "haiku")]

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

@@ -53,7 +53,12 @@ unsafe impl GlobalAlloc for System {
 }
 
 cfg_if::cfg_if! {
-    if #[cfg(any(
+    if #[cfg(target_os = "freertos")] {
+        #[inline]
+        unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 {
+            libc::malloc(layout.size()) as *mut u8
+        }
+    } else if #[cfg(any(
         target_os = "android",
         target_os = "illumos",
         target_os = "redox",