aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Greig <adam@adamgreig.com> 2021-02-01 00:56:33 +0000
committerGravatar GitHub <noreply@github.com> 2021-02-01 00:56:33 +0000
commit96b997d0cdf7b2f568c4e0589e789101b9f6bac7 (patch)
tree6b230f7b2d0873c661a39a08edcd3cd7394c5c21
parent822f660d38d7c01902613e2d052e4d3506bd8eeb (diff)
parent937f34eb9faea213c8ed45fdee1924fa7331cb47 (diff)
downloadcortex-m-v0.5.x.tar.gz
cortex-m-v0.5.x.tar.zst
cortex-m-v0.5.x.zip
Merge pull request #327 from rust-embedded/0.5.11v0.5.11v0.5.x
Prepare 0.5.11, removing linking to pre-built binaries.
-rw-r--r--CHANGELOG.md20
-rw-r--r--Cargo.toml2
-rw-r--r--build.rs10
3 files changed, 20 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f265594..9c4a507 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]
+## [v0.5.11] - 2021-01-31
+
+* This release stops linking the pre-built assembly files, as those methods are
+ instead provided by depending on cortex-m 0.6.x.
+
+## [v0.5.10] - 2019-04-29
+
+* This release ensures features set on this cortex-m crate are forwarded to
+ the included cortex-m 0.6.x crate.
+
+## [v0.5.9] - 2019-04-28
+
+* This release re-exports compatible types from cortex-m 0.6.x, allowing use
+ of both versions in one project.
+
## [v0.5.8] - 2018-10-27
### Added
@@ -529,7 +544,10 @@ 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.8...HEAD
+[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/v0.5.11...HEAD
+[v0.5.11]: https://github.com/rust-embedded/cortex-m/compare/v0.5.10...v0.5.11
+[v0.5.10]: https://github.com/rust-embedded/cortex-m/compare/v0.5.9...v0.5.10
+[v0.5.9]: https://github.com/rust-embedded/cortex-m/compare/v0.5.8...v0.5.9
[v0.5.8]: https://github.com/rust-embedded/cortex-m/compare/v0.5.7...v0.5.8
[v0.5.7]: https://github.com/rust-embedded/cortex-m/compare/v0.5.6...v0.5.7
[v0.5.6]: https://github.com/rust-embedded/cortex-m/compare/v0.5.5...v0.5.6
diff --git a/Cargo.toml b/Cargo.toml
index 01dc4fa..7e95cc5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
name = "cortex-m"
readme = "README.md"
repository = "https://github.com/rust-embedded/cortex-m"
-version = "0.5.10"
+version = "0.5.11"
[dependencies]
aligned = "0.2.0"
diff --git a/build.rs b/build.rs
index 6d08ba9..44567af 100644
--- a/build.rs
+++ b/build.rs
@@ -6,16 +6,6 @@ fn main() {
let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
let name = env::var("CARGO_PKG_NAME").unwrap();
- if target.starts_with("thumb") && env::var_os("CARGO_FEATURE_INLINE_ASM").is_none() {
- fs::copy(
- format!("bin/{}.a", target),
- out_dir.join(format!("lib{}.a", name)),
- ).unwrap();
-
- println!("cargo:rustc-link-lib=static={}", name);
- println!("cargo:rustc-link-search={}", out_dir.display());
- }
-
if target.starts_with("thumbv6m-") {
println!("cargo:rustc-cfg=cortex_m");
println!("cargo:rustc-cfg=armv6m");