adapt the thumb target specs to upstream linker-flavor changes

Jorge Aparicio · Jorge Aparicio · commit a373683964e3 · 2017-04-11T11:32:44.000-05:00
diff --git a/.cargo/config b/.cargo/config
diff --git 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
@@ -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
@@ -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
@@ -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",
