From 3c31ec35cf5b31be6aa3e26c1693f3f48e426706 Mon Sep 17 00:00:00 2001
From: Ruihan Li <lrh2000@pku.edu.cn>
Date: Tue, 2 Apr 2024 23:12:17 +0800
Subject: [PATCH] Fix empty backtraces when panicking

---
 OSDK.toml                      | 2 +-
 osdk/src/commands/build/mod.rs | 3 +++
 osdk/src/commands/test.rs      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/OSDK.toml b/OSDK.toml
index 0c3190ae..ad9838b0 100644
--- a/OSDK.toml
+++ b/OSDK.toml
@@ -91,4 +91,4 @@ args = [
     "-device virtio-net-device,netdev=net01",
     "-device virtio-serial-device",
     "-device virtconsole,chardev=mux",
-]
\ No newline at end of file
+]
diff --git a/osdk/src/commands/build/mod.rs b/osdk/src/commands/build/mod.rs
index be6cdd09..cb465437 100644
--- a/osdk/src/commands/build/mod.rs
+++ b/osdk/src/commands/build/mod.rs
@@ -133,6 +133,9 @@ fn build_kernel_elf(
         "-C code-model=kernel",
         "-C relocation-model=static",
         "-Z relro-level=off",
+        // We do not really allow unwinding except for kernel testing. However, we need to specify
+        // this to show backtraces when panicking.
+        "-C panic=unwind",
     ]);
 
     let mut command = cargo();
diff --git a/osdk/src/commands/test.rs b/osdk/src/commands/test.rs
index dd5489f2..bbaa9e66 100644
--- a/osdk/src/commands/test.rs
+++ b/osdk/src/commands/test.rs
@@ -66,7 +66,7 @@ pub static KTEST_CRATE_WHITELIST: Option<&[&str]> = Some(&{:#?});
         &osdk_target_directory,
         &ws_target_directory,
         &required_build_config,
-        &["--cfg ktest", "-C panic=unwind"],
+        &["--cfg ktest"],
     );
     std::env::remove_var("RUSTFLAGS");
     std::env::set_current_dir(original_dir).unwrap();