diff options
| author | bors <bors@rust-lang.org> | 2014-06-24 13:46:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-24 13:46:54 +0000 |
| commit | 82ec1aef293ddc5c6373bd7f5ec323fafbdf7901 (patch) | |
| tree | 52730fbfa9ef29c85dd537fbd13829275e180504 /src/libnative | |
| parent | 71fe44def9676d519f5ce5d7304e581a42cf2c70 (diff) | |
| parent | 34a384a128d9630679f9c90bb27eaa0822e5b798 (diff) | |
| download | rust-82ec1aef293ddc5c6373bd7f5ec323fafbdf7901.tar.gz rust-82ec1aef293ddc5c6373bd7f5ec323fafbdf7901.zip | |
auto merge of #14963 : w3ln4/rust/master, r=alexcrichton
The aim of these changes is not working out a generic bi-endianness architectures support but to allow people develop for little endian MIPS machines (issue #7190).
Diffstat (limited to 'src/libnative')
| -rw-r--r-- | src/libnative/io/c_unix.rs | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/libnative/io/c_unix.rs b/src/libnative/io/c_unix.rs index 70fd6310070..7a52c048498 100644 --- a/src/libnative/io/c_unix.rs +++ b/src/libnative/io/c_unix.rs @@ -23,20 +23,26 @@ use libc; #[cfg(target_os = "ios")] #[cfg(target_os = "freebsd")] pub static FIONBIO: libc::c_ulong = 0x8004667e; -#[cfg(target_os = "linux", not(target_arch = "mips"))] +#[cfg(target_os = "linux", target_arch = "x86")] +#[cfg(target_os = "linux", target_arch = "x86_64")] +#[cfg(target_os = "linux", target_arch = "arm")] #[cfg(target_os = "android")] pub static FIONBIO: libc::c_ulong = 0x5421; #[cfg(target_os = "linux", target_arch = "mips")] +#[cfg(target_os = "linux", target_arch = "mipsel")] pub static FIONBIO: libc::c_ulong = 0x667e; #[cfg(target_os = "macos")] #[cfg(target_os = "ios")] #[cfg(target_os = "freebsd")] pub static FIOCLEX: libc::c_ulong = 0x20006601; -#[cfg(target_os = "linux", not(target_arch = "mips"))] +#[cfg(target_os = "linux", target_arch = "x86")] +#[cfg(target_os = "linux", target_arch = "x86_64")] +#[cfg(target_os = "linux", target_arch = "arm")] #[cfg(target_os = "android")] pub static FIOCLEX: libc::c_ulong = 0x5451; #[cfg(target_os = "linux", target_arch = "mips")] +#[cfg(target_os = "linux", target_arch = "mipsel")] pub static FIOCLEX: libc::c_ulong = 0x6601; #[cfg(target_os = "macos")] @@ -109,7 +115,9 @@ mod select { } } -#[cfg(target_os = "linux", not(target_arch = "mips"))] +#[cfg(target_os = "linux", target_arch = "x86")] +#[cfg(target_os = "linux", target_arch = "x86_64")] +#[cfg(target_os = "linux", target_arch = "arm")] #[cfg(target_os = "android")] mod signal { use libc; @@ -153,6 +161,7 @@ mod signal { } #[cfg(target_os = "linux", target_arch = "mips")] +#[cfg(target_os = "linux", target_arch = "mipsel")] mod signal { use libc; |