Archives
/
rust-raspberrypi-OS-tutorials
mirror of https://github.com/rust-embedded/rust-raspberrypi-OS-tutorials
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

compiler_builtins are now mandatory; Add them.

Browse Source 
In rust-lang/rust@679657b863 a breaking
change was introduced that now requires compiler_builtins. Add them,
and use the opportunity to kick out rlibc, since memset() et al. can
be provided by compiler intrinsics.
pull/4/head
Andre Richter 6 years ago
parent 857568009e
commit 32ef64b36e
20 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape Escape View File

@ -1 +1 @@
**/dockcross-linux-aarch64
**/dockcross-linux-aarch64

5
01_bareminimum/Xargo.toml
Unescape Escape View File

@ -0,0 +1,5 @@
[dependencies.core]
stage = 0
[dependencies.compiler_builtins]
stage = 1

5
02_multicore_rust/Xargo.toml
Unescape Escape View File

@ -0,0 +1,5 @@
[dependencies.core]
stage = 0
[dependencies.compiler_builtins]
stage = 1

5
03_uart1/Xargo.toml
Unescape Escape View File

@ -0,0 +1,5 @@
[dependencies.core]
stage = 0
[dependencies.compiler_builtins]
stage = 1

7
04_mailboxes/Cargo.lock generated
Unescape Escape View File

@ -3,7 +3,6 @@ name = "kernel8"
version = "0.1.0"
dependencies = [
"raspi3_glue 0.1.0",
"rlibc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -11,11 +10,6 @@ dependencies = [
name = "raspi3_glue"
version = "0.1.0"
[[package]]
name = "rlibc"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "vcell"
version = "0.1.0"
@ -30,6 +24,5 @@ dependencies = [
]
[metadata]
"checksum rlibc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe"
"checksum vcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "45c297f0afb6928cd08ab1ff9d95e99392595ea25ae1b5ecf822ff8764e57a0d"
"checksum volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d67cb4616d99b940db1d6bd28844ff97108b498a6ca850e5b6191a532063286"

1
04_mailboxes/Cargo.toml
Unescape Escape View File

@ -6,4 +6,3 @@ authors = ["Andre Richter <andre.o.richter@gmail.com>"]
[dependencies]
raspi3_glue = { path = "raspi3_glue" }
volatile-register = "0.2.0"
rlibc = "1.0"

8
04_mailboxes/README.md
Unescape Escape View File

@ -35,17 +35,15 @@ Where each tag looks like:
n+3. optional value buffer
```
### rlibc
### Xargo.toml
The mailbox buffer is a fixed array that is zero-initialized. To achieve
zero-initialization, Rust utilizies and links to the `memset()` function, which
is normally provided by `libc`.
Since we are writing a `no_std` crate, we need to explicitly provide it. The
easiest way is pulling in [rlibc] by adding it as an `extern crate` to `main.rs`
and adding the dependency to `Cargo.toml`.
[rlibc]: https://github.com/alexcrichton/rlibc
easiest way is pulling in the `mem` feature of the `compiler_builtins` by adding
it to `Xargo.toml`.
### Synchronization

6
04_mailboxes/Xargo.toml
Unescape Escape View File

@ -0,0 +1,6 @@
[dependencies.core]
stage = 0
[dependencies.compiler_builtins]
features = ["mem"] # for memset() et al.
stage = 1

BIN
04_mailboxes/kernel8.img
View File

Binary file not shown.

1
04_mailboxes/src/main.rs
Unescape Escape View File

@ -26,7 +26,6 @@
#![feature(asm)]
extern crate raspi3_glue;
extern crate rlibc; // for memset et al.b
extern crate volatile_register;
const MMIO_BASE: u32 = 0x3F00_0000;

7
05_uart0/Cargo.lock generated
Unescape Escape View File

@ -3,7 +3,6 @@ name = "kernel8"
version = "0.1.0"
dependencies = [
"raspi3_glue 0.1.0",
"rlibc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -11,11 +10,6 @@ dependencies = [
name = "raspi3_glue"
version = "0.1.0"
[[package]]
name = "rlibc"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "vcell"
version = "0.1.0"
@ -30,6 +24,5 @@ dependencies = [
]
[metadata]
"checksum rlibc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe"
"checksum vcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "45c297f0afb6928cd08ab1ff9d95e99392595ea25ae1b5ecf822ff8764e57a0d"
"checksum volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d67cb4616d99b940db1d6bd28844ff97108b498a6ca850e5b6191a532063286"

1
05_uart0/Cargo.toml
Unescape Escape View File

@ -6,4 +6,3 @@ authors = ["Andre Richter <andre.o.richter@gmail.com>"]
[dependencies]
raspi3_glue = { path = "raspi3_glue" }
volatile-register = "0.2.0"
rlibc = "1.0"

6
05_uart0/Xargo.toml
Unescape Escape View File

@ -0,0 +1,6 @@
[dependencies.core]
stage = 0
[dependencies.compiler_builtins]
features = ["mem"] # for memset() et al.
stage = 1

BIN
05_uart0/kernel8.img
View File

Binary file not shown.

1
05_uart0/src/main.rs
Unescape Escape View File

@ -26,7 +26,6 @@
#![feature(asm)]
extern crate raspi3_glue;
extern crate rlibc; // for memset et al.b
extern crate volatile_register;
const MMIO_BASE: u32 = 0x3F00_0000;

7
06_random/Cargo.lock generated
Unescape Escape View File

@ -3,7 +3,6 @@ name = "kernel8"
version = "0.1.0"
dependencies = [
"raspi3_glue 0.1.0",
"rlibc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -11,11 +10,6 @@ dependencies = [
name = "raspi3_glue"
version = "0.1.0"
[[package]]
name = "rlibc"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "vcell"
version = "0.1.0"
@ -30,6 +24,5 @@ dependencies = [
]
[metadata]
"checksum rlibc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe"
"checksum vcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "45c297f0afb6928cd08ab1ff9d95e99392595ea25ae1b5ecf822ff8764e57a0d"
"checksum volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d67cb4616d99b940db1d6bd28844ff97108b498a6ca850e5b6191a532063286"

1
06_random/Cargo.toml
Unescape Escape View File

@ -6,4 +6,3 @@ authors = ["Andre Richter <andre.o.richter@gmail.com>"]
[dependencies]
raspi3_glue = { path = "raspi3_glue" }
volatile-register = "0.2.0"
rlibc = "1.0"

6
06_random/Xargo.toml
Unescape Escape View File

@ -0,0 +1,6 @@
[dependencies.core]
stage = 0
[dependencies.compiler_builtins]
features = ["mem"] # for memset() et al.
stage = 1

BIN
06_random/kernel8.img
View File

Binary file not shown.

1
06_random/src/main.rs
Unescape Escape View File

@ -26,7 +26,6 @@
#![feature(asm)]
extern crate raspi3_glue;
extern crate rlibc; // for memset et al.b
extern crate volatile_register;
const MMIO_BASE: u32 = 0x3F00_0000;

Write Preview
Loading…
Cancel
Save