diff --git a/.cargo/config b/.cargo/config
index 82b1da2..78ede9d 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,5 +1,5 @@
 [target.'cfg(all(target_arch = "arm", target_os = "none"))']
-runner = 'arm-none-eabi-gdb -x debug.gdb'
+# 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,6 +16,20 @@ 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 -x debug.gdb'
+
+[target.thumbv7em-none-eabi]
+runner = 'arm-none-eabi-gdb -x debug.gdb'
+
+[target.thumbv7em-none-eabihf]
+runner = 'arm-none-eabi-gdb -x debug.gdb'
+# end of workaround
+
 [build]
 # Pick one of these compilation targets
 # target = "thumbv6m-none-eabi"