From 268b725c405fc08d79b8e020f1fe89dfc963bf35 Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Mon, 11 Jun 2012 21:40:05 +0200 Subject: Rearrange #ifdefs a bit, so SIGALTSTACK overrides CPU-specific threading. Change-Id: Ie3661f53bd7576d965fcc52facb532199b87c017 --- firmware/asm/thread.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'firmware/asm/thread.c') 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 @@ -#if defined(CPU_ARM) + /* First some generic implementations */ +#if defined(HAVE_WIN32_FIBER_THREADS) + #include "thread-win32.c" +#elif defined(HAVE_SIGALTSTACK_THREADS) + #include "thread-unix.c" + + /* Now the CPU-specific implementations */ +#elif defined(CPU_ARM) #include "arm/thread.c" #elif defined(CPU_COLDFIRE) #include "m68k/thread.c" @@ -7,15 +14,6 @@ #elif defined(CPU_MIPS) #include "mips/thread.c" #else - -/* generic thread.c */ - -#if defined(HAVE_WIN32_FIBER_THREADS) - #include "thread-win32.c" -#elif defined(HAVE_SIGALTSTACK_THREADS) - #include "thread-unix.c" -#else + /* Nothing? OK, give up */ #error Missing thread impl #endif - -#endif -- cgit v1.2.3