summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Gjenero <dreamlayers@rockbox.org>2011-12-09 16:13:03 +0000
committerBoris Gjenero <dreamlayers@rockbox.org>2011-12-09 16:13:03 +0000
commit8906b3e659ccfa7f9ada221a1d6166a7348d569e (patch)
treedf036bff0d493f02a96ee7e1929ef462eb4f0ff8
parent59e71ee80c65426b2f569cc4c60936053cc9caa5 (diff)
downloadrockbox-8906b3e659ccfa7f9ada221a1d6166a7348d569e.zip
rockbox-8906b3e659ccfa7f9ada221a1d6166a7348d569e.tar.gz
rockbox-8906b3e659ccfa7f9ada221a1d6166a7348d569e.tar.bz2
rockbox-8906b3e659ccfa7f9ada221a1d6166a7348d569e.tar.xz
Convert remaining __attribute__((noreturn)) to NORETURN_ATTR.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31189 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/thread-pp.c2
-rw-r--r--firmware/target/coldfire/system-coldfire.c2
-rw-r--r--firmware/thread.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/firmware/target/arm/thread-pp.c b/firmware/target/arm/thread-pp.c
index 5e834bc..167bf03 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 bc8c78b..4f7ac43 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 7b91f8f..251646b 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)