From aed91292e234e5d3d4883151fdbcfbfad72432fd Mon Sep 17 00:00:00 2001 From: whitequark Date: Thu, 29 Dec 2016 13:01:49 +0000 Subject: [PATCH] firmware: remove cargo profiles. These are specified per-workspace, and anyhow are mostly overridden by our Makefile, so specify everything in it. --- artiq/firmware/libksupport/Cargo.toml | 4 ---- artiq/firmware/runtime/Cargo.toml | 4 ---- artiq/runtime/Makefile | 4 ++-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/artiq/firmware/libksupport/Cargo.toml b/artiq/firmware/libksupport/Cargo.toml index a20632026..b7179fc6f 100644 --- a/artiq/firmware/libksupport/Cargo.toml +++ b/artiq/firmware/libksupport/Cargo.toml @@ -12,7 +12,3 @@ crate-type = ["staticlib"] std_artiq = { path = "../libstd_artiq" } bsp = { path = "../libbsp" } byteorder = { version = "0.5", default-features = false } - -[profile.dev] -panic = 'unwind' -opt-level = 2 diff --git a/artiq/firmware/runtime/Cargo.toml b/artiq/firmware/runtime/Cargo.toml index 5d432eca0..8a125a1dc 100644 --- a/artiq/firmware/runtime/Cargo.toml +++ b/artiq/firmware/runtime/Cargo.toml @@ -20,7 +20,3 @@ fringe = { version = "= 1.1.0", default-features = false, features = ["alloc"] } log = { version = "0.3", default-features = false } log_buffer = { version = "1.0" } byteorder = { version = "0.5", default-features = false } - -[profile.dev] -panic = 'abort' -opt-level = 2 diff --git a/artiq/runtime/Makefile b/artiq/runtime/Makefile index a19738e8d..55e261fc0 100644 --- a/artiq/runtime/Makefile +++ b/artiq/runtime/Makefile @@ -38,7 +38,7 @@ $(RUSTOUT_DIRECTORY)/libruntime.a: ksupport.elf --manifest-path $(realpath $(RUNTIME_DIRECTORY)/../firmware/runtime/Cargo.toml) \ --target=or1k-unknown-none -- \ $(shell cat $(BUILDINC_DIRECTORY)/generated/rust-cfg) \ - -C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s \ + -C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s -Cpanic=abort \ -L../libcompiler-rt runtime.elf: $(OBJECTS) $(RUSTOUT_DIRECTORY)/libruntime.a @@ -57,7 +57,7 @@ $(RUSTOUT_DIRECTORY)/libksupport.a: --target=or1k-unknown-none -- \ $(shell cat $(BUILDINC_DIRECTORY)/generated/rust-cfg) \ --cfg ksupport \ - -C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s \ + -C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s -Cpanic=unwind \ -L../libcompiler-rt ksupport.elf: $(OBJECTS_KSUPPORT) $(RUSTOUT_DIRECTORY)/libksupport.a