diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2012-06-11 21:40:05 +0200 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2012-06-11 22:27:41 +0200 |
| commit | 268b725c405fc08d79b8e020f1fe89dfc963bf35 (patch) | |
| tree | 3640a8b05197983427bd7a8f7a294258a678a91a /firmware/asm/thread.c | |
| parent | cbd44f4bc4d9c49364f317df6111f5ad9c4213bf (diff) | |
| download | rockbox-268b725c405fc08d79b8e020f1fe89dfc963bf35.tar.gz rockbox-268b725c405fc08d79b8e020f1fe89dfc963bf35.zip | |
Rearrange #ifdefs a bit, so SIGALTSTACK overrides CPU-specific threading.
Change-Id: Ie3661f53bd7576d965fcc52facb532199b87c017
Diffstat (limited to 'firmware/asm/thread.c')
| -rw-r--r-- | firmware/asm/thread.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/firmware/asm/thread.c b/firmware/asm/thread.c index 49e71d73af..d6b881bdc5 100644 --- a/firmware/asm/thread.c +++ b/firmware/asm/thread.c | |||
| @@ -1,4 +1,11 @@ | |||
| 1 | #if defined(CPU_ARM) | 1 | /* First some generic implementations */ |
| 2 | #if defined(HAVE_WIN32_FIBER_THREADS) | ||
| 3 | #include "thread-win32.c" | ||
| 4 | #elif defined(HAVE_SIGALTSTACK_THREADS) | ||
| 5 | #include "thread-unix.c" | ||
| 6 | |||
| 7 | /* Now the CPU-specific implementations */ | ||
| 8 | #elif defined(CPU_ARM) | ||
| 2 | #include "arm/thread.c" | 9 | #include "arm/thread.c" |
| 3 | #elif defined(CPU_COLDFIRE) | 10 | #elif defined(CPU_COLDFIRE) |
| 4 | #include "m68k/thread.c" | 11 | #include "m68k/thread.c" |
| @@ -7,15 +14,6 @@ | |||
| 7 | #elif defined(CPU_MIPS) | 14 | #elif defined(CPU_MIPS) |
| 8 | #include "mips/thread.c" | 15 | #include "mips/thread.c" |
| 9 | #else | 16 | #else |
| 10 | 17 | /* Nothing? OK, give up */ | |
| 11 | /* generic thread.c */ | ||
| 12 | |||
| 13 | #if defined(HAVE_WIN32_FIBER_THREADS) | ||
| 14 | #include "thread-win32.c" | ||
| 15 | #elif defined(HAVE_SIGALTSTACK_THREADS) | ||
| 16 | #include "thread-unix.c" | ||
| 17 | #else | ||
| 18 | #error Missing thread impl | 18 | #error Missing thread impl |
| 19 | #endif | 19 | #endif |
| 20 | |||
| 21 | #endif | ||