10 files changed, 20 insertions, 11 deletions

diff --git a/firmware/target/arm/as3525/sd-as3525.c b/firmware/target/arm/as3525/sd-as3525.c
index d77c7133b6..ff41ef6215 100644
--- a/firmware/target/arm/as3525/sd-as3525.c
+++ b/firmware/target/arm/as3525/sd-as3525.c
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "gcc_extensions.h"
 #include "as3525.h"
 #include "pl180.h"  /* SD controller */
 #include "pl081.h"  /* DMA controller */
@@ -432,7 +433,7 @@ static int sd_init_card(const int drive)
     return 0;
 }
 
-static void sd_thread(void) __attribute__((noreturn));
+static void sd_thread(void) NORETURN_ATTR;
 static void sd_thread(void)
 {
     struct queue_event ev;
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c
index 1f8044a18b..e8a0719b11 100644
--- a/firmware/target/arm/as3525/sd-as3525v2.c
+++ b/firmware/target/arm/as3525/sd-as3525v2.c
@@ -23,6 +23,7 @@
 #include "config.h" /* for HAVE_MULTIVOLUME */
 #include "fat.h"
 #include "thread.h"
+#include "gcc_extensions.h"
 #include "led.h"
 #include "sdmmc.h"
 #include "system.h"
@@ -616,7 +617,7 @@ static int sd_init_card(const int drive)
     return 0;
 }
 
-static void sd_thread(void) __attribute__((noreturn));
+static void sd_thread(void) NORETURN_ATTR;
 static void sd_thread(void)
 {
     struct queue_event ev;
diff --git a/firmware/target/arm/ata-sd-pp.c b/firmware/target/arm/ata-sd-pp.c
index a2dcfe518f..914858e464 100644
--- a/firmware/target/arm/ata-sd-pp.c
+++ b/firmware/target/arm/ata-sd-pp.c
@@ -21,6 +21,7 @@
 #include "config.h" /* for HAVE_MULTIDRIVE */
 #include "fat.h"
 #include "sdmmc.h"
+#include "gcc_extensions.h"
 #ifdef HAVE_HOTSWAP
 #include "sd-pp-target.h"
 #endif
@@ -1105,7 +1106,7 @@ sd_write_error:
     }
 }
 
-static void sd_thread(void) __attribute__((noreturn));
+static void sd_thread(void) NORETURN_ATTR;
 static void sd_thread(void)
 {
     struct queue_event ev;
diff --git a/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c
index f458561731..e1894ce0ac 100644
--- a/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/system-gigabeat-s.c
@@ -21,6 +21,7 @@
 
 #include "kernel.h"
 #include "system.h"
+#include "gcc_extensions.h"
 #include "panic.h"
 #include "avic-imx31.h"
 #include "gpio-imx31.h"
@@ -219,9 +220,9 @@ void system_prepare_fw_start(void)
 
 #ifndef BOOTLOADER
 void rolo_restart_firmware(const unsigned char *source, unsigned char *dest,
-                           int length) __attribute__((noreturn));
+                           int length) NORETURN_ATTR;
 
-void __attribute__((noreturn))
+void NORETURN_ATTR
 rolo_restart(const unsigned char *source, unsigned char *dest, int length)
 {
     /* Some housekeeping tasks must be performed for a safe changeover */
diff --git a/firmware/target/arm/imx31/rolo_restart_firmware.S b/firmware/target/arm/imx31/rolo_restart_firmware.S
index 5f24f653e0..45d37d14ef 100644
--- a/firmware/target/arm/imx31/rolo_restart_firmware.S
+++ b/firmware/target/arm/imx31/rolo_restart_firmware.S
@@ -25,7 +25,7 @@
 
 /****************************************************************************
  * void rolo_restart_firmware(const unsigned char* source, unsigned char* dest,
- *                            int length) __attribute__((noreturn));
+ *                            int length) NORETURN_ATTR;
  */
     .section    .text, "ax", %progbits
     .align      2
diff --git a/firmware/target/arm/s3c2440/sd-s3c2440.c b/firmware/target/arm/s3c2440/sd-s3c2440.c
index d42405db65..4a15835b67 100644
--- a/firmware/target/arm/s3c2440/sd-s3c2440.c
+++ b/firmware/target/arm/s3c2440/sd-s3c2440.c
@@ -24,6 +24,7 @@
 #include "sd.h"
 #include "system.h"
 #include <string.h>
+#include "gcc_extensions.h"
 #include "thread.h"
 #include "panic.h"
 
@@ -575,7 +576,7 @@ bool sd_removable(IF_MD_NONVOID(int card_no))
 #endif /* HAVE_HOTSWAP */
 /*****************************************************************************/
 
-static void sd_thread(void) __attribute__((noreturn));
+static void sd_thread(void) NORETURN_ATTR;
 static void sd_thread(void)
 {
     struct queue_event ev;
diff --git a/firmware/target/arm/system-arm.c b/firmware/target/arm/system-arm.c
index 01d2ba6e67..8d07347514 100644
--- a/firmware/target/arm/system-arm.c
+++ b/firmware/target/arm/system-arm.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include "lcd.h"
 #include "font.h"
+#include "gcc_extensions.h"
 
 static const char* const uiename[] = {
     "Undefined instruction",
@@ -34,7 +35,7 @@ static const char* const uiename[] = {
 /* Unexpected Interrupt or Exception handler. Currently only deals with
    exceptions, but will deal with interrupts later.
  */
-void __attribute__((noreturn)) UIE(unsigned int pc, unsigned int num)
+void NORETURN_ATTR UIE(unsigned int pc, unsigned int num)
 {
 #if LCD_DEPTH > 1
     lcd_set_backdrop(NULL);
diff --git a/firmware/target/arm/tcc780x/sd-tcc780x.c b/firmware/target/arm/tcc780x/sd-tcc780x.c
index 88ccf187f0..7f17e457c9 100644
--- a/firmware/target/arm/tcc780x/sd-tcc780x.c
+++ b/firmware/target/arm/tcc780x/sd-tcc780x.c
@@ -22,6 +22,7 @@
 #include "sd.h"
 #include "system.h"
 #include <string.h>
+#include "gcc_extensions.h"
 #include "sdmmc.h"
 #include "storage.h"
 #include "led.h"
@@ -642,7 +643,7 @@ sd_write_error:
     }
 }
 
-static void sd_thread(void) __attribute__((noreturn));
+static void sd_thread(void) NORETURN_ATTR;
 static void sd_thread(void)
 {
     struct queue_event ev;
diff --git a/firmware/target/coldfire/system-coldfire.c b/firmware/target/coldfire/system-coldfire.c
index ba67daa3a6..75440a23bf 100644
--- a/firmware/target/coldfire/system-coldfire.c
+++ b/firmware/target/coldfire/system-coldfire.c
@@ -20,6 +20,7 @@
  ****************************************************************************/
 #include <stdio.h>
 #include "config.h"
+#include "gcc_extensions.h"
 #include "adc.h"
 #include "system.h"
 #include "lcd.h"
@@ -200,7 +201,7 @@ static void system_display_exception_info(unsigned long format,
        reliable. The system restarts, but boot often fails with ata error -42. */
 }
 
-static void UIE(void) __attribute__ ((noreturn));
+static void UIE(void) NORETURN_ATTR;
 static void UIE(void)
 {
     asm volatile("subq.l #4,%sp"); /* phony return address - never used */
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
index 8fdf7d0287..023835303b 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
@@ -20,6 +20,7 @@
  ****************************************************************************/
 
 #include "config.h"
+#include "gcc_extensions.h"
 #include "jz4740.h"
 #include "ata.h"
 #include "ata_idle_notify.h"
@@ -47,7 +48,7 @@ static const char         sd_thread_name[] = "ata/sd";
 static struct event_queue sd_queue;
 static struct mutex       sd_mtx;
 static struct wakeup      sd_wakeup;
-static void               sd_thread(void) __attribute__((noreturn));
+static void               sd_thread(void) NORETURN_ATTR;
 
 static int                use_4bit;
 static int                num_6;