Merge pull request #7011 from mharringADI/fix-cces-export-float-abi

Fixed float-abi linker option for CCES exporter.

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):

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" : {