Skip to content

Commit 4092716

Browse files
mharringADIadbridge
authored andcommitted
Fixed incorrect clean_flags method and float-abi linker option for CCES exporter.
1 parent 5668d81 commit 4092716

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

tools/export/cces/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ def format_src_path(path):
108108
return CCES.format_path(path, "PARENT-1-PROJECT_LOC/")
109109

110110
@staticmethod
111-
def clean_flags(container, flags):
111+
def clean_flags(container, flags_to_remove):
112112
"""
113113
Some flags are handled by CCES already, so there's no need
114114
to include them twice.
115115
"""
116-
for flag in container:
117-
if flag in flags:
118-
flags.remove(flag)
116+
for flag in flags_to_remove:
117+
if flag in container:
118+
container.remove(flag)
119119

120120
@staticmethod
121121
def parse_flags(flags, options, booleans):

tools/export/cces/cces.json.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@
9191
]
9292
},
9393
{% if float_abi %}
94-
"-mfloat-abi=${value}" : {
95-
"type" : "command",
96-
"value" : "{{ float_abi }}"
94+
"arm.toolchain.gcc.cpp.linker.option.fpu.abi" : {
95+
"type" : "baseId",
96+
"value" : "arm.toolchain.gcc.c.linker.option.fpu.abi.{{ float_abi }}"
9797
},
9898
{% endif %}
9999
"-T" : {

0 commit comments

Comments
 (0)