From f56152e72f4e13322ebc6141af7648e43cb86a84 Mon Sep 17 00:00:00 2001
From: occheung <dc@m-labs.hk>
Date: Fri, 6 Aug 2021 11:10:43 +0800
Subject: [PATCH] rust: fix dependencies

---
 artiq/firmware/libeh/Cargo.toml               | 2 ++
 artiq/firmware/libeh/lib.rs                   | 2 +-
 artiq/firmware/libunwind_backtrace/Cargo.toml | 4 ++++
 artiq/firmware/runtime/Cargo.toml             | 2 +-
 artiq/firmware/runtime/main.rs                | 3 +--
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/artiq/firmware/libeh/Cargo.toml b/artiq/firmware/libeh/Cargo.toml
index c1bea6f4f..6908c14b9 100644
--- a/artiq/firmware/libeh/Cargo.toml
+++ b/artiq/firmware/libeh/Cargo.toml
@@ -9,3 +9,5 @@ path = "lib.rs"
 
 [dependencies]
 cslice = { version = "0.3" }
+libc = { path = "../libc" }
+unwind = { path = "../libunwind" }
diff --git a/artiq/firmware/libeh/lib.rs b/artiq/firmware/libeh/lib.rs
index da209ea25..b1a200da3 100644
--- a/artiq/firmware/libeh/lib.rs
+++ b/artiq/firmware/libeh/lib.rs
@@ -1,4 +1,4 @@
-#![feature(lang_items, panic_unwind, libc, unwind_attributes)]
+#![feature(lang_items, panic_unwind, libc, unwind_attributes, int_bits_const)]
 #![no_std]
 
 extern crate cslice;
diff --git a/artiq/firmware/libunwind_backtrace/Cargo.toml b/artiq/firmware/libunwind_backtrace/Cargo.toml
index 637e55bc6..1925f4f1e 100644
--- a/artiq/firmware/libunwind_backtrace/Cargo.toml
+++ b/artiq/firmware/libunwind_backtrace/Cargo.toml
@@ -6,3 +6,7 @@ version = "0.0.0"
 [lib]
 name = "unwind_backtrace"
 path = "lib.rs"
+
+[dependencies]
+unwind = { path = "../libunwind" }
+libc = { path = "../libc" }
diff --git a/artiq/firmware/runtime/Cargo.toml b/artiq/firmware/runtime/Cargo.toml
index f96d4d29d..ca624e3b6 100644
--- a/artiq/firmware/runtime/Cargo.toml
+++ b/artiq/firmware/runtime/Cargo.toml
@@ -27,7 +27,7 @@ board_misoc = { path = "../libboard_misoc", features = ["uart_console", "smoltcp
 logger_artiq = { path = "../liblogger_artiq" }
 board_artiq = { path = "../libboard_artiq" }
 proto_artiq = { path = "../libproto_artiq", features = ["log", "alloc"] }
-smoltcp = { version = "0.6.0", default-features = false, features = ["rust-1_28", "alloc", "ethernet", "proto-ipv4", "proto-ipv6", "socket-tcp"] }
+smoltcp = { version = "0.6.0", default-features = false, features = ["alloc", "ethernet", "proto-ipv4", "proto-ipv6", "socket-tcp"] }
 riscv = { version = "0.6.0", features = ["inline-asm"] }
 
 [dependencies.fringe]
diff --git a/artiq/firmware/runtime/main.rs b/artiq/firmware/runtime/main.rs
index 968aba156..c6cd088e1 100644
--- a/artiq/firmware/runtime/main.rs
+++ b/artiq/firmware/runtime/main.rs
@@ -1,6 +1,5 @@
 #![feature(lang_items, alloc, try_from, nonzero, asm,
-           panic_implementation, panic_info_message,
-           const_slice_len)]
+           panic_handler, panic_info_message)]
 #![no_std]
 
 extern crate eh;