Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to knurling-rs/flip-link #73

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

Migrate to knurling-rs/flip-link #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f8e889
Migrate to kurling-rs/flip-link
Shella Sep 18, 2020
2b0ef5c
.github/workflows/rust.yaml: install flip-link
Shella Sep 18, 2020
457092e
.github/workflows/rust.yml: bump rust toolchain to v1.46
Shella Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
target: armv7a-none-eabi
toolchain: 1.42.0
toolchain: 1.46.0
override: true

- name: Install build dependencies
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Install stable toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: 1.42.0
toolchain: 1.46.0
override: true

- name: Install build dependencies
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
target: armv7a-none-eabi
toolchain: 1.42.0
toolchain: 1.46.0
override: true

- name: Cache cargo registry
Expand Down Expand Up @@ -185,9 +185,9 @@ jobs:
# which flip-lld || cargo install `cat dev-dependencies.txt`

# TODO cache in dev-dependencies.txt when available on crates.io
- name: Install flip-lld
- name: Install flip-link
run: |
cargo install --git https://github.com/japaric/flip-lld --rev b1028b9b140150379ecdcea2c07580af933378e9
cargo install --git https://github.com/knurling-rs/flip-link --branch main

- name: Install build dependencies
run: |
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
target: armv7a-none-eabi
toolchain: 1.42.0
toolchain: 1.46.0
override: true

- name: Install clippy
Expand Down
4 changes: 2 additions & 2 deletions firmware/.cargo/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
runner = "usd-runner"

rustflags = [
"-C", "linker=flip-lld",
"-C", "linker=flip-link",
"-C", "link-arg=-Tlink.x",
]

[target.armv7a-none-eabihf]
rustflags = [
"-C", "linker=flip-lld",
"-C", "linker=flip-link",
"-C", "link-arg=-Tlink.x",
]

Expand Down
6 changes: 3 additions & 3 deletions firmware/usbarmory/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ stage and will not be ready to use for some time.

## Build dependencies

- [flip-lld], linker wrapper that adds zero-cost stack overflow protection.
`cargo install --git https://github.com/japaric/flip-lld`.
- [flip-link], linker wrapper that adds zero-cost stack overflow protection.
`cargo install --git https://github.com/knurling-rs/flip-link --branch main`.

- `armv7a-none-eabi` compiler support. Install with `rustup target add
armv7a-none-eabi`.
Expand Down Expand Up @@ -537,7 +537,7 @@ without any additional terms or conditions.

[usbarmory]: https://github.com/f-secure-foundry/usbarmory/wiki
[F-Secure]: https://foundry.f-secure.com/
[flip-lld]: https://github.com/japaric/flip-lld
[flip-link]: https://github.com/knurling-rs/flip-link
[CONTRIBUTING.md]: https://github.com/iqlusioninc/usbarmory.rs/blob/develop/CONTRIBUTING.md
[CODE_OF_CONDUCT.md]: https://github.com/iqlusioninc/usbarmory.rs/blob/develop/CODE_OF_CONDUCT.md
[Apache License, Version 2.0]: https://www.apache.org/licenses/LICENSE-2.0
Expand Down