diff options
| author | Homu <homu@barosl.com> | 2017-02-26 04:46:16 +0900 |
|---|---|---|
| committer | Homu <homu@barosl.com> | 2017-02-26 04:46:16 +0900 |
| commit | 4ab234cd67249d8e74256079435187df6ef1a418 (patch) | |
| tree | 30eef7b8843e0e33fbdddb65311d4c169d8f0a83 | |
| parent | cb1c9150595a25a5f53f9ee77e37b5e9187824ac (diff) | |
| parent | 965341cc02553576e29d72af7a27f05b53553831 (diff) | |
| download | nix-4ab234cd67249d8e74256079435187df6ef1a418.zip | |
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.
| -rw-r--r-- | src/sys/epoll.rs | 1 | ||||
| -rw-r--r-- | src/sys/signal.rs | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/sys/epoll.rs b/src/sys/epoll.rs index 8632a18d..df48b9af 100644 --- a/src/sys/epoll.rs +++ b/src/sys/epoll.rs @@ -20,6 +20,7 @@ libc_bitflags!( EPOLLRDHUP, #[cfg(target_os = "linux")] // Added in 4.5; not in Android. EPOLLEXCLUSIVE, + #[cfg(not(target_arch = "mips"))] EPOLLWAKEUP, EPOLLONESHOT, EPOLLET, diff --git a/src/sys/signal.rs b/src/sys/signal.rs index a82722dd..10730598 100644 --- a/src/sys/signal.rs +++ b/src/sys/signal.rs @@ -467,9 +467,9 @@ impl SigEvent { SigevNotify::SigevKevent{..} => libc::SIGEV_KEVENT, #[cfg(target_os = "freebsd")] SigevNotify::SigevThreadId{..} => libc::SIGEV_THREAD_ID, - #[cfg(all(target_os = "linux", target_env = "gnu"))] + #[cfg(all(target_os = "linux", target_env = "gnu", not(target_arch = "mips")))] SigevNotify::SigevThreadId{..} => libc::SIGEV_THREAD_ID, - #[cfg(all(target_os = "linux", target_env = "musl"))] + #[cfg(any(all(target_os = "linux", target_env = "musl"), target_arch = "mips"))] SigevNotify::SigevThreadId{..} => 4 // No SIGEV_THREAD_ID defined }; sev.sigev_signo = match sigev_notify { |