From 2d7fed6c59c9acbb37fd39b1a647da2a60515069 Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 9 Jun 2019 01:00:58 +0200 Subject: [PATCH] link again compiler_builtins required for memset etc --- Cargo.lock | 7 +++++++ Cargo.toml | 1 + src/main.rs | 2 ++ 3 files changed, 10 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 3dbf4d4..bab6921 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,6 +5,11 @@ name = "bit_field" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "compiler_builtins" +version = "0.1.16" +source = "git+https://github.com/rust-lang-nursery/compiler-builtins#5e06435c291211a6443d3b29b948faa3ccaaa180" + [[package]] name = "r0" version = "0.2.2" @@ -28,12 +33,14 @@ name = "zc706" version = "0.0.0" dependencies = [ "bit_field 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "compiler_builtins 0.1.16 (git+https://github.com/rust-lang-nursery/compiler-builtins)", "r0 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [metadata] "checksum bit_field 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a165d606cf084741d4ac3a28fb6e9b1eb0bd31f6cd999098cfddb0b2ab381dc0" +"checksum compiler_builtins 0.1.16 (git+https://github.com/rust-lang-nursery/compiler-builtins)" = "" "checksum r0 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2a38df5b15c8d5c7e8654189744d8e396bddc18ad48041a500ce52d6948941f" "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" diff --git a/Cargo.toml b/Cargo.toml index 73cf559..274bb58 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,3 +21,4 @@ default = ["target_zc706"] r0 = "0.2" volatile-register = "0.2" bit_field = "0.10" +compiler_builtins = { git = "https://github.com/rust-lang-nursery/compiler-builtins", no-default-features = true, features = ["mem", "no-lang-items"]} diff --git a/src/main.rs b/src/main.rs index d26736e..9fa0241 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,10 +3,12 @@ #![feature(asm)] #![feature(global_asm)] #![feature(naked_functions)] +#![feature(compiler_builtins_lib)] use core::fmt::Write; use r0::zero_bss; +use compiler_builtins as _; mod regs; mod cortex_a9;