Merge pull request #18 from torfmaster/feature/lld

Link with LLD

Author: alevy

.cargo/config

@@ -0,0 +1,4 @@
+[target.thumbv7em-tock-eabi]
+rustflags = [
+  "-C link-args=-Tlayout.ld",
+]

.travis.yml

@@ -1,6 +1,6 @@
 language: rust
 rust:
-  - nightly-2018-02-23
+  - nightly-2018-03-06
 
 os:
   - linux
@@ -12,12 +12,9 @@ cache:
     - tock/userland/tools/elf2tbf/target
 
 install:
-  - wget -c https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2016q4/gcc-arm-none-eabi-6_2-2016q4-20161216-linux.tar.bz2
-  - tar -xjf gcc-arm-none-eabi-6_2-2016q4-20161216-linux.tar.bz2
   - rustup component add rust-src
 
 script:
-  - export PATH="$PATH:gcc-arm-none-eabi-6_2-2016q4/bin"
   - export RUSTFLAGS="$RUSTFLAGS -D warnings"
   - cargo test --lib
   - ./build_examples.sh

.vscode/settings.json

@@ -1,4 +1,4 @@
 {
     "editor.formatOnSave": true,
-    "rust-client.channel": "nightly-2018-02-23",
+    "rust-client.channel": "nightly-2018-03-06",
 }

Cargo.toml

@@ -19,4 +19,3 @@ lto = true
 [profile.release]
 panic = "abort"
 lto = true
-debug = true

README.md

@@ -8,11 +8,11 @@ This project is nascent and still under heavy development, but first steps:
 
 1. Ensure you have a working toolchain available:
 
-    `rustup install nightly-2017-12-16`
+    `rustup install nightly-2018-03-06`
 
 2. Get a copy of this toolchain, in this repo's root:
 
-    `rustup override set nightly-2017-12-16`
+    `rustup override set nightly-2018-03-06`
 
 3. Need to grab a copy of the rust sources:
 

build_examples.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
 set -eux
-export RUST_TARGET_PATH=`pwd`
-export CARGO_INCREMENTAL=0
 
-cargo run --manifest-path xargo/Cargo.toml -- build --release --target=thumbv7em-tock-eabi --examples
+RUST_TARGET_PATH=$(pwd) cargo run --manifest-path xargo/Cargo.toml -- build --release --target=thumbv7em-tock-eabi --examples

layout.ld

@@ -8,19 +8,15 @@ STACK_SIZE = 2048;
 APP_HEAP_SIZE = 1024;
 KERNEL_HEAP_SIZE = 1024;
 
-/* Memory Spaces Definitions, 448K flash, 64K ram */
-PROG_LENGTH = 0x00040000;
-RAM_LENGTH  = 0x00010000;
-
 ENTRY(_start)
 
 /* Note: Because apps are relocated, the FLASH address here acts as a sentinel
  * value for relocation fixup routines. The application loader will select the
  * actual location in flash where the app is placed.
  */
 MEMORY {
-    FLASH (rx) : ORIGIN = 0x80000000, LENGTH = PROG_LENGTH
-    SRAM (RWX) : ORIGIN = 0x00000000, LENGTH = RAM_LENGTH
+    FLASH (rx) : ORIGIN = 0x80000000, LENGTH = 0x0040000
+    SRAM (RWX) : ORIGIN = 0x00000000, LENGTH = 0x0010000
 }
 
 SECTIONS {

run_example.sh

@@ -4,14 +4,11 @@
 
 set -eux
 
-export RUST_TARGET_PATH=`pwd`
-export CARGO_INCREMENTAL=0
-
 tab_file_name=metadata.toml
 elf_file_name=cortex-m4.elf
 bin_file_name=cortex-m4.bin
 
-cargo run --manifest-path xargo/Cargo.toml -- build --release --target=thumbv7em-tock-eabi --example "$1" 
+RUST_TARGET_PATH=$(pwd) cargo run --manifest-path xargo/Cargo.toml -- build --release --target=thumbv7em-tock-eabi --example "$1"
 cp target/thumbv7em-tock-eabi/release/examples/"$1" "target/$elf_file_name"
 cargo run --manifest-path tock/userland/tools/elf2tbf/Cargo.toml -- -n "$1" -o "target/$bin_file_name" "target/$elf_file_name"
 
@@ -30,7 +27,7 @@ then
         echo "do not delete apps from board."
     else
         tockloader uninstall --jtag --arch cortex-m4 --board nrf52-dk --jtag-device nrf52 --app-address 0x20000 || true
-    fi        
+    fi
 else
     tockloader uninstall --jtag --arch cortex-m4 --board nrf52-dk --jtag-device nrf52 --app-address 0x20000 || true
 fi

rust-toolchain

@@ -1 +1 @@
-nightly-2018-02-23
+nightly-2018-03-06

thumbv7em-tock-eabi.json

@@ -11,13 +11,7 @@
   "executables": true,
   "no-compiler-rt": false,
   "relocation-model": "ropi-rwpi",
-  "linker": "arm-none-eabi-ld",
-  "linker-flavor": "ld",
+  "linker-flavor": "ld.lld",
   "linker-is-gnu": true,
-  "disable-redzone": true,
-  "pre-link-args": {
-    "ld": [
-      "-Tlayout.ld"
-    ]
-  }
+  "disable-redzone": true
 }