srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

firmware: update compiler_builtins dependency and move it to libboard. 

This is so that we only specify it once.
This commit is contained in:
whitequark 2017-12-31 09:11:52 +00:00
parent a1b8bca1e6
commit b8f3d28bc0
11 changed files with 14 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
artiq/firmware/Cargo.lock generated
View File

@ -29,6 +29,7 @@ dependencies = [
"build_misoc 0.0.0", "build_misoc 0.0.0",
"byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cc 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.0 (git+https://github.com/m-labs/compiler-builtins?rev=1c765ad)",
"smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=507d2fe)", "smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=507d2fe)",
] ]
@ -50,7 +51,6 @@ dependencies = [
"board 0.0.0", "board 0.0.0",
"build_misoc 0.0.0", "build_misoc 0.0.0",
"byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.0 (git+https://github.com/m-labs/compiler-builtins?rev=97916b1)",
"crc 1.6.0 (git+git://github.com/whitequark/crc-rs?rev=51cd356)", "crc 1.6.0 (git+git://github.com/whitequark/crc-rs?rev=51cd356)",
"smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=507d2fe)", "smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=507d2fe)",
] ]
@ -84,16 +84,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "compiler_builtins" name = "compiler_builtins"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/rust-lang-nursery/compiler-builtins?rev=631b568#631b5687b24af413fdbffa4c2644484e60660b00" source = "git+https://github.com/m-labs/compiler-builtins?rev=1c765ad#1c765adbe8e246e01db39aba0a71a6b5721e2465"
dependencies = [
"gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-cfg 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "compiler_builtins"
version = "0.1.0"
source = "git+https://github.com/m-labs/compiler-builtins?rev=97916b1#97916b17ca542eac0524b8570c7d05913891a0dc"
[[package]] [[package]]
name = "crc" name = "crc"
@ -131,11 +122,6 @@ dependencies = [
"libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "gcc"
version = "0.3.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "kernel32-sys" name = "kernel32-sys"
version = "0.2.2" version = "0.2.2"
@ -154,7 +140,6 @@ dependencies = [
"board 0.0.0", "board 0.0.0",
"build_misoc 0.0.0", "build_misoc 0.0.0",
"byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.0 (git+https://github.com/m-labs/compiler-builtins?rev=97916b1)",
"cslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "cslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"dyld 0.0.0", "dyld 0.0.0",
"proto 0.0.0", "proto 0.0.0",
@ -213,7 +198,6 @@ dependencies = [
"build_artiq 0.0.0", "build_artiq 0.0.0",
"build_misoc 0.0.0", "build_misoc 0.0.0",
"byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.0 (git+https://github.com/m-labs/compiler-builtins?rev=97916b1)",
"cslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "cslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"drtioaux 0.0.0", "drtioaux 0.0.0",
"fringe 1.1.0 (git+https://github.com/m-labs/libfringe?rev=bd23494)", "fringe 1.1.0 (git+https://github.com/m-labs/libfringe?rev=bd23494)",
@ -224,11 +208,6 @@ dependencies = [
"std_artiq 0.0.0", "std_artiq 0.0.0",
] ]
[[package]]
name = "rustc-cfg"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "same-file" name = "same-file"
version = "0.1.3" version = "0.1.3"
@ -247,7 +226,6 @@ dependencies = [
"board_artiq 0.0.0", "board_artiq 0.0.0",
"build_artiq 0.0.0", "build_artiq 0.0.0",
"build_misoc 0.0.0", "build_misoc 0.0.0",
"compiler_builtins 0.1.0 (git+https://github.com/rust-lang-nursery/compiler-builtins?rev=631b568)",
"drtioaux 0.0.0", "drtioaux 0.0.0",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"logger_artiq 0.0.0", "logger_artiq 0.0.0",
@ -293,18 +271,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum build_const 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e90dc84f5e62d2ebe7676b83c22d33b6db8bd27340fb6ffbff0a364efa0cb9c9" "checksum build_const 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e90dc84f5e62d2ebe7676b83c22d33b6db8bd27340fb6ffbff0a364efa0cb9c9"
"checksum byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "652805b7e73fada9d85e9a6682a4abd490cb52d96aeecc12e33a0de34dfd0d23" "checksum byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "652805b7e73fada9d85e9a6682a4abd490cb52d96aeecc12e33a0de34dfd0d23"
"checksum cc 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a9b13a57efd6b30ecd6598ebdb302cca617930b5470647570468a65d12ef9719" "checksum cc 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a9b13a57efd6b30ecd6598ebdb302cca617930b5470647570468a65d12ef9719"
"checksum compiler_builtins 0.1.0 (git+https://github.com/m-labs/compiler-builtins?rev=97916b1)" = "<none>" "checksum compiler_builtins 0.1.0 (git+https://github.com/m-labs/compiler-builtins?rev=1c765ad)" = "<none>"
"checksum compiler_builtins 0.1.0 (git+https://github.com/rust-lang-nursery/compiler-builtins?rev=631b568)" = "<none>"
"checksum crc 1.6.0 (git+git://github.com/whitequark/crc-rs?rev=51cd356)" = "<none>" "checksum crc 1.6.0 (git+git://github.com/whitequark/crc-rs?rev=51cd356)" = "<none>"
"checksum cslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0f8cb7306107e4b10e64994de6d3274bd08996a7c1322a27b86482392f96be0a" "checksum cslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0f8cb7306107e4b10e64994de6d3274bd08996a7c1322a27b86482392f96be0a"
"checksum fringe 1.1.0 (git+https://github.com/m-labs/libfringe?rev=bd23494)" = "<none>" "checksum fringe 1.1.0 (git+https://github.com/m-labs/libfringe?rev=bd23494)" = "<none>"
"checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb"
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
"checksum libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)" = "36fbc8a8929c632868295d0178dd8f63fc423fd7537ad0738372bd010b3ac9b0" "checksum libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)" = "36fbc8a8929c632868295d0178dd8f63fc423fd7537ad0738372bd010b3ac9b0"
"checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b" "checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b"
"checksum log_buffer 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ec57723b84bbe7bdf76aa93169c9b59e67473317c6de3a83cb2a0f8ccb2aa493" "checksum log_buffer 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ec57723b84bbe7bdf76aa93169c9b59e67473317c6de3a83cb2a0f8ccb2aa493"
"checksum managed 0.4.0 (git+https://github.com/m-labs/rust-managed.git?rev=629a6786a1cf1692015f464ed16c04eafa5cb8d1)" = "<none>" "checksum managed 0.4.0 (git+https://github.com/m-labs/rust-managed.git?rev=629a6786a1cf1692015f464ed16c04eafa5cb8d1)" = "<none>"
"checksum rustc-cfg 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "56a596b5718bf5e059d59a30af12f7f462a152de147aa462b70892849ee18704"
"checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7" "checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7"
"checksum smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=507d2fe)" = "<none>" "checksum smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=507d2fe)" = "<none>"
"checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff" "checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff"

5
artiq/firmware/bootloader/Cargo.toml
View File

@ -17,11 +17,6 @@ byteorder = { version = "1.0", default-features = false }
crc = { git = "git://github.com/whitequark/crc-rs", rev = "51cd356", default-features = false } crc = { git = "git://github.com/whitequark/crc-rs", rev = "51cd356", default-features = false }
board = { path = "../libboard", features = ["uart_console", "smoltcp"] } board = { path = "../libboard", features = ["uart_console", "smoltcp"] }
[dependencies.compiler_builtins]
git = "https://github.com/m-labs/compiler-builtins"
rev = "97916b1"
features = ["mem"]
[dependencies.smoltcp] [dependencies.smoltcp]
git = "https://github.com/m-labs/smoltcp" git = "https://github.com/m-labs/smoltcp"
rev = "507d2fe" rev = "507d2fe"

3
artiq/firmware/bootloader/main.rs
View File

@ -1,7 +1,6 @@
#![no_std] #![no_std]
#![feature(lang_items, compiler_builtins_lib)] #![feature(lang_items)]
extern crate compiler_builtins;
extern crate crc; extern crate crc;
extern crate byteorder; extern crate byteorder;
extern crate smoltcp; extern crate smoltcp;

5
artiq/firmware/ksupport/Cargo.toml
View File

@ -21,8 +21,3 @@ dyld = { path = "../libdyld" }
board = { path = "../libboard" } board = { path = "../libboard" }
proto = { path = "../libproto" } proto = { path = "../libproto" }
amp = { path = "../libamp" } amp = { path = "../libamp" }
[dependencies.compiler_builtins]
git = "https://github.com/m-labs/compiler-builtins"
rev = "97916b1"
features = ["mem"]

5
artiq/firmware/ksupport/lib.rs
View File

@ -1,8 +1,6 @@
#![feature(lang_items, asm, libc, panic_unwind, unwind_attributes, global_allocator, #![feature(lang_items, asm, libc, panic_unwind, unwind_attributes, global_allocator)]
compiler_builtins_lib)]
#![no_std] #![no_std]
extern crate compiler_builtins;
extern crate byteorder; extern crate byteorder;
extern crate cslice; extern crate cslice;
extern crate unwind; extern crate unwind;
@ -10,7 +8,6 @@ extern crate libc;
extern crate alloc_stub; extern crate alloc_stub;
extern crate std_artiq as std; extern crate std_artiq as std;
extern crate board; extern crate board;
extern crate dyld; extern crate dyld;
extern crate proto; extern crate proto;

5
artiq/firmware/libboard/Cargo.toml
View File

@ -15,6 +15,11 @@ build_misoc = { path = "../libbuild_misoc" }
[dependencies] [dependencies]
byteorder = { version = "1.0", default-features = false } byteorder = { version = "1.0", default-features = false }
[dependencies.compiler_builtins]
git = "https://github.com/m-labs/compiler-builtins"
rev = "1c765ad"
features = ["mem"]
[dependencies.smoltcp] [dependencies.smoltcp]
git = "https://github.com/m-labs/smoltcp" git = "https://github.com/m-labs/smoltcp"
rev = "507d2fe" rev = "507d2fe"

3
artiq/firmware/libboard/lib.rs
View File

@ -1,6 +1,7 @@
#![no_std] #![no_std]
#![feature(asm)] #![feature(compiler_builtins_lib, asm)]
extern crate compiler_builtins;
extern crate byteorder; extern crate byteorder;
#[cfg(feature = "smoltcp")] #[cfg(feature = "smoltcp")]
extern crate smoltcp; extern crate smoltcp;

5
artiq/firmware/runtime/Cargo.toml
View File

@ -27,11 +27,6 @@ proto = { path = "../libproto", features = ["log"] }
amp = { path = "../libamp" } amp = { path = "../libamp" }
drtioaux = { path = "../libdrtioaux" } drtioaux = { path = "../libdrtioaux" }
[dependencies.compiler_builtins]
git = "https://github.com/m-labs/compiler-builtins"
rev = "97916b1"
features = ["mem"]
[dependencies.fringe] [dependencies.fringe]
git = "https://github.com/m-labs/libfringe" git = "https://github.com/m-labs/libfringe"
rev = "bd23494" rev = "bd23494"

3
artiq/firmware/runtime/main.rs
View File

@ -1,7 +1,6 @@
#![no_std] #![no_std]
#![feature(compiler_builtins_lib, alloc, lang_items, global_allocator, repr_align, attr_literals)] #![feature(alloc, lang_items, global_allocator, repr_align, attr_literals)]
extern crate compiler_builtins;
extern crate alloc; extern crate alloc;
extern crate cslice; extern crate cslice;
#[macro_use] #[macro_use]

5
artiq/firmware/satman/Cargo.toml
View File

@ -21,8 +21,3 @@ board_artiq = { path = "../libboard_artiq" }
std_artiq = { path = "../libstd_artiq", features = ["alloc"] } std_artiq = { path = "../libstd_artiq", features = ["alloc"] }
logger_artiq = { path = "../liblogger_artiq" } logger_artiq = { path = "../liblogger_artiq" }
drtioaux = { path = "../libdrtioaux" } drtioaux = { path = "../libdrtioaux" }
[dependencies.compiler_builtins]
git = "https://github.com/rust-lang-nursery/compiler-builtins"
rev = "631b568"
features = ["mem"]

2
artiq/firmware/satman/main.rs
View File

@ -1,4 +1,4 @@
#![feature(compiler_builtins_lib, lang_items, global_allocator)] #![feature(lang_items, global_allocator)]
#![no_std] #![no_std]
extern crate compiler_builtins; extern crate compiler_builtins;