Merge #46

46: bump dependencies r=adamgreig a=japaric r? @rust-embedded/cortex-m (anyone) Co-authored-by: Jorge Aparicio <jorge@japaric.io>
bump dependencies
2018-09-03 15:04:28 +00:00 · 2018-09-03 16:57:03 +02:00 · 2018-08-29 22:26:27 +00:00 · 2018-08-29 16:55:50 +02:00 · 2018-08-29 15:15:40 +02:00 · 2018-08-29 14:26:24 +02:00
4 changed files with 50 additions and 58 deletions
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,5 +1,5 @@
-[target.thumbv6m-none-eabi]
-runner = 'arm-none-eabi-gdb'
+[target.'cfg(all(target_arch = "arm", target_os = "none"))']
+# runner = 'arm-none-eabi-gdb -x debug.gdb'
 rustflags = [
  # LLD (shipped with the Rust toolchain) is used as the default linker
  "-C", "link-arg=-Tlink.x",
@@ -16,41 +16,23 @@ rustflags = [
  # "-C", "link-arg=-nostartfiles",
 ]

+# work around rust-lang/cargo#5946
+[target.thumbv6m-none-eabi]
+runner = 'arm-none-eabi-gdb -x debug.gdb'
+
 [target.thumbv7m-none-eabi]
-runner = 'arm-none-eabi-gdb'
-rustflags = [
-  # the comments under `[target.thumbv6m-none-eabi]` also apply here
-  "-C", "link-arg=-Tlink.x",
-
-  # "-C", "linker=arm-none-eabi-ld",
-
-  # "-C", "linker=arm-none-eabi-gcc",
-  # "-C", "link-arg=-Wl,-Tlink.x",
-  # "-C", "link-arg=-nostartfiles",
-]
+runner = 'arm-none-eabi-gdb -x debug.gdb'

 [target.thumbv7em-none-eabi]
-runner = 'arm-none-eabi-gdb'
-rustflags = [
-  # the comments under `[target.thumbv6m-none-eabi]` also apply here
-  "-C", "link-arg=-Tlink.x",
-
-  # "-C", "linker=arm-none-eabi-ld",
-
-  # "-C", "linker=arm-none-eabi-gcc",
-  # "-C", "link-arg=-Wl,-Tlink.x",
-  # "-C", "link-arg=-nostartfiles",
-]
+runner = 'arm-none-eabi-gdb -x debug.gdb'

 [target.thumbv7em-none-eabihf]
-runner = 'arm-none-eabi-gdb'
-rustflags = [
-  # the comments under `[target.thumbv6m-none-eabi]` also apply here
-  "-C", "link-arg=-Tlink.x",
+runner = 'arm-none-eabi-gdb -x debug.gdb'
+# end of workaround

-  # "-C", "linker=arm-none-eabi-ld",
-
-  # "-C", "linker=arm-none-eabi-gcc",
-  # "-C", "link-arg=-Wl,-Tlink.x",
-  # "-C", "link-arg=-nostartfiles",
-]
+[build]
+# Pick one of these compilation targets
+# target = "thumbv6m-none-eabi"    # Cortex-M0 and Cortex-M0+
+# target = "thumbv7m-none-eabi"    # Cortex-M3
+# target = "thumbv7em-none-eabi"   # Cortex-M4 and Cortex-M7 (no FPU)
+# target = "thumbv7em-none-eabihf" # Cortex-M4F and Cortex-M7F (with FPU)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).

 ## [Unreleased]

+## [v0.3.4] - 2018-08-27
+
+### Changed
+
+- LLD is now used as the default linker.
+- Updated the troubleshooting guide to reflect the change in the default linker.
+- Simplified the minimal example.
+- The examples in this template no longer require `arm-none-eabi-gcc` to build.
+
 ## [v0.3.3] - 2018-08-07

 ### Changed
@@ -189,24 +198,25 @@ This project adheres to [Semantic Versioning](http://semver.org/).

 - Initial release

-[Unreleased]: https://github.com/japaric/cortex-m-quickstart/compare/v0.3.3...HEAD
-[v0.3.3]: https://github.com/japaric/cortex-m-quickstart/compare/v0.3.2...v0.3.3
-[v0.3.2]: https://github.com/japaric/cortex-m-quickstart/compare/v0.3.1...v0.3.2
-[v0.3.1]: https://github.com/japaric/cortex-m-quickstart/compare/v0.3.0...v0.3.1
-[v0.3.0]: https://github.com/japaric/cortex-m-quickstart/compare/v0.2.7...v0.3.0
-[v0.2.7]: https://github.com/japaric/cortex-m-quickstart/compare/v0.2.6...v0.2.7
-[v0.2.6]: https://github.com/japaric/cortex-m-quickstart/compare/v0.2.5...v0.2.6
-[v0.2.5]: https://github.com/japaric/cortex-m-quickstart/compare/v0.2.4...v0.2.5
-[v0.2.4]: https://github.com/japaric/cortex-m-quickstart/compare/v0.2.3...v0.2.4
-[v0.2.3]: https://github.com/japaric/cortex-m-quickstart/compare/v0.2.2...v0.2.3
-[v0.2.2]: https://github.com/japaric/cortex-m-quickstart/compare/v0.2.1...v0.2.2
-[v0.2.1]: https://github.com/japaric/cortex-m-quickstart/compare/v0.2.0...v0.2.1
-[v0.2.0]: https://github.com/japaric/cortex-m-quickstart/compare/v0.1.8...v0.2.0
-[v0.1.8]: https://github.com/japaric/cortex-m-quickstart/compare/v0.1.7...v0.1.8
-[v0.1.7]: https://github.com/japaric/cortex-m-quickstart/compare/v0.1.6...v0.1.7
-[v0.1.6]: https://github.com/japaric/cortex-m-quickstart/compare/v0.1.5...v0.1.6
-[v0.1.5]: https://github.com/japaric/cortex-m-quickstart/compare/v0.1.4...v0.1.5
-[v0.1.4]: https://github.com/japaric/cortex-m-quickstart/compare/v0.1.3...v0.1.4
-[v0.1.3]: https://github.com/japaric/cortex-m-quickstart/compare/v0.1.2...v0.1.3
-[v0.1.2]: https://github.com/japaric/cortex-m-quickstart/compare/v0.1.1...v0.1.2
-[v0.1.1]: https://github.com/japaric/cortex-m-quickstart/compare/v0.1.0...v0.1.1
+[Unreleased]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.3.4...HEAD
+[v0.3.4]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.3.3...v0.3.4
+[v0.3.3]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.3.2...v0.3.3
+[v0.3.2]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.3.1...v0.3.2
+[v0.3.1]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.3.0...v0.3.1
+[v0.3.0]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.2.7...v0.3.0
+[v0.2.7]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.2.6...v0.2.7
+[v0.2.6]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.2.5...v0.2.6
+[v0.2.5]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.2.4...v0.2.5
+[v0.2.4]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.2.3...v0.2.4
+[v0.2.3]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.2.2...v0.2.3
+[v0.2.2]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.2.1...v0.2.2
+[v0.2.1]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.2.0...v0.2.1
+[v0.2.0]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.1.8...v0.2.0
+[v0.1.8]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.1.7...v0.1.8
+[v0.1.7]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.1.6...v0.1.7
+[v0.1.6]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.1.5...v0.1.6
+[v0.1.5]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.1.4...v0.1.5
+[v0.1.4]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.1.3...v0.1.4
+[v0.1.3]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.1.2...v0.1.3
+[v0.1.2]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.1.1...v0.1.2
+[v0.1.1]: https://github.com/rust-embedded/cortex-m-quickstart/compare/v0.1.0...v0.1.1
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,13 +13,13 @@ version = "0.3.4"
 cortex-m = "0.5.6"
 cortex-m-rt = "0.5.3"
 cortex-m-semihosting = "0.3.1"
-panic-semihosting = "0.3.0"
+panic-semihosting = "0.4.0"

 # Uncomment for the panic example.
-# panic-itm = "0.1.1"
+# panic-itm = "0.3.0"

 # Uncomment for the allocator example.
-# alloc-cortex-m = "0.3.4"
+# alloc-cortex-m = "0.3.5"

 # Uncomment for the device example.
 # [dependencies.stm32f103xx]
--- a/debug.gdb
+++ b/debug.gdb
Author	SHA1	Message	Date
bors[bot]	8a8466a560	Merge #46 46: bump dependencies r=adamgreig a=japaric r? @rust-embedded/cortex-m (anyone) Co-authored-by: Jorge Aparicio <jorge@japaric.io>	2018-09-03 15:04:28 +00:00
Jorge Aparicio	666bf52748	bump dependencies	2018-09-03 16:57:03 +02:00
bors[bot]	7e36bbe1df	Merge #44 44: dedup contents of .cargo/config; don't depend on auto-load-safe-path being set r=ithinuel a=japaric see individual commit messages for details unfortunately this didn't come up as nice as I expected because there seems to be a bug around `target.cfg.runner` (rust-lang/cargo#5946). Still, I think this is an improvement. r? @rust-embedded/cortex-m Co-authored-by: Jorge Aparicio <jorge@japaric.io>	2018-08-29 22:26:27 +00:00
Jorge Aparicio	4265e01ef7	add a comment indicating which core each target maps to	2018-08-29 16:55:50 +02:00
Jorge Aparicio	98137712a5	workaround rust-lang/cargo#5946	2018-08-29 15:15:40 +02:00
Jorge Aparicio	065efc83fb	be explicit about the GDB script to use with this change the user doesn't need to set an [auto-load-safe-path] [auto-load-safe-path]: https://sourceware.org/gdb/onlinedocs/gdb/Auto_002dloading-safe-path.html	2018-08-29 14:26:24 +02:00
Jorge Aparicio	b43bd7d20d	deduplicate the contents .cargo/config using `cfg`s. Also add all the possible compilation targets to .cargo/config.	2018-08-29 14:23:25 +02:00
bors[bot]	3da03fc6b8	Merge #43 43: add CHANGELOG for v0.3.4 r=adamgreig a=japaric r? @rust-embedded/cortex-m (anyone) Co-authored-by: Jorge Aparicio <jorge@japaric.io>	2018-08-28 19:51:15 +00:00
Jorge Aparicio	1fdaec36bd	add CHANGELOG for v0.3.4	2018-08-28 21:41:37 +02:00