Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9df793216910
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 010ce019b3b1
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Dec 29, 2016

  1. firmware: remove cargo profiles.

    These are specified per-workspace, and anyhow are mostly overridden
    by our Makefile, so specify everything in it.
    whitequark committed Dec 29, 2016
    Copy the full SHA
    aed9129 View commit details
  2. firmware: remove spurious build-dependency on winapi.

    whitequark committed Dec 29, 2016
    Copy the full SHA
    010ce01 View commit details
Showing with 3 additions and 11 deletions.
  1. +0 −4 artiq/firmware/libksupport/Cargo.toml
  2. +1 −5 artiq/firmware/runtime/Cargo.toml
  3. +2 −2 artiq/runtime/Makefile
4 changes: 0 additions & 4 deletions artiq/firmware/libksupport/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 1 addition & 5 deletions artiq/firmware/runtime/Cargo.toml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ version = "0.0.0"
build = "build.rs"

[build-dependencies]
walkdir = "0.1"
walkdir = "1.0"

[lib]
name = "runtime"
@@ -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
4 changes: 2 additions & 2 deletions artiq/runtime/Makefile
Original file line number Diff line number Diff line change
@@ -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