ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Fixed float-abi linker option for CCES exporter.
pull/6752/merge
Cruz Monrreal 2018-05-29 10:41:34 -05:00 committed by GitHub
parent 42b3ef7bd5 daf4c78ad4
commit b70f6e056d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/export/cces/__init__.py
View File

@ -108,14 +108,14 @@ class CCES(Exporter):
return CCES.format_path(path, "PARENT-1-PROJECT_LOC/") return CCES.format_path(path, "PARENT-1-PROJECT_LOC/")
@staticmethod @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 Some flags are handled by CCES already, so there's no need
to include them twice. to include them twice.
""" """
for flag in container: for flag in flags_to_remove:
if flag in flags: if flag in container:
flags.remove(flag) container.remove(flag)
@staticmethod @staticmethod
def parse_flags(flags, options, booleans): def parse_flags(flags, options, booleans):

6
tools/export/cces/cces.json.tmpl
View File

@ -91,9 +91,9 @@
] ]
}, },
{% if float_abi %} {% if float_abi %}
"-mfloat-abi=${value}" : { "arm.toolchain.gcc.cpp.linker.option.fpu.abi" : {
"type" : "command", "type" : "baseId",
"value" : "{{ float_abi }}" "value" : "arm.toolchain.gcc.c.linker.option.fpu.abi.{{ float_abi }}"
}, },
{% endif %} {% endif %}
"-T" : { "-T" : {