From d543c9aa6303373a6b660b93557a2d89256b0dd4 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Mon, 14 May 2018 07:32:55 +0000
Subject: [PATCH] =?UTF-8?q?firmware:=20backtrace=5Fartiq=20=E2=86=92=20unw?=
 =?UTF-8?q?ind=5Fbacktrace.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This crate isn't ARTIQ-specific.
---
 artiq/firmware/Cargo.lock                              | 10 +++++-----
 .../Cargo.toml                                         |  4 ++--
 .../{libbacktrace_artiq => libunwind_backtrace}/lib.rs |  0
 artiq/firmware/runtime/Cargo.toml                      |  2 +-
 artiq/firmware/runtime/main.rs                         |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename artiq/firmware/{libbacktrace_artiq => libunwind_backtrace}/Cargo.toml (58%)
 rename artiq/firmware/{libbacktrace_artiq => libunwind_backtrace}/lib.rs (100%)

diff --git a/artiq/firmware/Cargo.lock b/artiq/firmware/Cargo.lock
index 0d9aedad3..b1b82a1b9 100644
--- a/artiq/firmware/Cargo.lock
+++ b/artiq/firmware/Cargo.lock
@@ -13,10 +13,6 @@ dependencies = [
  "board 0.0.0",
 ]
 
-[[package]]
-name = "backtrace_artiq"
-version = "0.0.0"
-
 [[package]]
 name = "bitflags"
 version = "1.0.1"
@@ -215,7 +211,6 @@ version = "0.0.0"
 dependencies = [
  "alloc_list 0.0.0",
  "amp 0.0.0",
- "backtrace_artiq 0.0.0",
  "board 0.0.0",
  "board_artiq 0.0.0",
  "build_artiq 0.0.0",
@@ -230,6 +225,7 @@ dependencies = [
  "proto 0.0.0",
  "smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=181083f)",
  "std_artiq 0.0.0",
+ "unwind_backtrace 0.0.0",
 ]
 
 [[package]]
@@ -270,6 +266,10 @@ dependencies = [
 name = "std_artiq"
 version = "0.0.0"
 
+[[package]]
+name = "unwind_backtrace"
+version = "0.0.0"
+
 [[package]]
 name = "walkdir"
 version = "1.0.7"
diff --git a/artiq/firmware/libbacktrace_artiq/Cargo.toml b/artiq/firmware/libunwind_backtrace/Cargo.toml
similarity index 58%
rename from artiq/firmware/libbacktrace_artiq/Cargo.toml
rename to artiq/firmware/libunwind_backtrace/Cargo.toml
index afab53124..637e55bc6 100644
--- a/artiq/firmware/libbacktrace_artiq/Cargo.toml
+++ b/artiq/firmware/libunwind_backtrace/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 authors = ["M-Labs"]
-name = "backtrace_artiq"
+name = "unwind_backtrace"
 version = "0.0.0"
 
 [lib]
-name = "backtrace_artiq"
+name = "unwind_backtrace"
 path = "lib.rs"
diff --git a/artiq/firmware/libbacktrace_artiq/lib.rs b/artiq/firmware/libunwind_backtrace/lib.rs
similarity index 100%
rename from artiq/firmware/libbacktrace_artiq/lib.rs
rename to artiq/firmware/libunwind_backtrace/lib.rs
diff --git a/artiq/firmware/runtime/Cargo.toml b/artiq/firmware/runtime/Cargo.toml
index 899bb424b..b7a19a423 100644
--- a/artiq/firmware/runtime/Cargo.toml
+++ b/artiq/firmware/runtime/Cargo.toml
@@ -18,11 +18,11 @@ byteorder = { version = "1.0", default-features = false }
 cslice = { version = "0.3" }
 log = { version = "0.4", default-features = false }
 managed = { version = "0.6", default-features = false, features = ["alloc", "map"] }
+unwind_backtrace = { path = "../libunwind_backtrace" }
 board = { path = "../libboard", features = ["uart_console", "smoltcp"] }
 alloc_list = { path = "../liballoc_list" }
 std_artiq = { path = "../libstd_artiq", features = ["alloc", "io_error_alloc"] }
 logger_artiq = { path = "../liblogger_artiq" }
-backtrace_artiq = { path = "../libbacktrace_artiq" }
 board_artiq = { path = "../libboard_artiq" }
 proto = { path = "../libproto", features = ["log"] }
 amp = { path = "../libamp" }
diff --git a/artiq/firmware/runtime/main.rs b/artiq/firmware/runtime/main.rs
index 865cd76a2..7472acc51 100644
--- a/artiq/firmware/runtime/main.rs
+++ b/artiq/firmware/runtime/main.rs
@@ -11,10 +11,10 @@ extern crate managed;
 extern crate smoltcp;
 
 extern crate alloc_list;
+extern crate unwind_backtrace;
 #[macro_use]
 extern crate std_artiq as std;
 extern crate logger_artiq;
-extern crate backtrace_artiq;
 #[macro_use]
 extern crate board;
 extern crate board_artiq;
@@ -304,7 +304,7 @@ pub extern fn panic_fmt(args: core::fmt::Arguments, file: &'static str, line: u3
 
     println!("backtrace for software version {}:",
              include_str!(concat!(env!("OUT_DIR"), "/git-describe")));
-    let _ = backtrace_artiq::backtrace(|ip| {
+    let _ = unwind_backtrace::backtrace(|ip| {
         println!("{:#08x}", ip);
     });