[GCC_ARM][EXPORTER] Use the cpu flags from the toolchain.

pull/1159/head
Christian Taedcke 2015-06-05 14:37:08 +02:00
parent e96a25a755
commit 4cdfbc7065
5 changed files with 12 additions and 27 deletions

View File

@ -20,7 +20,16 @@ OBJDUMP = $(GCC_BIN)arm-none-eabi-objdump
SIZE = $(GCC_BIN)arm-none-eabi-size
{% block flags %}
CPU = {% block cpu %}-mcpu=cortex-m3 -mthumb{% endblock %}
{% block hardfp %}
{%- if "-mfloat-abi=softfp" in cpu_flags %}
ifeq ($(HARDFP),1)
FLOAT_ABI = hard
else
FLOAT_ABI = softfp
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 %}

View File

@ -1,6 +1,5 @@
{% extends "gcc_arm_common.tmpl" %}
{% block cpu %}-mcpu=cortex-m0 -mthumb{% endblock %}
{% block ld_flags %}$(CPU) -Wl,--gc-sections --specs=nano.specs -Wl,--wrap,main{% endblock %}
{% block flags %}

View File

@ -1,17 +1,5 @@
{% extends "gcc_arm_common.tmpl" %}
{% block cpu %}-mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=$(FLOAT_ABI){% endblock %}
{% block flags %}
ifeq ($(HARDFP),1)
FLOAT_ABI = hard
else
FLOAT_ABI = softfp
endif
{{ super() }}
{% endblock %}
{% block target_project_elf %}
{{ super() }}
@echo ""

View File

@ -1,13 +1 @@
{% extends "gcc_arm_common.tmpl" %}
{% block cpu %}-mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=$(FLOAT_ABI){% endblock %}
{% block flags %}
ifeq ($(HARDFP),1)
FLOAT_ABI = hard
else
FLOAT_ABI = softfp
endif
{{ super() }}
{% endblock %}

View File

@ -122,6 +122,7 @@ class GccArm(Exporter):
'library_paths': self.resources.lib_dirs,
'linker_script': self.resources.linker_script,
'libraries': libraries,
'symbols': self.get_symbols()
'symbols': self.get_symbols(),
'cpu_flags': self.toolchain.cpu
}
self.gen_file('gcc_arm_%s.tmpl' % self.target.lower(), ctx, 'Makefile')