Skip to content

Commit 4ab234c

Browse files
committed
Auto merge of #526 - Fulkerson:master, r=posborne
Remove EPOLLWAKEUP and SIGEV_THREAD_ID when cross-compiling to MIPS. With this nix builds for mipsel-unknown-linux-gnu.
2 parents cb1c915 + 965341c commit 4ab234c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/sys/epoll.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ libc_bitflags!(
2020
EPOLLRDHUP,
2121
#[cfg(target_os = "linux")] // Added in 4.5; not in Android.
2222
EPOLLEXCLUSIVE,
23+
#[cfg(not(target_arch = "mips"))]
2324
EPOLLWAKEUP,
2425
EPOLLONESHOT,
2526
EPOLLET,

src/sys/signal.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,9 +467,9 @@ impl SigEvent {
467467
SigevNotify::SigevKevent{..} => libc::SIGEV_KEVENT,
468468
#[cfg(target_os = "freebsd")]
469469
SigevNotify::SigevThreadId{..} => libc::SIGEV_THREAD_ID,
470-
#[cfg(all(target_os = "linux", target_env = "gnu"))]
470+
#[cfg(all(target_os = "linux", target_env = "gnu", not(target_arch = "mips")))]
471471
SigevNotify::SigevThreadId{..} => libc::SIGEV_THREAD_ID,
472-
#[cfg(all(target_os = "linux", target_env = "musl"))]
472+
#[cfg(any(all(target_os = "linux", target_env = "musl"), target_arch = "mips"))]
473473
SigevNotify::SigevThreadId{..} => 4 // No SIGEV_THREAD_ID defined
474474
};
475475
sev.sigev_signo = match sigev_notify {

0 commit comments

Comments
 (0)