From 7f2f0bc5c609f0146579b4e37eb475fc54e1a629 Mon Sep 17 00:00:00 2001 From: Olaf Hagendorf Date: Wed, 6 Jul 2016 13:34:59 +0200 Subject: [PATCH 1/2] repairing a minor typo in exporters.py --- tools/export/exporters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/export/exporters.py b/tools/export/exporters.py index da060a020dd..deb8926ddd7 100644 --- a/tools/export/exporters.py +++ b/tools/export/exporters.py @@ -108,7 +108,7 @@ def progen_get_project_data(self): return project_data def progen_gen_file(self, tool_name, project_data): - """" Generate project using ProGen Project API """ + """ Generate project using ProGen Project API """ settings = ProjectSettings() project = Project(self.program_name, [project_data], settings) # TODO: Fix this, the inc_dirs are not valid (our scripts copy files), therefore progen From bd614a2a1169386e6df5cc88030c324ce687bb7e Mon Sep 17 00:00:00 2001 From: Olaf Hagendorf Date: Wed, 6 Jul 2016 13:35:09 +0200 Subject: [PATCH 2/2] [bugfix gcc_arm] build+make <-> export project+make: different results when in target.json "default_build": "small" is configured - build.py+make.py - uses linker option --specs=nano.specs - macro MBED_RTOS_SINGLE_THREAD is defined - exporting with project.py + make Makefile - doesn't use the linker option --specs=nano.specs - doesn't contain macro MBED_RTOS_SINGLE_THREAD --- tools/toolchains/gcc.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/toolchains/gcc.py b/tools/toolchains/gcc.py index 47cd74d1496..a9e8b6af3a0 100644 --- a/tools/toolchains/gcc.py +++ b/tools/toolchains/gcc.py @@ -285,13 +285,17 @@ def __init__(self, target, options=None, notify=None, macros=None, silent=False, if use_nano: self.ld.append("--specs=nano.specs") + self.flags['ld'].append("--specs=nano.specs") self.cc += ["-DMBED_RTOS_SINGLE_THREAD"] self.cppc += ["-DMBED_RTOS_SINGLE_THREAD"] + self.macros.extend(["MBED_RTOS_SINGLE_THREAD"]) if target.name in ["LPC1768", "LPC4088", "LPC4088_DM", "LPC4330", "UBLOX_C027", "LPC2368", "ARM_BEETLE_SOC"]: self.ld.extend(["-u _printf_float", "-u _scanf_float"]) + self.flags['ld'].extend(["-u _printf_float", "-u _scanf_float"]) elif target.name in ["RZ_A1H", "VK_RZ_A1H", "ARCH_MAX", "DISCO_F407VG", "DISCO_F429ZI", "DISCO_F469NI", "NUCLEO_F401RE", "NUCLEO_F410RB", "NUCLEO_F411RE", "NUCLEO_F429ZI", "NUCLEO_F446RE", "NUCLEO_F446ZE", "ELMO_F411RE", "MTS_MDOT_F411RE", "MTS_DRAGONFLY_F411RE", "DISCO_F746NG"]: self.ld.extend(["-u_printf_float", "-u_scanf_float"]) + self.flags['ld'].extend(["-u_printf_float", "-u_scanf_float"]) self.sys_libs.append("nosys")