aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bors[bot] <bors[bot]@users.noreply.github.com> 2018-08-27 14:01:51 +0000
committerGravatar bors[bot] <bors[bot]@users.noreply.github.com> 2018-08-27 14:01:51 +0000
commit278ab0d5b929dc23e6d9538faf1bc2ac633b9caa (patch)
tree19871e155257be86484643f61e64f1899f2ae6cc
parent399793b26b94ba1e59b85bc0b4714a0efd772479 (diff)
parent6cbe16430b8d0c319b64d579801290e4b957104c (diff)
downloadcortex-m-278ab0d5b929dc23e6d9538faf1bc2ac633b9caa.tar.gz
cortex-m-278ab0d5b929dc23e6d9538faf1bc2ac633b9caa.tar.zst
cortex-m-278ab0d5b929dc23e6d9538faf1bc2ac633b9caa.zip
Merge #110v0.5.6
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>
-rw-r--r--CHANGELOG.md13
-rw-r--r--Cargo.toml2
-rwxr-xr-xassemble.sh3
-rw-r--r--bin/thumbv6m-none-eabi.abin3924 -> 2862 bytes
-rw-r--r--bin/thumbv7em-none-eabi.abin6096 -> 5094 bytes
-rw-r--r--bin/thumbv7em-none-eabihf.abin6096 -> 5094 bytes
-rw-r--r--bin/thumbv7m-none-eabi.abin5098 -> 4036 bytes
7 files changed, 15 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5aa87d..b4815fe 100644
--- 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
index 64d57a0..49d896d 100644
--- 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
index b0a4b3e..d1e743b 100755
--- 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
index 0aa131e..2418bfc 100644
--- a/bin/thumbv6m-none-eabi.a
+++ b/bin/thumbv6m-none-eabi.a
Binary files differ
diff --git a/bin/thumbv7em-none-eabi.a b/bin/thumbv7em-none-eabi.a
index 91bd58a..bd58e2b 100644
--- a/bin/thumbv7em-none-eabi.a
+++ b/bin/thumbv7em-none-eabi.a
Binary files differ
diff --git a/bin/thumbv7em-none-eabihf.a b/bin/thumbv7em-none-eabihf.a
index 91bd58a..bd58e2b 100644
--- a/bin/thumbv7em-none-eabihf.a
+++ b/bin/thumbv7em-none-eabihf.a
Binary files differ
diff --git a/bin/thumbv7m-none-eabi.a b/bin/thumbv7m-none-eabi.a
index 5396940..9e34403 100644
--- a/bin/thumbv7m-none-eabi.a
+++ b/bin/thumbv7m-none-eabi.a
Binary files differ