--- gdb-7.7.orig/sim/common/sim-arange.h	2014-04-10 14:07:37.000000000 +1000
+++ gdb-7.7/sim/common/sim-arange.h	2014-04-10 14:05:43.000000000 +1000
@@ -62,17 +62,13 @@
 
 /* Return non-zero if ADDR is in range AR, traversing the entire tree.
    If no range is specified, that is defined to mean "everything".  */
-extern INLINE int
+static INLINE int
 sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/);
 #define ADDR_RANGE_HIT_P(ar, addr) \
   ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr)))
 
 #ifdef HAVE_INLINE
-#ifdef SIM_ARANGE_C
-#define SIM_ARANGE_INLINE INLINE
-#else
-#define SIM_ARANGE_INLINE EXTERN_INLINE
-#endif
+#define SIM_ARANGE_INLINE static INLINE
 #include "sim-arange.c"
 #else
 #define SIM_ARANGE_INLINE