dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #112595 - hargoniX:l4re_fix, r=Mark-Simulacrum 

fix: get the l4re target working again

This is based on work from https://github.com/rust-lang/rust/pull/103966, addressing the review comment by `@m-ou-se` at the time and "fixing" the (probably newly) missing read_buf.
This commit is contained in:
bors 2023-06-17 21:59:08 +00:00
parent 3b2073f076 82466625b4
commit ed7281e784
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/std/src/personality.rs
View File

@ -29,7 +29,7 @@ cfg_if::cfg_if! {
all(target_family = "windows", target_env = "gnu"), all(target_family = "windows", target_env = "gnu"),
target_os = "psp", target_os = "psp",
target_os = "solid_asp3", target_os = "solid_asp3",
all(target_family = "unix", not(target_os = "espidf")), all(target_family = "unix", not(target_os = "espidf"), not(target_os = "l4re")),
all(target_vendor = "fortanix", target_env = "sgx"), all(target_vendor = "fortanix", target_env = "sgx"),
))] { ))] {
mod gcc; mod gcc;

6
library/std/src/sys/unix/l4re.rs
View File

@ -10,7 +10,7 @@ macro_rules! unimpl {
pub mod net { pub mod net {
#![allow(warnings)] #![allow(warnings)]
use crate::fmt; use crate::fmt;
use crate::io::{self, IoSlice, IoSliceMut}; use crate::io::{self, BorrowedCursor, IoSlice, IoSliceMut};
use crate::net::{Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr}; use crate::net::{Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr};
use crate::os::unix::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, RawFd}; use crate::os::unix::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, RawFd};
use crate::sys::fd::FileDesc; use crate::sys::fd::FileDesc;
@ -218,6 +218,10 @@ pub mod net {
unimpl!(); unimpl!();
} }
pub fn read_buf(&self, _: BorrowedCursor<'_>) -> io::Result<()> {
unimpl!();
}
pub fn read_vectored(&self, _: &mut [IoSliceMut<'_>]) -> io::Result<usize> { pub fn read_vectored(&self, _: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
unimpl!(); unimpl!();
} }

18
library/std/src/sys/unix/process/process_unix.rs
View File

@ -836,31 +836,47 @@ fn signal_string(signal: i32) -> &'static str {
libc::SIGILL => " (SIGILL)", libc::SIGILL => " (SIGILL)",
libc::SIGTRAP => " (SIGTRAP)", libc::SIGTRAP => " (SIGTRAP)",
libc::SIGABRT => " (SIGABRT)", libc::SIGABRT => " (SIGABRT)",
#[cfg(not(target_os = "l4re"))]
libc::SIGBUS => " (SIGBUS)", libc::SIGBUS => " (SIGBUS)",
libc::SIGFPE => " (SIGFPE)", libc::SIGFPE => " (SIGFPE)",
libc::SIGKILL => " (SIGKILL)", libc::SIGKILL => " (SIGKILL)",
#[cfg(not(target_os = "l4re"))]
libc::SIGUSR1 => " (SIGUSR1)", libc::SIGUSR1 => " (SIGUSR1)",
libc::SIGSEGV => " (SIGSEGV)", libc::SIGSEGV => " (SIGSEGV)",
#[cfg(not(target_os = "l4re"))]
libc::SIGUSR2 => " (SIGUSR2)", libc::SIGUSR2 => " (SIGUSR2)",
libc::SIGPIPE => " (SIGPIPE)", libc::SIGPIPE => " (SIGPIPE)",
libc::SIGALRM => " (SIGALRM)", libc::SIGALRM => " (SIGALRM)",
libc::SIGTERM => " (SIGTERM)", libc::SIGTERM => " (SIGTERM)",
#[cfg(not(target_os = "l4re"))]
libc::SIGCHLD => " (SIGCHLD)", libc::SIGCHLD => " (SIGCHLD)",
#[cfg(not(target_os = "l4re"))]
libc::SIGCONT => " (SIGCONT)", libc::SIGCONT => " (SIGCONT)",
#[cfg(not(target_os = "l4re"))]
libc::SIGSTOP => " (SIGSTOP)", libc::SIGSTOP => " (SIGSTOP)",
#[cfg(not(target_os = "l4re"))]
libc::SIGTSTP => " (SIGTSTP)", libc::SIGTSTP => " (SIGTSTP)",
#[cfg(not(target_os = "l4re"))]
libc::SIGTTIN => " (SIGTTIN)", libc::SIGTTIN => " (SIGTTIN)",
#[cfg(not(target_os = "l4re"))]
libc::SIGTTOU => " (SIGTTOU)", libc::SIGTTOU => " (SIGTTOU)",
#[cfg(not(target_os = "l4re"))]
libc::SIGURG => " (SIGURG)", libc::SIGURG => " (SIGURG)",
#[cfg(not(target_os = "l4re"))]
libc::SIGXCPU => " (SIGXCPU)", libc::SIGXCPU => " (SIGXCPU)",
#[cfg(not(target_os = "l4re"))]
libc::SIGXFSZ => " (SIGXFSZ)", libc::SIGXFSZ => " (SIGXFSZ)",
#[cfg(not(target_os = "l4re"))]
libc::SIGVTALRM => " (SIGVTALRM)", libc::SIGVTALRM => " (SIGVTALRM)",
#[cfg(not(target_os = "l4re"))]
libc::SIGPROF => " (SIGPROF)", libc::SIGPROF => " (SIGPROF)",
#[cfg(not(target_os = "l4re"))]
libc::SIGWINCH => " (SIGWINCH)", libc::SIGWINCH => " (SIGWINCH)",
#[cfg(not(target_os = "haiku"))] #[cfg(not(any(target_os = "haiku", target_os = "l4re")))]
libc::SIGIO => " (SIGIO)", libc::SIGIO => " (SIGIO)",
#[cfg(target_os = "haiku")] #[cfg(target_os = "haiku")]
libc::SIGPOLL => " (SIGPOLL)", libc::SIGPOLL => " (SIGPOLL)",
#[cfg(not(target_os = "l4re"))]
libc::SIGSYS => " (SIGSYS)", libc::SIGSYS => " (SIGSYS)",
// For information on Linux signals, run `man 7 signal` // For information on Linux signals, run `man 7 signal`
#[cfg(all( #[cfg(all(