diff --git a/arch/or1k/include/mor1kx/irq.h b/arch/or1k/include/mor1kx/irq.h
index 41255e815b..b49a390e6c 100644
--- a/arch/or1k/include/mor1kx/irq.h
+++ b/arch/or1k/include/mor1kx/irq.h
@@ -228,8 +228,7 @@ static inline_function void up_irq_restore(irqstate_t flags)
 
 /* Enable IRQs */
 
-static inline_function void up_irq_enable(void) always_inline_function;
-static inline_function void up_irq_enable(void)
+static always_inline_function void up_irq_enable(void)
 {
   irqstate_t flags;
   mfspr(SPR_SYS_SR, flags);
diff --git a/arch/xtensa/src/common/xtensa_backtrace.c b/arch/xtensa/src/common/xtensa_backtrace.c
index 53495e01ac..e562d88663 100644
--- a/arch/xtensa/src/common/xtensa_backtrace.c
+++ b/arch/xtensa/src/common/xtensa_backtrace.c
@@ -73,8 +73,8 @@ struct xtensa_windowregs_s
  * Private Function Prototypes
  ****************************************************************************/
 
-static void inline get_window_regs(struct xtensa_windowregs_s *frame)
-always_inline_function;
+always_inline_function static
+void get_window_regs(struct xtensa_windowregs_s *frame);
 
 /****************************************************************************
  * Private Functions
@@ -89,7 +89,8 @@ always_inline_function;
  ****************************************************************************/
 
 #ifndef __XTENSA_CALL0_ABI__
-static void get_window_regs(struct xtensa_windowregs_s *frame)
+always_inline_function static
+void get_window_regs(struct xtensa_windowregs_s *frame)
 {
   __asm__ __volatile__("\trsr %0, WINDOWSTART\n": "=r"(frame->windowstart));
   __asm__ __volatile__("\trsr %0, WINDOWBASE\n": "=r"(frame->windowbase));
diff --git a/include/nuttx/compiler.h b/include/nuttx/compiler.h
index 44936af580..35cc85920b 100644
--- a/include/nuttx/compiler.h
+++ b/include/nuttx/compiler.h
@@ -251,7 +251,7 @@
  * noinline_function indicates that the function should never be inlined.
  */
 
-#  define always_inline_function __attribute__((always_inline,no_instrument_function))
+#  define always_inline_function __attribute__((always_inline,no_instrument_function)) inline
 #  define inline_function __attribute__((always_inline)) inline
 #  define noinline_function __attribute__((noinline))
 
@@ -1087,7 +1087,7 @@
 #  define end_packed_struct             __attribute__((packed))
 #  define reentrant_function
 #  define naked_function
-#  define always_inline_function        __attribute__((always_inline,no_instrument_function))
+#  define always_inline_function        __attribute__((always_inline,no_instrument_function)) inline
 #  define inline_function               __attribute__((always_inline)) inline
 #  define noinline_function             __attribute__((noinline))
 #  define noinstrument_function