From 36e230fe221571584bf8b09070fe36665c0628eb Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonasschievink@gmail.com>
Date: Tue, 21 Jan 2020 11:12:17 +0100
Subject: [PATCH] Update dependencies

This fixes a linkage issue that was fixed a while ago, and adds thumbv8
support.
---
 src/test/run-make/thumb-none-qemu/example/Cargo.toml  | 4 ++--
 src/test/run-make/thumb-none-qemu/example/src/main.rs | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/test/run-make/thumb-none-qemu/example/Cargo.toml b/src/test/run-make/thumb-none-qemu/example/Cargo.toml
index 73fdee71f0c0..051d41bbae54 100644
--- a/src/test/run-make/thumb-none-qemu/example/Cargo.toml
+++ b/src/test/run-make/thumb-none-qemu/example/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Hideki Sekine <sekineh@me.com>"]
 edition = "2018"
 
 [dependencies]
-cortex-m = "0.5.4"
-cortex-m-rt = "=0.5.4"
+cortex-m = "0.6.2"
+cortex-m-rt = "0.6.11"
 panic-halt = "0.2.0"
 cortex-m-semihosting = "0.3.1"
diff --git a/src/test/run-make/thumb-none-qemu/example/src/main.rs b/src/test/run-make/thumb-none-qemu/example/src/main.rs
index 4a08419a07e1..2abfde8e75f0 100644
--- a/src/test/run-make/thumb-none-qemu/example/src/main.rs
+++ b/src/test/run-make/thumb-none-qemu/example/src/main.rs
@@ -1,4 +1,3 @@
-// #![feature(stdsimd)]
 #![no_main]
 #![no_std]
 use core::fmt::Write;
@@ -6,12 +5,9 @@ use cortex_m::asm;
 use cortex_m_rt::entry;
 use cortex_m_semihosting as semihosting;
 
-//FIXME: This imports the provided #[panic_handler].
-#[allow(rust_2018_idioms)]
-extern crate panic_halt;
-
-entry!(main);
+use panic_halt as _;
 
+#[entry]
 fn main() -> ! {
     let x = 42;