mirror of https://github.com/ARMmbed/mbed-os.git
Remove ASM include paths for ARM compiler
parent
5fcc9617de
commit
d8becaa652
|
@ -394,7 +394,7 @@
|
|||
<MiscControls>{{asm_flags}}</MiscControls>
|
||||
<Define></Define>
|
||||
<Undefine></Undefine>
|
||||
<IncludePath>{{include_paths}}</IncludePath>
|
||||
<IncludePath></IncludePath>
|
||||
</VariousControls>
|
||||
</Aads>
|
||||
<LDads>
|
||||
|
|
|
@ -135,17 +135,18 @@ class ARM(mbedToolchain):
|
|||
def get_config_option(self, config_header):
|
||||
return ['--preinclude=' + config_header]
|
||||
|
||||
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]
|
||||
if for_asm:
|
||||
return opts
|
||||
if self.RESPONSE_FILES:
|
||||
opts += ['--via', self.get_inc_file(includes)]
|
||||
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
|
||||
|
@ -156,7 +157,10 @@ class ARM(mbedToolchain):
|
|||
tempfile = join(dir, basename(object) + '.E.s')
|
||||
|
||||
# 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
|
||||
cmd = self.asm + ["-o", object, tempfile]
|
||||
|
|
Loading…
Reference in New Issue