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

Remove ASM include paths for ARM compiler

pull/6713/head
Jimmy Brisson 2018-04-23 15:23:00 -05:00
parent 5fcc9617de
commit d8becaa652
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/export/uvision/uvision.tmpl
View File

@ -394,7 +394,7 @@
<MiscControls>{{asm_flags}}</MiscControls> <MiscControls>{{asm_flags}}</MiscControls>
<Define></Define> <Define></Define>
<Undefine></Undefine> <Undefine></Undefine>
<IncludePath>{{include_paths}}</IncludePath> <IncludePath></IncludePath>
</VariousControls> </VariousControls>
</Aads> </Aads>
<LDads> <LDads>

8
tools/toolchains/arm.py
View File

@ -137,12 +137,13 @@ class ARM(mbedToolchain):
def get_compile_options(self, defines, includes, for_asm=False): def get_compile_options(self, defines, includes, for_asm=False):
opts = ['-D%s' % d for d in defines] opts = ['-D%s' % d for d in defines]
if for_asm:
return opts
if self.RESPONSE_FILES: if self.RESPONSE_FILES:
opts += ['--via', self.get_inc_file(includes)] opts += ['--via', self.get_inc_file(includes)]
else: else:
opts += ["-I%s" % i for i in includes] opts += ["-I%s" % i for i in includes]
if not for_asm:
config_header = self.get_config_header() config_header = self.get_config_header()
if config_header is not None: if config_header is not None:
opts = opts + self.get_config_option(config_header) opts = opts + self.get_config_option(config_header)
@ -156,7 +157,10 @@ class ARM(mbedToolchain):
tempfile = join(dir, basename(object) + '.E.s') tempfile = join(dir, basename(object) + '.E.s')
# Build preprocess assemble command # Build preprocess assemble command
cmd_pre = self.asm + self.get_compile_options(self.get_symbols(True), includes) + ["-E", "-o", tempfile, source] cmd_pre = self.asm
cmd_pre.extend(self.get_compile_options(
self.get_symbols(True), includes, True))
cmd_pre.extend(["-E", "-o", tempfile, source])
# Build main assemble command # Build main assemble command
cmd = self.asm + ["-o", object, tempfile] cmd = self.asm + ["-o", object, tempfile]