From c1d115e25b614e19cf9d0cb4e73580f1fdcf736f Mon Sep 17 00:00:00 2001
From: Lingkai Dong <lingkai.dong@arm.com>
Date: Thu, 25 Feb 2021 12:03:26 +0000
Subject: [PATCH] Fix conflicts in IAR configuration

In `targets.json`, the base target ARM_MPS2_Target does not have `iar`
in `supported_c_libs`. But its inherited targets have `IAR` in
`supported_toolchains`, causing configuration check to fail.
---
 targets/targets.json | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/targets/targets.json b/targets/targets.json
index da2b25251f..5b1957779a 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -4423,8 +4423,7 @@
         "core": "Cortex-M0",
         "supported_toolchains": [
             "ARM",
-            "GCC_ARM",
-            "IAR"
+            "GCC_ARM"
         ],
         "extra_labels": [
             "ARM_SSG",
@@ -4465,8 +4464,7 @@
         "core": "Cortex-M0+",
         "supported_toolchains": [
             "ARM",
-            "GCC_ARM",
-            "IAR"
+            "GCC_ARM"
         ],
         "extra_labels": [
             "ARM_SSG",
@@ -4505,8 +4503,7 @@
         "core": "Cortex-M3",
         "supported_toolchains": [
             "ARM",
-            "GCC_ARM",
-            "IAR"
+            "GCC_ARM"
         ],
         "extra_labels": [
             "ARM_SSG",
@@ -4546,8 +4543,7 @@
         "core": "Cortex-M4F",
         "supported_toolchains": [
             "ARM",
-            "GCC_ARM",
-            "IAR"
+            "GCC_ARM"
         ],
         "extra_labels": [
             "ARM_SSG",
@@ -4587,8 +4583,7 @@
         "core": "Cortex-M7FD",
         "supported_toolchains": [
             "ARM",
-            "GCC_ARM",
-            "IAR"
+            "GCC_ARM"
         ],
         "extra_labels": [
             "ARM_SSG",