Merge #215 #218

215: Rename .cargo/config to config.toml r=stlankes a=mkroening 218: Strongly link panic and oom handlers r=stlankes a=mkroening Depends on hermit-os/hermit-rs#139. Having weak linkage on the handlers does no harm but is not necessary after the before mentioned PR. Co-authored-by: Martin Kröning <mkroening@posteo.net>
hermit-os · Jun 11, 2021 · fe762de · fe762de
3 parents 3293b10 + 0f390e8 + 53dcc07
commit fe762de
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git 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!(