From 82eee58eb83d2ea9034566c6070d338e7c5b3653 Mon Sep 17 00:00:00 2001
From: Christian Taedcke <hacking@taedcke.com>
Date: Fri, 5 Jun 2015 15:04:34 +0200
Subject: [PATCH] [GCC_ARM][EXPORTER] Set different LDFLAGS for all cortex
 m0(+).

---
 workspace_tools/export/gcc_arm_common.tmpl  | 11 ++++++++++-
 workspace_tools/export/gcc_arm_lpc1114.tmpl |  7 -------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/workspace_tools/export/gcc_arm_common.tmpl b/workspace_tools/export/gcc_arm_common.tmpl
index d8bcb08b5f..5e2d72d849 100644
--- a/workspace_tools/export/gcc_arm_common.tmpl
+++ b/workspace_tools/export/gcc_arm_common.tmpl
@@ -20,6 +20,7 @@ OBJDUMP = $(GCC_BIN)arm-none-eabi-objdump
 SIZE    = $(GCC_BIN)arm-none-eabi-size
 
 {% block flags %}
+
 {% block hardfp %} 
 {%- if "-mfloat-abi=softfp" in cpu_flags %}
 ifeq ($(HARDFP),1)
@@ -29,11 +30,19 @@ else
 endif
 {% endif %}
 {% endblock %}
+
 CPU = {% block cpu %}{% for cf in cpu_flags %}{{cf|replace("-mfloat-abi=softfp","-mfloat-abi=$(FLOAT_ABI)")}} {% endfor %}{% endblock %}
 CC_FLAGS = {% block cc_flags %}$(CPU) -c -g -fno-common -fmessage-length=0 -Wall -fno-exceptions -ffunction-sections -fdata-sections -fomit-frame-pointer -MMD -MP{% endblock %}
 CC_SYMBOLS = {% block cc_symbols %}{% for s in symbols %}-D{{s}} {% endfor %}{% endblock %}
 
-LD_FLAGS = {% block ld_flags %}$(CPU) -Wl,--gc-sections --specs=nano.specs -u _printf_float -u _scanf_float -Wl,--wrap,main -Wl,-Map=$(PROJECT).map,--cref{% endblock %}
+LD_FLAGS = {%- block ld_flags -%}
+{%- if "-mcpu=cortex-m0" in cpu_flags or "-mcpu=cortex-m0plus" in cpu_flags -%}
+{{ ' ' }}$(CPU) -Wl,--gc-sections --specs=nano.specs -Wl,--wrap,main -Wl,-Map=$(PROJECT).map,--cref
+#LD_FLAGS += -u _printf_float -u _scanf_float
+{%- else -%}
+{{ ' ' }}$(CPU) -Wl,--gc-sections --specs=nano.specs -u _printf_float -u _scanf_float -Wl,--wrap,main -Wl,-Map=$(PROJECT).map,--cref
+{%- endif -%}
+{% endblock %}
 LD_SYS_LIBS = {% block ld_sys_libs %}-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys{% endblock %}
 {% endblock %}
 
diff --git a/workspace_tools/export/gcc_arm_lpc1114.tmpl b/workspace_tools/export/gcc_arm_lpc1114.tmpl
index 6d53551241..dbbc6daacb 100644
--- a/workspace_tools/export/gcc_arm_lpc1114.tmpl
+++ b/workspace_tools/export/gcc_arm_lpc1114.tmpl
@@ -1,12 +1,5 @@
 {% extends "gcc_arm_common.tmpl" %}
 
-{% block ld_flags %}$(CPU) -Wl,--gc-sections --specs=nano.specs -Wl,--wrap,main{% endblock %}
-
-{% block flags %}
-{{ super() }}
-#LD_FLAGS += -u _printf_float -u _scanf_float
-{% endblock %}
-
 {% block target_project_elf %}
 {{ super() }}
 	@echo ""