diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-03 14:13:17 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-03 17:02:23 +0530 |
| commit | d7a44beb55cd1180acb3e49309ab7585cbf2503a (patch) | |
| tree | d3edccf0c2dbb1bd7570cff2bb6240b35574ee48 /src/libstd | |
| parent | d8a91b95d1cdf7da8c57342ba163b35dc98a9260 (diff) | |
| parent | a7fe94fc0cd5ebebe171da54b3804e97f8eb7aeb (diff) | |
| download | rust-d7a44beb55cd1180acb3e49309ab7585cbf2503a.tar.gz rust-d7a44beb55cd1180acb3e49309ab7585cbf2503a.zip | |
Rollup merge of #22956 - ejjeong:aarch64-linux-android, r=alexcrichton
aarch64-linux-android build has been broken since #22839. Aarch64 android has _Unwind_GetIPInfo, so re-define this only for arm32 android. r? @alexcrichton
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/unix/backtrace.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/backtrace.rs b/src/libstd/sys/unix/backtrace.rs index 3695b615f62..d78cfd0ca37 100644 --- a/src/libstd/sys/unix/backtrace.rs +++ b/src/libstd/sys/unix/backtrace.rs @@ -566,7 +566,7 @@ mod uw { // This function doesn't exist on Android or ARM/Linux, so make it same // to _Unwind_GetIP - #[cfg(any(target_os = "android", + #[cfg(any(all(target_os = "android", target_arch = "arm"), all(target_os = "linux", target_arch = "arm")))] pub unsafe fn _Unwind_GetIPInfo(ctx: *mut _Unwind_Context, ip_before_insn: *mut libc::c_int) |