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 #6644 from OpenNuvoton/nuvoton_fix_armc6_armv8m 

Fix build tool with ARMC6/ARMv8M
pull/6762/head
Cruz Monrreal 2018-04-26 20:20:12 -05:00 committed by GitHub
parent 380973aa9a da69f0165b
commit 1f259a4064
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/toolchains/arm.py
View File

@ -252,7 +252,8 @@ class ARM(mbedToolchain):
@hook_tool @hook_tool
def binary(self, resources, elf, bin): def binary(self, resources, elf, bin):
_, fmt = splitext(bin) _, fmt = splitext(bin)
bin_arg = {".bin": "--bin", ".hex": "--i32"}[fmt] # On .hex format, combine multiple .hex files (for multiple load regions) into one
bin_arg = {".bin": "--bin", ".hex": "--i32combined"}[fmt]
cmd = [self.elf2bin, bin_arg, '-o', bin, elf] cmd = [self.elf2bin, bin_arg, '-o', bin, elf]
cmd = self.hook.get_cmdline_binary(cmd) cmd = self.hook.get_cmdline_binary(cmd)
@ -359,10 +360,15 @@ class ARMC6(ARM_STD):
self.flags['common'].append("-mcmse") self.flags['common'].append("-mcmse")
# Create Secure library # Create Secure library
if target.core == "Cortex-M23" or self.target.core == "Cortex-M33": if ((target.core == "Cortex-M23" or self.target.core == "Cortex-M33") and
kwargs.get('build_dir', False)):
build_dir = kwargs['build_dir'] build_dir = kwargs['build_dir']
secure_file = join(build_dir, "cmse_lib.o") secure_file = join(build_dir, "cmse_lib.o")
self.flags["ld"] += ["--import_cmse_lib_out=%s" % secure_file] self.flags["ld"] += ["--import_cmse_lib_out=%s" % secure_file]
# Add linking time preprocessor macro __DOMAIN_NS
if target.core == "Cortex-M23-NS" or self.target.core == "Cortex-M33-NS":
define_string = self.make_ld_define("__DOMAIN_NS", 1)
self.flags["ld"].append(define_string)
asm_cpu = { asm_cpu = {
"Cortex-M0+": "Cortex-M0", "Cortex-M0+": "Cortex-M0",