diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-06 19:22:34 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-06 19:22:34 +0200 |
| commit | 34b6a91860e2925cfb7dbce4e3ce5b5a12c73e94 (patch) | |
| tree | dd00aa6453bef8f6d63b7af9576ccb8dd05e0451 /makefiles | |
| parent | fc471c731aa135fd339d811df04f20de230cf115 (diff) | |
| parent | 2aa16dc44764485639921eb4adbbca429c3a4773 (diff) | |
| download | px4-firmware-34b6a91860e2925cfb7dbce4e3ce5b5a12c73e94.tar.gz px4-firmware-34b6a91860e2925cfb7dbce4e3ce5b5a12c73e94.tar.bz2 px4-firmware-34b6a91860e2925cfb7dbce4e3ce5b5a12c73e94.zip | |
Merge branch 'master' of github.com:PX4/Firmware into integration
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/toolchain_gnu-arm-eabi.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk index c75a08bd1..99c2776fd 100644 --- a/makefiles/toolchain_gnu-arm-eabi.mk +++ b/makefiles/toolchain_gnu-arm-eabi.mk @@ -70,6 +70,14 @@ ARCHCPUFLAGS_CORTEXM3 = -mcpu=cortex-m3 \ -march=armv7-m \ -mfloat-abi=soft +ARCHINSTRUMENTATIONDEFINES_CORTEXM4F = -finstrument-functions \ + -ffixed-r10 + +ARCHINSTRUMENTATIONDEFINES_CORTEXM4 = -finstrument-functions \ + -ffixed-r10 + +ARCHINSTRUMENTATIONDEFINES_CORTEXM3 = + # Pick the right set of flags for the architecture. # ARCHCPUFLAGS = $(ARCHCPUFLAGS_$(CONFIG_ARCH)) @@ -91,8 +99,8 @@ ARCHOPTIMIZATION = $(MAXOPTIMIZATION) \ # enable precise stack overflow tracking # note - requires corresponding support in NuttX -INSTRUMENTATIONDEFINES = -finstrument-functions \ - -ffixed-r10 +INSTRUMENTATIONDEFINES = $(ARCHINSTRUMENTATIONDEFINES_$(CONFIG_ARCH)) + # Language-specific flags # ARCHCFLAGS = -std=gnu99 |