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 #2359 from sarahmarshy/armasm_fix 

Removed preinclude config from asm flags
pull/2375/head
Sam Grove 2016-08-04 10:57:25 -05:00 committed by GitHub
parent 34caf43f5a b910cfe08c
commit 5dbdf934fd
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/export/exporters.py
View File

@ -62,7 +62,6 @@ class Exporter(object):
if self.config_header: if self.config_header:
self._progen_flag_cache['c_flags'] += self.toolchain.get_config_option(self.config_header) self._progen_flag_cache['c_flags'] += self.toolchain.get_config_option(self.config_header)
self._progen_flag_cache['cxx_flags'] += self.toolchain.get_config_option(self.config_header) self._progen_flag_cache['cxx_flags'] += self.toolchain.get_config_option(self.config_header)
self._progen_flag_cache['asm_flags'] += self.toolchain.get_config_option(self.config_header)
return self._progen_flag_cache return self._progen_flag_cache
def __scan_and_copy(self, src_path, trg_path): def __scan_and_copy(self, src_path, trg_path):

2
tools/export/iar.py
View File

@ -76,8 +76,6 @@ class IAREmbeddedWorkbench(Exporter):
project_data['tool_specific']['iar'].setdefault("misc", {}) project_data['tool_specific']['iar'].setdefault("misc", {})
project_data['tool_specific']['iar'].update(tool_specific['iar']) project_data['tool_specific']['iar'].update(tool_specific['iar'])
project_data['tool_specific']['iar']['misc'].update(self.progen_flags) project_data['tool_specific']['iar']['misc'].update(self.progen_flags)
project_data['tool_specific']['iar']['misc']['asm_flags'].remove(
self.toolchain.get_config_option(self.config_header)[0])
project_data['tool_specific']['iar']['misc']['asm_flags'].extend( project_data['tool_specific']['iar']['misc']['asm_flags'].extend(
['-D%s' % d for d in self.toolchain.get_symbols()]) ['-D%s' % d for d in self.toolchain.get_symbols()])
# VLA is enabled via template IccAllowVLA # VLA is enabled via template IccAllowVLA