diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3a8fe7013ec..2c1a0542c2a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-06  Andrew Stubbs  <ams@codesourcery.com>
+
+	* config/arm/bpabi.h (PROFILE_HOOK): New undef.
+	(NO_PROFILE_COUNTERS): New define.
+
 2008-11-06  David Edelsohn  <edelsohn@gnu.org>
 
 	PR target/26397
diff --git a/gcc/config/arm/bpabi.h b/gcc/config/arm/bpabi.h
index c8cdc3db087..bc716593c17 100644
--- a/gcc/config/arm/bpabi.h
+++ b/gcc/config/arm/bpabi.h
@@ -155,6 +155,8 @@
     Note that __gnu_mcount_nc will be entered with a misaligned stack.
     This is OK because it uses a special calling convention anyway.  */
 
+#undef  NO_PROFILE_COUNTERS
+#define NO_PROFILE_COUNTERS 1
 #undef  ARM_FUNCTION_PROFILER
 #define ARM_FUNCTION_PROFILER(STREAM, LABELNO)  			\
 {									\
@@ -164,3 +166,7 @@
 
 #undef SUBTARGET_FRAME_POINTER_REQUIRED
 #define SUBTARGET_FRAME_POINTER_REQUIRED 0
+
+/* __gnu_mcount_nc restores the original LR value before returning.  Ensure
+   that there is no unnecessary hook set up.  */
+#undef PROFILE_HOOK