summary refs log tree commit diff
path: root/src/liblibc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-02-17 19:35:12 +0000
committerbors <bors@rust-lang.org>2015-02-17 19:35:12 +0000
commit6c065fc8cb036785f61ff03e05c1563cbb2dd081 (patch)
tree9d5c813da4a4f24c177e10c9a38936fe0d014721 /src/liblibc
parentf9aeea7cb7865a2b82e7102837daabbe549177ea (diff)
parent194d96e5c3b3bf069ff791813641b7d22f4f42e9 (diff)
downloadrust-6c065fc8cb036785f61ff03e05c1563cbb2dd081.tar.gz
rust-6c065fc8cb036785f61ff03e05c1563cbb2dd081.zip
Auto merge of #21774 - ejjeong:enable-test-for-android, r=alexcrichton
- Now "make check-stage2-T-aarch64-linux-android-H-x86_64-unknown-linux-gnu" works (#21773)
- Fix & enable debuginfo tests for android (#10381)
- Fix & enable more tests for android (both for arm/aarch64)
- Enable many already-pass tests on android (both for arm/aarch64)
Diffstat (limited to 'src/liblibc')
-rw-r--r--src/liblibc/lib.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs
index 4535e0b1691..e42b6c9c356 100644
--- a/src/liblibc/lib.rs
+++ b/src/liblibc/lib.rs
@@ -5473,6 +5473,7 @@ pub mod funcs {
         use types::os::arch::c95::{c_uchar, c_int, size_t};
 
         extern {
+            #[cfg(not(all(target_os = "android", target_arch = "aarch64")))]
             pub fn getdtablesize() -> c_int;
             pub fn ioctl(d: c_int, request: c_int, ...) -> c_int;
             pub fn madvise(addr: *mut c_void, len: size_t, advice: c_int)