diff --git a/firmware/target/arm/thread-pp.c b/firmware/target/arm/thread-pp.c
index 5e834bc6ad..167bf03946 100644
--- a/firmware/target/arm/thread-pp.c
+++ b/firmware/target/arm/thread-pp.c
@@ -211,7 +211,7 @@ static void INIT_ATTR core_thread_init(unsigned int core)
  * to use a stack from an unloaded module until another thread runs on it.
  *---------------------------------------------------------------------------
  */
-static inline void __attribute__((noreturn,always_inline))
+static inline void NORETURN_ATTR __attribute__((always_inline))
     thread_final_exit(struct thread_entry *current)
 {
     asm volatile (
diff --git a/firmware/target/coldfire/system-coldfire.c b/firmware/target/coldfire/system-coldfire.c
index bc8c78b860..4f7ac43017 100644
--- a/firmware/target/coldfire/system-coldfire.c
+++ b/firmware/target/coldfire/system-coldfire.c
@@ -171,7 +171,7 @@ default_interrupt (ADC);  /* A/D converter */
 #endif
 
 static void system_display_exception_info(unsigned long format,
-    unsigned long pc) __attribute__ ((noreturn)) USED_ATTR;
+    unsigned long pc) NORETURN_ATTR USED_ATTR;
 static void system_display_exception_info(unsigned long format,
                                           unsigned long pc)
 {
diff --git a/firmware/thread.c b/firmware/thread.c
index 7b91f8fcbd..251646b0f5 100644
--- a/firmware/thread.c
+++ b/firmware/thread.c
@@ -165,10 +165,10 @@ static inline void load_context(const void* addr)
 
 #if NUM_CORES > 1
 static void thread_final_exit_do(struct thread_entry *current)
-    __attribute__((noinline, noreturn)) USED_ATTR;
+    __attribute__((noinline)) NORETURN_ATTR USED_ATTR;
 #else
 static inline void thread_final_exit(struct thread_entry *current)
-    __attribute__((always_inline, noreturn));
+    __attribute__((always_inline)) NORETURN_ATTR;
 #endif
 
 void switch_thread(void)