diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 09:15:59 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 09:15:59 -0800 |
| commit | a6780d8c6be311cd9a2e0cdda726469a04d21a9c (patch) | |
| tree | e119d0b5d837b05450e4766394949fc2c60ec539 /src/liblibc/lib.rs | |
| parent | 81504f211c36afb69fa2a13d475c45e65d7b2a31 (diff) | |
| parent | 940080501b76e559e3a2c0de1b15dc7b2353fd85 (diff) | |
| download | rust-a6780d8c6be311cd9a2e0cdda726469a04d21a9c.tar.gz rust-a6780d8c6be311cd9a2e0cdda726469a04d21a9c.zip | |
rollup merge of #21414: ejjeong/aarch64-linux-android
Initial support for aarch64-linux-android (#18920) - Add new configuration files - Modify some options to compile & link succesfully. (PIE, disable tls on jemalloc, modify some external function linkage, ..) - To build, refer to https://github.com/rust-lang/rust/wiki/Doc-building-for-android. (tested with platform=21 and toolchain=aarch64-linux-android-4.9)
Diffstat (limited to 'src/liblibc/lib.rs')
| -rw-r--r-- | src/liblibc/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index fa6468517e6..677a5f37a1b 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -4648,13 +4648,13 @@ pub mod funcs { use types::os::arch::c95::c_int; use types::os::common::posix01::sighandler_t; - #[cfg(not(target_os = "android"))] + #[cfg(not(all(target_os = "android", target_arch = "arm")))] extern { pub fn signal(signum: c_int, handler: sighandler_t) -> sighandler_t; } - #[cfg(target_os = "android")] + #[cfg(all(target_os = "android", target_arch = "arm"))] extern { #[link_name = "bsd_signal"] pub fn signal(signum: c_int, |