Skip to content

Commit 4359f43

Browse files
committed
make abort-on-panic work on Android
1 parent 3ec8dd8 commit 4359f43

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

ci.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ case $HOST_TARGET in
8484
MIRI_TEST_TARGET=aarch64-apple-darwin run_tests
8585
MIRI_TEST_TARGET=i686-pc-windows-msvc run_tests
8686
MIRI_TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal hello integer vec panic/panic concurrency/simple atomic data_race env/var
87-
MIRI_TEST_TARGET=aarch64-linux-android run_tests_minimal hello integer vec
87+
MIRI_TEST_TARGET=aarch64-linux-android run_tests_minimal hello integer vec panic/panic
8888
MIRI_TEST_TARGET=thumbv7em-none-eabihf MIRI_NO_STD=1 run_tests_minimal no_std # no_std embedded architecture
8989
;;
9090
x86_64-apple-darwin)

src/shims/unix/android/dlsym.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ impl Dlsym {
1515
pub fn from_str<'tcx>(name: &str) -> InterpResult<'tcx, Option<Dlsym>> {
1616
Ok(match &*name {
1717
"signal" => Some(Dlsym::signal),
18+
"android_set_abort_message" => None,
1819
_ => throw_unsup_format!("unsupported Android dlsym: {}", name),
1920
})
2021
}

0 commit comments

Comments
 (0)