M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

satman: unbreak after c586035c

This commit is contained in:
Sebastien Bourdeauducq 2017-03-15 17:26:09 +08:00
parent c586035caa
commit f5aa73b8fa
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
artiq/firmware/satman/lib.rs
View File

@ -1,13 +1,13 @@
#![feature(compiler_builtins_lib)] #![feature(compiler_builtins_lib, lang_items)]
#![no_std] #![no_std]
extern crate compiler_builtins; extern crate compiler_builtins;
extern crate alloc_artiq; extern crate alloc_artiq;
#[macro_use]
extern crate std_artiq as std; extern crate std_artiq as std;
#[macro_use] #[macro_use]
extern crate log; extern crate log;
extern crate logger_artiq; extern crate logger_artiq;
#[macro_use]
extern crate board; extern crate board;
extern crate drtioaux; extern crate drtioaux;
@ -148,6 +148,13 @@ pub extern fn abort() {
panic!("aborted") panic!("aborted")
} }
#[no_mangle]
#[lang = "panic_fmt"]
pub extern fn panic_fmt(args: core::fmt::Arguments, file: &'static str, line: u32) -> ! {
println!("panic at {}:{}: {}", file, line, args);
loop {}
}
// Allow linking with crates that are built as -Cpanic=unwind even if we use -Cpanic=abort. // Allow linking with crates that are built as -Cpanic=unwind even if we use -Cpanic=abort.
// This is never called. // This is never called.
#[allow(non_snake_case)] #[allow(non_snake_case)]