From a373683964e376752134f8984ea565a6b1b5d260 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Tue, 11 Apr 2017 11:32:44 -0500
Subject: [PATCH] adapt the thumb target specs to upstream linker-flavor
 changes

---
 .cargo/config               | 11 -----------
 thumbv6m-linux-eabi.json    |  5 ++++-
 thumbv7em-linux-eabi.json   |  5 ++++-
 thumbv7em-linux-eabihf.json |  5 ++++-
 thumbv7m-linux-eabi.json    |  5 ++++-
 5 files changed, 16 insertions(+), 15 deletions(-)
 delete mode 100644 .cargo/config

diff --git a/.cargo/config b/.cargo/config
deleted file mode 100644
index b538953..0000000
--- a/.cargo/config
+++ /dev/null
@@ -1,11 +0,0 @@
-[target.thumbv6m-none-eabi]
-rustflags = ["-C", "link-arg=-nostartfiles"]
-
-[target.thumbv7m-none-eabi]
-rustflags = ["-C", "link-arg=-nostartfiles"]
-
-[target.thumbv7em-none-eabi]
-rustflags = ["-C", "link-arg=-nostartfiles"]
-
-[target.thumbv7em-none-eabihf]
-rustflags = ["-C", "link-arg=-nostartfiles"]
\ No newline at end of file
diff --git a/thumbv6m-linux-eabi.json b/thumbv6m-linux-eabi.json
index d3ac24d..dd0cb61 100644
--- a/thumbv6m-linux-eabi.json
+++ b/thumbv6m-linux-eabi.json
@@ -12,11 +12,14 @@
     "executables": true,
     "features": "+strict-align",
     "linker": "arm-none-eabi-gcc",
+    "linker-flavor": "gcc",
     "llvm-target": "thumbv6m-none-eabi",
     "max-atomic-width": 0,
     "os": "linux",
     "panic-strategy": "abort",
-    "pre-link-args": ["-nostartfiles"],
+    "pre-link-args": {
+        "gcc": ["-nostartfiles"]
+    },
     "relocation-model": "static",
     "target-endian": "little",
     "target-pointer-width": "32",
diff --git a/thumbv7em-linux-eabi.json b/thumbv7em-linux-eabi.json
index af6ea94..eef29f5 100644
--- a/thumbv7em-linux-eabi.json
+++ b/thumbv7em-linux-eabi.json
@@ -11,11 +11,14 @@
     "env": "",
     "executables": true,
     "linker": "arm-none-eabi-gcc",
+    "linker-flavor": "gcc",
     "llvm-target": "thumbv7em-none-eabi",
     "max-atomic-width": 32,
     "os": "linux",
     "panic-strategy": "abort",
-    "pre-link-args": ["-nostartfiles"],
+    "pre-link-args": {
+        "gcc": ["-nostartfiles"]
+    },
     "relocation-model": "static",
     "target-endian": "little",
     "target-pointer-width": "32",
diff --git a/thumbv7em-linux-eabihf.json b/thumbv7em-linux-eabihf.json
index 536d28c..5d72ec3 100644
--- a/thumbv7em-linux-eabihf.json
+++ b/thumbv7em-linux-eabihf.json
@@ -12,11 +12,14 @@
     "executables": true,
     "features": "+vfp4,+d16,+fp-only-sp",
     "linker": "arm-none-eabi-gcc",
+    "linker-flavor": "gcc",
     "llvm-target": "thumbv7em-none-eabihf",
     "max-atomic-width": 32,
     "os": "linux",
     "panic-strategy": "abort",
-    "pre-link-args": ["-nostartfiles"],
+    "pre-link-args": {
+        "gcc": ["-nostartfiles"]
+    },
     "relocation-model": "static",
     "target-endian": "little",
     "target-pointer-width": "32",
diff --git a/thumbv7m-linux-eabi.json b/thumbv7m-linux-eabi.json
index 02ed839..1e8a7f0 100644
--- a/thumbv7m-linux-eabi.json
+++ b/thumbv7m-linux-eabi.json
@@ -11,11 +11,14 @@
     "env": "",
     "executables": true,
     "linker": "arm-none-eabi-gcc",
+    "linker-flavor": "gcc",
     "llvm-target": "thumbv7m-none-eabi",
     "max-atomic-width": 32,
     "os": "linux",
     "panic-strategy": "abort",
-    "pre-link-args": ["-nostartfiles"],
+    "pre-link-args": {
+        "gcc": ["-nostartfiles"]
+    },
     "relocation-model": "static",
     "target-endian": "little",
     "target-pointer-width": "32",