diff options
author | Boris Gjenero <dreamlayers@rockbox.org> | 2011-12-09 16:13:03 +0000 |
---|---|---|
committer | Boris Gjenero <dreamlayers@rockbox.org> | 2011-12-09 16:13:03 +0000 |
commit | 8906b3e659ccfa7f9ada221a1d6166a7348d569e (patch) | |
tree | df036bff0d493f02a96ee7e1929ef462eb4f0ff8 | |
parent | 59e71ee80c65426b2f569cc4c60936053cc9caa5 (diff) | |
download | rockbox-8906b3e659ccfa7f9ada221a1d6166a7348d569e.tar.gz rockbox-8906b3e659ccfa7f9ada221a1d6166a7348d569e.zip |
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.c | 2 | ||||
-rw-r--r-- | firmware/target/coldfire/system-coldfire.c | 2 | ||||
-rw-r--r-- | firmware/thread.c | 4 |
3 files changed, 4 insertions, 4 deletions
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) | |||
211 | * to use a stack from an unloaded module until another thread runs on it. | 211 | * to use a stack from an unloaded module until another thread runs on it. |
212 | *--------------------------------------------------------------------------- | 212 | *--------------------------------------------------------------------------- |
213 | */ | 213 | */ |
214 | static inline void __attribute__((noreturn,always_inline)) | 214 | static inline void NORETURN_ATTR __attribute__((always_inline)) |
215 | thread_final_exit(struct thread_entry *current) | 215 | thread_final_exit(struct thread_entry *current) |
216 | { | 216 | { |
217 | asm volatile ( | 217 | 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 */ | |||
171 | #endif | 171 | #endif |
172 | 172 | ||
173 | static void system_display_exception_info(unsigned long format, | 173 | static void system_display_exception_info(unsigned long format, |
174 | unsigned long pc) __attribute__ ((noreturn)) USED_ATTR; | 174 | unsigned long pc) NORETURN_ATTR USED_ATTR; |
175 | static void system_display_exception_info(unsigned long format, | 175 | static void system_display_exception_info(unsigned long format, |
176 | unsigned long pc) | 176 | unsigned long pc) |
177 | { | 177 | { |
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) | |||
165 | 165 | ||
166 | #if NUM_CORES > 1 | 166 | #if NUM_CORES > 1 |
167 | static void thread_final_exit_do(struct thread_entry *current) | 167 | static void thread_final_exit_do(struct thread_entry *current) |
168 | __attribute__((noinline, noreturn)) USED_ATTR; | 168 | __attribute__((noinline)) NORETURN_ATTR USED_ATTR; |
169 | #else | 169 | #else |
170 | static inline void thread_final_exit(struct thread_entry *current) | 170 | static inline void thread_final_exit(struct thread_entry *current) |
171 | __attribute__((always_inline, noreturn)); | 171 | __attribute__((always_inline)) NORETURN_ATTR; |
172 | #endif | 172 | #endif |
173 | 173 | ||
174 | void switch_thread(void) | 174 | void switch_thread(void) |