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

Use preinclude of mbed_config.h in all toolchains

pull/7061/head
Jimmy Brisson 2018-06-15 09:25:12 -05:00
parent dcd17935e3
commit a855281633
5 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/export/iar/__init__.py
View File

@ -111,11 +111,9 @@ class IAR(Exporter):
self.resources.c_sources + self.resources.cpp_sources + \
self.resources.objects + self.resources.libraries
flags = self.flags
_, macros = self.toolchain.config.get_config_data()
defines = ['-D%s' % d for d in macros] if macros else [""]
c_flags = list(set(flags['common_flags']
+ flags['c_flags']
+ flags['cxx_flags']))
+ flags['c_flags']
+ flags['cxx_flags']))
# Flags set in template to be set by user in IDE
template = ["--vla", "--no_static_destruction"]
# Flag invalid if set in template
@ -136,7 +134,6 @@ class IAR(Exporter):
'device': self.iar_device(),
'ewp': sep+self.project_name + ".ewp",
'debugger': debugger,
'defines': defines
}
ctx.update(flags)

4
tools/export/iar/ewp.tmpl
View File

@ -479,9 +479,7 @@
</option>
<option>
<name>ADefines</name>
{% for d in defines %}
<state>{{d}}</state>
{% endfor %}
<state></state>
</option>
<option>
<name>AList</name>

6
tools/toolchains/arm.py
View File

@ -147,6 +147,9 @@ class ARM(mbedToolchain):
def get_compile_options(self, defines, includes, for_asm=False):
opts = ['-D%s' % d for d in defines]
config_header = self.get_config_header()
if config_header is not None:
opts = opts + self.get_config_option(config_header)
if for_asm:
return opts
if self.RESPONSE_FILES:
@ -154,9 +157,6 @@ class ARM(mbedToolchain):
else:
opts += ["-I%s" % i for i in includes]
config_header = self.get_config_header()
if config_header is not None:
opts = opts + self.get_config_option(config_header)
return opts
@hook_tool

7
tools/toolchains/gcc.py
View File

@ -148,10 +148,9 @@ class GCC(mbedToolchain):
else:
opts += ["-I%s" % i for i in includes]
if not for_asm:
config_header = self.get_config_header()
if config_header is not None:
opts = opts + self.get_config_option(config_header)
config_header = self.get_config_header()
if config_header is not None:
opts = opts + self.get_config_option(config_header)
return opts
@hook_tool

10
tools/toolchains/iar.py
View File

@ -140,6 +140,9 @@ class IAR(mbedToolchain):
def get_compile_options(self, defines, includes, for_asm=False):
opts = ['-D%s' % d for d in defines]
config_header = self.get_config_header()
if config_header is not None:
opts = opts + self.get_config_option(config_header)
if for_asm :
return opts
if self.RESPONSE_FILES:
@ -147,17 +150,12 @@ class IAR(mbedToolchain):
else:
opts += ["-I%s" % i for i in includes]
config_header = self.get_config_header()
if config_header is not None:
opts = opts + self.get_config_option(config_header)
return opts
@hook_tool
def assemble(self, source, object, includes):
_, macros = self.config.get_config_data()
defines = ['-D%s' % d for d in macros] if macros else [""]
# Build assemble command
cmd = self.asm + self.get_compile_options(self.get_symbols(True), includes, True) + defines + ["-o", object, source]
cmd = self.asm + self.get_compile_options(self.get_symbols(True), includes, True) + ["-o", object, source]
# Call cmdline hook
cmd = self.hook.get_cmdline_assembler(cmd)