about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEunji Jeong <eun-ji.jeong@samsung.com>2015-03-02 14:07:07 +0900
committerEunji Jeong <eun-ji.jeong@samsung.com>2015-03-02 14:35:58 +0900
commita7fe94fc0cd5ebebe171da54b3804e97f8eb7aeb (patch)
treeacf1e2a38c327337e4de5159e9af67570a0e5c75
parent157614249594f187f421cd97f928e64c5ab5c1fa (diff)
downloadrust-a7fe94fc0cd5ebebe171da54b3804e97f8eb7aeb.tar.gz
rust-a7fe94fc0cd5ebebe171da54b3804e97f8eb7aeb.zip
Fix broken aarch64 build
-rw-r--r--src/libstd/sys/unix/backtrace.rs2
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)