Skip to content

Commit d7a44be

Browse files
committed
Rollup merge of rust-lang#22956 - ejjeong:aarch64-linux-android, r=alexcrichton
aarch64-linux-android build has been broken since rust-lang#22839. Aarch64 android has _Unwind_GetIPInfo, so re-define this only for arm32 android. r? @alexcrichton
2 parents d8a91b9 + a7fe94f commit d7a44be

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/libstd/sys/unix/backtrace.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ mod uw {
566566

567567
// This function doesn't exist on Android or ARM/Linux, so make it same
568568
// to _Unwind_GetIP
569-
#[cfg(any(target_os = "android",
569+
#[cfg(any(all(target_os = "android", target_arch = "arm"),
570570
all(target_os = "linux", target_arch = "arm")))]
571571
pub unsafe fn _Unwind_GetIPInfo(ctx: *mut _Unwind_Context,
572572
ip_before_insn: *mut libc::c_int)

0 commit comments

Comments
 (0)