From c11c909a485d631e5c5bac8a79d0db2550ce9110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Fri, 1 Dec 2023 14:22:17 +0100 Subject: [PATCH] feat: remove usage of nightly `linkage` feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- rftrace/src/backend.rs | 5 +---- rftrace/src/lib.rs | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/rftrace/src/backend.rs b/rftrace/src/backend.rs index 46da294..5862449 100644 --- a/rftrace/src/backend.rs +++ b/rftrace/src/backend.rs @@ -39,11 +39,8 @@ static mut TID: Option = None; // Everytime we see a new thread (with emtpy thread-locals), we alloc out own TID static mut TID_NEXT: AtomicU64 = AtomicU64::new(1); -// Need to define own panic handler, since we are no_std -use core::panic::PanicInfo; -#[linkage = "weak"] #[panic_handler] -fn panic(_info: &PanicInfo) -> ! { +fn panic(_info: &core::panic::PanicInfo) -> ! { loop {} } diff --git a/rftrace/src/lib.rs b/rftrace/src/lib.rs index 80539a8..51a7647 100644 --- a/rftrace/src/lib.rs +++ b/rftrace/src/lib.rs @@ -5,7 +5,6 @@ #![cfg_attr(feature = "staticlib", feature(naked_functions))] #![cfg_attr(feature = "staticlib", feature(llvm_asm))] #![cfg_attr(feature = "staticlib", feature(thread_local))] -#![cfg_attr(feature = "staticlib", feature(linkage))] #![cfg_attr(feature = "staticlib", no_std)] mod interface;