From 7cc6e25d02aae4a1b4aed8fd8de66a70b35a93a6 Mon Sep 17 00:00:00 2001
From: Mike Harrington <michael.harrington@analog.com>
Date: Thu, 24 May 2018 16:48:29 -0400
Subject: [PATCH] Fixed incorrect clean_flags method and float-abi linker
 option for CCES exporter.

---
 tools/export/cces/__init__.py    | 8 ++++----
 tools/export/cces/cces.json.tmpl | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/export/cces/__init__.py b/tools/export/cces/__init__.py
index 359042fcb8..b21ae22082 100644
--- a/tools/export/cces/__init__.py
+++ b/tools/export/cces/__init__.py
@@ -108,14 +108,14 @@ class CCES(Exporter):
         return CCES.format_path(path, "PARENT-1-PROJECT_LOC/")
 
     @staticmethod
-    def clean_flags(container, flags):
+    def clean_flags(container, flags_to_remove):
         """
         Some flags are handled by CCES already, so there's no need
         to include them twice.
         """
-        for flag in container:
-            if flag in flags:
-                flags.remove(flag)
+        for flag in flags_to_remove:
+            if flag in container:
+                container.remove(flag)
 
     @staticmethod
     def parse_flags(flags, options, booleans):
diff --git a/tools/export/cces/cces.json.tmpl b/tools/export/cces/cces.json.tmpl
index 11389fd41f..9a35eb7a63 100644
--- a/tools/export/cces/cces.json.tmpl
+++ b/tools/export/cces/cces.json.tmpl
@@ -91,9 +91,9 @@
                      ]
                   },
                   {% if float_abi %}
-                  "-mfloat-abi=${value}" : {
-                     "type" : "command",
-                     "value" : "{{ float_abi }}"
+                  "arm.toolchain.gcc.cpp.linker.option.fpu.abi" : {
+                     "type" : "baseId",
+                     "value" : "arm.toolchain.gcc.c.linker.option.fpu.abi.{{ float_abi }}"
                   },
                   {% endif %}
                   "-T" : {