aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Kirienko <pavel.kirienko@gmail.com>2015-01-18 22:40:22 +0300
committerLorenz Meier <lm@inf.ethz.ch>2015-01-21 14:54:24 +0100
commitf6786d0be91659bfe6cca393d512edd5aa7a407e (patch)
tree6c03810e3df79260babdc26b4a671a0bdc3b8228
parent2ebd7099de83c603b01bedd278c38a4eb6b77b2b (diff)
downloadpx4-firmware-f6786d0be91659bfe6cca393d512edd5aa7a407e.tar.gz
px4-firmware-f6786d0be91659bfe6cca393d512edd5aa7a407e.tar.bz2
px4-firmware-f6786d0be91659bfe6cca393d512edd5aa7a407e.zip
Removing -ffixed-r10 when stack checks aren't enabled
-rw-r--r--makefiles/toolchain_gnu-arm-eabi.mk4
-rw-r--r--nuttx-configs/px4fmu-v2/nsh/Make.defs2
2 files changed, 3 insertions, 3 deletions
diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk
index 7055137ca..0d681cacc 100644
--- a/makefiles/toolchain_gnu-arm-eabi.mk
+++ b/makefiles/toolchain_gnu-arm-eabi.mk
@@ -89,8 +89,8 @@ ARCHINSTRUMENTATIONDEFINES_CORTEXM4F = -finstrument-functions -ffixed-r10
ARCHINSTRUMENTATIONDEFINES_CORTEXM4 = -finstrument-functions -ffixed-r10
ARCHINSTRUMENTATIONDEFINES_CORTEXM3 =
else
-ARCHINSTRUMENTATIONDEFINES_CORTEXM4F = -ffixed-r10
-ARCHINSTRUMENTATIONDEFINES_CORTEXM4 = -ffixed-r10
+ARCHINSTRUMENTATIONDEFINES_CORTEXM4F =
+ARCHINSTRUMENTATIONDEFINES_CORTEXM4 =
ARCHINSTRUMENTATIONDEFINES_CORTEXM3 =
endif
diff --git a/nuttx-configs/px4fmu-v2/nsh/Make.defs b/nuttx-configs/px4fmu-v2/nsh/Make.defs
index 798d58572..b2f05293d 100644
--- a/nuttx-configs/px4fmu-v2/nsh/Make.defs
+++ b/nuttx-configs/px4fmu-v2/nsh/Make.defs
@@ -68,7 +68,7 @@ $(info Stack checks enabled)
INSTRUMENTATIONDEFINES = -finstrument-functions \
-ffixed-r10
else
-INSTRUMENTATIONDEFINES = -ffixed-r10
+INSTRUMENTATIONDEFINES =
endif
# pull in *just* libm from the toolchain ... this is grody