From ae16aa2fb7caee7895d73248c3625e13e78a8e27 Mon Sep 17 00:00:00 2001 From: ccli8 Date: Fri, 8 Jun 2018 17:54:07 +0800 Subject: [PATCH] Fix overridden MBED_ROM_START/MBED_ROM_SIZE/MBED_RAM_START/MBED_RAM_SIZE don't pass to linker --- tools/toolchains/__init__.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/toolchains/__init__.py b/tools/toolchains/__init__.py index 85b4c76986..a2af898abf 100644 --- a/tools/toolchains/__init__.py +++ b/tools/toolchains/__init__.py @@ -467,22 +467,26 @@ class mbedToolchain: rom_start_override = getattr(self.target, "mbed_rom_start", False) if rom_start_override: self.macros.append("MBED_ROM_START=0x%x" % int(rom_start_override, 0)) - self.make_ld_define("MBED_ROM_START", int(rom_start_override, 0)) + _ = self.make_ld_define("MBED_ROM_START", int(rom_start_override, 0)) + self.flags["ld"].append(_) rom_size_override = getattr(self.target, "mbed_rom_size", False) if rom_size_override: self.macros.append("MBED_ROM_SIZE=0x%x" % int(rom_size_override, 0)) - self.make_ld_define("MBED_ROM_SIZE", int(rom_size_override, 0)) + _ = self.make_ld_define("MBED_ROM_SIZE", int(rom_size_override, 0)) + self.flags["ld"].append(_) # Pass SRAM information (MBED_RAM_START/MBED_RAM_SIZE) to compiler/linker # if target configuration options (mbed_ram_start/mbed_ram_size) are defined. ram_start_override = getattr(self.target, "mbed_ram_start", False) if ram_start_override: self.macros.append("MBED_RAM_START=0x%x" % int(ram_start_override, 0)) - self.make_ld_define("MBED_RAM_START", int(ram_start_override, 0)) + _ = self.make_ld_define("MBED_RAM_START", int(ram_start_override, 0)) + self.flags["ld"].append(_) ram_size_override = getattr(self.target, "mbed_ram_size", False) if ram_size_override: self.macros.append("MBED_RAM_SIZE=0x%x" % int(ram_size_override, 0)) - self.make_ld_define("MBED_RAM_SIZE", int(ram_size_override, 0)) + _ = self.make_ld_define("MBED_RAM_SIZE", int(ram_size_override, 0)) + self.flags["ld"].append(_) # Stats cache is used to reduce the amount of IO requests to stat # header files during dependency change. See need_update()