Skip to content

Commit 278ab0d

Browse files
bors[bot]japaric
andcommitted
Merge #110
110: fix check-blobs.sh r=adamgreig a=japaric the blobs contained duplicated symbols because check-blobs.sh was not working properly. This PR fixes the script and regenerates the blobs to not contain duplicated symbols r? @adamgreig Co-authored-by: Jorge Aparicio <[email protected]>
2 parents 399793b + 6cbe164 commit 278ab0d

File tree

7 files changed

+15
-3
lines changed

7 files changed

+15
-3
lines changed

CHANGELOG.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10-
## [v0.5.5] - 2018-08-27
10+
## [v0.5.6] - 2018-08-27
11+
12+
### Fixed
13+
14+
- Removed duplicated symbols from binary blobs
15+
16+
- The check-blobs.sh script
17+
18+
## [v0.5.5] - 2018-08-27 - YANKED
1119

1220
### Changed
1321

@@ -489,7 +497,8 @@ fn main() {
489497
- Functions to get the vector table
490498
- Wrappers over miscellaneous instructions like `bkpt`
491499

492-
[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/v0.5.5...HEAD
500+
[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/v0.5.6...HEAD
501+
[v0.5.6]: https://github.com/rust-embedded/cortex-m/compare/v0.5.5...v0.5.6
493502
[v0.5.5]: https://github.com/rust-embedded/cortex-m/compare/v0.5.4...v0.5.5
494503
[v0.5.4]: https://github.com/rust-embedded/cortex-m/compare/v0.5.3...v0.5.4
495504
[v0.5.3]: https://github.com/rust-embedded/cortex-m/compare/v0.5.2...v0.5.3

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords = ["arm", "cortex-m", "register", "peripheral"]
77
license = "MIT OR Apache-2.0"
88
name = "cortex-m"
99
repository = "https://github.com/japaric/cortex-m"
10-
version = "0.5.5"
10+
version = "0.5.6"
1111

1212
[dependencies]
1313
aligned = "0.2.0"

assemble.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ set -euxo pipefail
66

77
crate=cortex-m
88

9+
# remove existing blobs because otherwise this will append object files to the old blobs
10+
rm -f bin/*.a
11+
912
arm-none-eabi-as -march=armv6s-m asm.s -o bin/$crate.o
1013
ar crs bin/thumbv6m-none-eabi.a bin/$crate.o
1114

bin/thumbv6m-none-eabi.a

-1.04 KB
Binary file not shown.

bin/thumbv7em-none-eabi.a

-1002 Bytes
Binary file not shown.

bin/thumbv7em-none-eabihf.a

-1002 Bytes
Binary file not shown.

bin/thumbv7m-none-eabi.a

-1.04 KB
Binary file not shown.

0 commit comments

Comments
 (0)