diff options
| author | bors <bors@rust-lang.org> | 2015-06-24 01:07:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-06-24 01:07:36 +0000 |
| commit | ba770ae0945346bfd6edc1c07734028c32e48d4e (patch) | |
| tree | face8b9753236f71891c8a4ab1fd44f24966c0a1 /src/liblibc | |
| parent | 4b4a672a8ff711f9f04aca55a1149fe8f9a31b82 (diff) | |
| parent | 11ec95b949e7d7f0262321ce13c6b5243a5bdf3d (diff) | |
| download | rust-ba770ae0945346bfd6edc1c07734028c32e48d4e.tar.gz rust-ba770ae0945346bfd6edc1c07734028c32e48d4e.zip | |
Auto merge of #26521 - oli-obk:android-x86-libclibc, r=alexcrichton
All types are same as Android/arm. So I add condition for Android/x86 closes #25475 r? @alexcrichton
Diffstat (limited to 'src/liblibc')
| -rw-r--r-- | src/liblibc/lib.rs | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index 893bceed582..47268fbc4c1 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -441,12 +441,12 @@ pub mod types { pub type intmax_t = i64; pub type uintmax_t = u64; } - #[cfg(any(target_arch = "x86", - target_arch = "mips", + #[cfg(any(target_arch = "mips", target_arch = "mipsel", target_arch = "powerpc", target_arch = "le32", - all(target_arch = "arm", not(target_os = "android"))))] + all(any(target_arch = "arm", target_arch = "x86"), + not(target_os = "android"))))] pub mod posix88 { pub type off_t = i32; pub type dev_t = u64; @@ -458,7 +458,8 @@ pub mod types { pub type mode_t = u32; pub type ssize_t = i32; } - #[cfg(all(target_arch = "arm", target_os = "android"))] + #[cfg(all(any(target_arch = "arm", target_arch = "x86"), + target_os = "android"))] pub mod posix88 { pub type off_t = i32; pub type dev_t = u32; @@ -473,7 +474,8 @@ pub mod types { #[cfg(any(target_arch = "x86", target_arch = "le32", target_arch = "powerpc", - all(target_arch = "arm", not(target_os = "android"))))] + all(any(target_arch = "arm", target_arch = "x86"), + not(target_os = "android"))))] pub mod posix01 { use types::os::arch::c95::{c_short, c_long, time_t}; use types::os::arch::posix88::{dev_t, gid_t, ino_t}; @@ -519,7 +521,8 @@ pub mod types { pub __size: [u32; 9] } } - #[cfg(all(target_arch = "arm", target_os = "android"))] + #[cfg(all(any(target_arch = "arm", target_arch = "x86"), + target_os = "android"))] pub mod posix01 { use types::os::arch::c95::{c_uchar, c_uint, c_ulong, time_t}; use types::os::arch::c99::{c_longlong, c_ulonglong}; @@ -5916,13 +5919,15 @@ pub mod funcs { use types::os::arch::c95::c_int; use types::os::common::posix01::sighandler_t; - #[cfg(not(all(target_os = "android", target_arch = "arm")))] + #[cfg(not(all(target_os = "android", any(target_arch = "arm", + target_arch = "x86"))))] extern { pub fn signal(signum: c_int, handler: sighandler_t) -> sighandler_t; } - #[cfg(all(target_os = "android", target_arch = "arm"))] + #[cfg(all(target_os = "android", any(target_arch = "arm", + target_arch = "x86")))] extern { #[link_name = "bsd_signal"] pub fn signal(signum: c_int, |