From 1ad0e77cae2c4078b6eeb2465dcb021644fe4b5a Mon Sep 17 00:00:00 2001
From: mwojcik <mw@m-labs.hk>
Date: Wed, 1 Sep 2021 11:42:41 +0200
Subject: [PATCH] satman: added unwind as it seems necessary

---
 src/satman/Cargo.toml  | 1 +
 src/satman/src/main.rs | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/satman/Cargo.toml b/src/satman/Cargo.toml
index bc484f4e..3b2b34d8 100644
--- a/src/satman/Cargo.toml
+++ b/src/satman/Cargo.toml
@@ -24,3 +24,4 @@ libregister = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
 libconfig = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git", features = ["ipv6"] }
 
 libboard_artiq = { path = "../libboard_artiq" }
+unwind = { path = "../libunwind" }
diff --git a/src/satman/src/main.rs b/src/satman/src/main.rs
index 9d3dda06..ac656fb3 100644
--- a/src/satman/src/main.rs
+++ b/src/satman/src/main.rs
@@ -14,6 +14,8 @@ extern crate libsupport_zynq;
 extern crate libcortex_a9;
 extern crate libregister;
 
+extern crate unwind;
+
 extern crate alloc;
 
 use libboard_zynq::{i2c::I2c, timer::GlobalTimer, time::Milliseconds, print, println, mpcore, gic, stdio};
@@ -597,12 +599,6 @@ pub extern fn exception(_vect: u32, _regs: *const u32, pc: u32, ea: u32) {
     panic!("exception at PC 0x{:x}, EA 0x{:x}", pc, ea)
 }
 
-#[no_mangle]
-pub extern fn abort() {
-    println!("aborted");
-    loop {}
-}
-
 #[no_mangle] // https://github.com/rust-lang/rust/issues/{38281,51647}
 #[panic_handler]
 pub fn panic_fmt(info: &core::panic::PanicInfo) -> ! {