From 53dcc07ca0dc09e19777a2eb895e87b2305f0a0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Thu, 10 Jun 2021 16:32:13 +0200 Subject: [PATCH 1/2] Strongly link panic and oom handlers --- src/runtime_glue.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/runtime_glue.rs b/src/runtime_glue.rs index f4ebce3e9d..541c623c94 100644 --- a/src/runtime_glue.rs +++ b/src/runtime_glue.rs @@ -16,7 +16,6 @@ use core::panic::PanicInfo; // see https://users.rust-lang.org/t/psa-breaking-change-panic-fmt-language-item-removed-in-favor-of-panic-implementation/17875 #[cfg(target_os = "hermit")] -#[linkage = "weak"] #[panic_handler] fn panic(info: &PanicInfo<'_>) -> ! { print!("[{}][!!!PANIC!!!] ", arch::percore::core_id()); @@ -40,7 +39,6 @@ fn panic(info: &PanicInfo<'_>) -> ! { } } -#[linkage = "weak"] #[alloc_error_handler] fn rust_oom(layout: Layout) -> ! { println!( From 0f390e8d1f91f83b19142fcb209d588c22ab2d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Thu, 10 Jun 2021 10:07:01 +0200 Subject: [PATCH 2/2] Rename .cargo/config to config.toml --- .cargo/{config => config.toml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .cargo/{config => config.toml} (100%) diff --git a/.cargo/config b/.cargo/config.toml similarity index 100% rename from .cargo/config rename to .cargo/config.toml