4 files changed, 10 insertions, 4 deletions

diff --git a/firmware/target/arm/imx31/dvfs_dptc-imx31.c b/firmware/target/arm/imx31/dvfs_dptc-imx31.c
index e8dee17416..02955a5aa4 100644
--- a/firmware/target/arm/imx31/dvfs_dptc-imx31.c
+++ b/firmware/target/arm/imx31/dvfs_dptc-imx31.c
@@ -29,6 +29,7 @@
 #include "avic-imx31.h"
 #include "dvfs_dptc-imx31.h"
 #include "dvfs_dptc_tables-target.h"
+#include "gcc_extensions.h"
 
 /* Most of the code in here is based upon the Linux BSP provided by Freescale
  * Copyright 2004-2008 Freescale Semiconductor, Inc. All Rights Reserved. */
@@ -181,7 +182,7 @@ static void set_current_dvfs_level(unsigned int level)
 }
 
 /* DVFS Interrupt handler */
-static void __attribute__((used)) dvfs_int(void)
+static void USED_ATTR dvfs_int(void)
 {
     unsigned long pmcr0 = CCM_PMCR0;
     unsigned long fsvai = pmcr0 & CCM_PMCR0_FSVAI;
diff --git a/firmware/target/arm/s3c2440/system-s3c2440.c b/firmware/target/arm/s3c2440/system-s3c2440.c
index 577b46966c..1e5613f7b6 100644
--- a/firmware/target/arm/s3c2440/system-s3c2440.c
+++ b/firmware/target/arm/s3c2440/system-s3c2440.c
@@ -23,6 +23,7 @@
 #include "panic.h"
 #include "mmu-arm.h"
 #include "cpu.h"
+#include "gcc_extensions.h"
 
 #define default_interrupt(name) \
   extern __attribute__((weak,alias("UIRQ"))) void name (void)
@@ -60,7 +61,7 @@ default_interrupt(SPI1);
 default_interrupt(RTC);
 default_interrupt(ADC);
 
-static void (* const irqvector[32])(void) __attribute__((__used__)) =
+static void (* const irqvector[32])(void) USED_ATTR =
 {
     EINT0, EINT1, EINT2, EINT3,
     EINT4_7, EINT8_23, CAM, nBATT_FLT, TICK, WDT_AC97,
diff --git a/firmware/target/arm/thread-arm.c b/firmware/target/arm/thread-arm.c
index 60bbefa6b6..302b1592d8 100644
--- a/firmware/target/arm/thread-arm.c
+++ b/firmware/target/arm/thread-arm.c
@@ -21,11 +21,13 @@
  *
  ****************************************************************************/
 
+#include "gcc_extensions.h"
+
 /*---------------------------------------------------------------------------
  * Start the thread running and terminate it if it returns
  *---------------------------------------------------------------------------
  */
-static void __attribute__((naked,used)) start_thread(void)
+static void __attribute__((naked)) USED_ATTR start_thread(void)
 {
     /* r0 = context */
     asm volatile (
diff --git a/firmware/target/arm/thread-pp.c b/firmware/target/arm/thread-pp.c
index 3eb7238a25..5e834bc6ad 100644
--- a/firmware/target/arm/thread-pp.c
+++ b/firmware/target/arm/thread-pp.c
@@ -21,6 +21,8 @@
  *
  ****************************************************************************/
 
+#include "gcc_extensions.h"
+
 #if defined(MAX_PHYS_SECTOR_SIZE) && MEMORYSIZE == 64
 /* Support a special workaround object for large-sector disks */
 #define IF_NO_SKIP_YIELD(...) __VA_ARGS__
@@ -546,7 +548,7 @@ void core_wake(unsigned int othercore)
 #endif /* CPU_PPxxxx */
 
 /* Keep constant pool in range of inline ASM */
-static void __attribute__((naked, used)) dump_ltorg(void)
+static void __attribute__((naked)) USED_ATTR dump_ltorg(void)
 {
     asm volatile (".ltorg");
 }