diff options
| -rw-r--r-- | makefiles/toolchain_gnu-arm-eabi.mk | 4 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/Make.defs | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk index d7e48f03b..2359a66b0 100644 --- a/makefiles/toolchain_gnu-arm-eabi.mk +++ b/makefiles/toolchain_gnu-arm-eabi.mk @@ -80,6 +80,8 @@ ARCHCPUFLAGS_CORTEXM3 = -mcpu=cortex-m3 \ -march=armv7-m \ -mfloat-abi=soft +ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) + ARCHINSTRUMENTATIONDEFINES_CORTEXM4F = -finstrument-functions \ -ffixed-r10 @@ -88,6 +90,8 @@ ARCHINSTRUMENTATIONDEFINES_CORTEXM4 = -finstrument-functions \ ARCHINSTRUMENTATIONDEFINES_CORTEXM3 = +endif + # Pick the right set of flags for the architecture. # ARCHCPUFLAGS = $(ARCHCPUFLAGS_$(CONFIG_ARCH)) diff --git a/nuttx-configs/px4fmu-v2/nsh/Make.defs b/nuttx-configs/px4fmu-v2/nsh/Make.defs index 4d16f271f..02e2db428 100644 --- a/nuttx-configs/px4fmu-v2/nsh/Make.defs +++ b/nuttx-configs/px4fmu-v2/nsh/Make.defs @@ -56,10 +56,11 @@ ARCHCPUFLAGS = -mcpu=cortex-m4 \ -mfpu=fpv4-sp-d16 \ -mfloat-abi=hard +ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) # enable precise stack overflow tracking INSTRUMENTATIONDEFINES = -finstrument-functions \ -ffixed-r10 - +endif # Pull in *just* libm from the toolchain ... this is grody LIBM = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}" |