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 <jorge@japaric.io>
rust-embedded · Aug 27, 2018 · 278ab0d · 278ab0d
2 parents 399793b + 6cbe164
commit 278ab0d
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-## [v0.5.5] - 2018-08-27
+## [v0.5.6] - 2018-08-27
+
+### Fixed
+
+- Removed duplicated symbols from binary blobs
+
+- The check-blobs.sh script
+
+## [v0.5.5] - 2018-08-27 - YANKED
 
 ### Changed
 
@@ -489,7 +497,8 @@ fn main() {
 - Functions to get the vector table
 - Wrappers over miscellaneous instructions like `bkpt`
 
-[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/v0.5.5...HEAD
+[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/v0.5.6...HEAD
+[v0.5.6]: https://github.com/rust-embedded/cortex-m/compare/v0.5.5...v0.5.6
 [v0.5.5]: https://github.com/rust-embedded/cortex-m/compare/v0.5.4...v0.5.5
 [v0.5.4]: https://github.com/rust-embedded/cortex-m/compare/v0.5.3...v0.5.4
 [v0.5.3]: https://github.com/rust-embedded/cortex-m/compare/v0.5.2...v0.5.3

diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ keywords = ["arm", "cortex-m", "register", "peripheral"]
 license = "MIT OR Apache-2.0"
 name = "cortex-m"
 repository = "https://github.com/japaric/cortex-m"
-version = "0.5.5"
+version = "0.5.6"
 
 [dependencies]
 aligned = "0.2.0"

diff --git a/assemble.sh b/assemble.sh
@@ -6,6 +6,9 @@ set -euxo pipefail
 
 crate=cortex-m
 
+# remove existing blobs because otherwise this will append object files to the old blobs
+rm -f bin/*.a
+
 arm-none-eabi-as -march=armv6s-m asm.s -o bin/$crate.o
 ar crs bin/thumbv6m-none-eabi.a bin/$crate.o
 

diff --git a/bin/thumbv6m-none-eabi.a b/bin/thumbv6m-none-eabi.a
diff --git a/bin/thumbv7em-none-eabi.a b/bin/thumbv7em-none-eabi.a
diff --git a/bin/thumbv7em-none-eabihf.a b/bin/thumbv7em-none-eabihf.a
diff --git a/bin/thumbv7m-none-eabi.a b/bin/thumbv7m-none-eabi.a