From 026cad832ad4717b762041a78261f7d6faeef894 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Thu, 6 Jun 2013 18:53:33 +0200
Subject: [PATCH 1/2] Hotfix: Added missing header

---
 src/examples/px4_daemon_app/px4_daemon_app.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/examples/px4_daemon_app/px4_daemon_app.c b/src/examples/px4_daemon_app/px4_daemon_app.c
index 4dd5165c8c..c568aaadcf 100644
--- a/src/examples/px4_daemon_app/px4_daemon_app.c
+++ b/src/examples/px4_daemon_app/px4_daemon_app.c
@@ -43,6 +43,7 @@
 #include <unistd.h>
 #include <stdio.h>
 
+#include <systemlib/systemlib.h>
 #include <systemlib/err.h>
 
 static bool thread_should_exit = false;		/**< daemon exit flag */

From 2aa16dc44764485639921eb4adbbca429c3a4773 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Thu, 6 Jun 2013 19:12:10 +0200
Subject: [PATCH 2/2] Hotfix: Disable instrumentation on IO

---
 makefiles/toolchain_gnu-arm-eabi.mk | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk
index c75a08bd16..99c2776fdf 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