buildroot
Public
Source
committed 7f00b62917bxxxxxxxxxx * r0 = previous task_struct, r1 = previous thread_info, r2 = next thread_infoFrom ad3714e925f5c6b4ae0e0d31c4bab7f8c5e659db Mon Sep 17 00:00:00 2001From: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>Date: Fri, 10 Aug 2012 21:55:41 +0200Subject: [PATCH] hal/arm: fix compilation for thumb--- include/asm-arm/atomic.h | 3 ++ ksrc/arch/arm/switch.S | 84 +++++++++++++++++++++++++++------------------ 2 files changed, 53 insertions(+), 34 deletions(-)diff --git a/include/asm-arm/atomic.h b/include/asm-arm/atomic.hindex 5d55ae8..ae96847 100644--- a/include/asm-arm/atomic.h+++ b/include/asm-arm/atomic.h@@ -183,6 +183,9 @@ xnarch_atomic_cmpxchg(xnarch_atomic_t *ptr, "ldrex %1, [%3]\n" "mov %0, #0\n" "teq %1, %4\n"+#ifdef __thumb__+ "it eq\n"+#endif "strexeq %0, %5, [%3]\n" : "=&r" (res), "=&r" (curval), "+Qo" (ptr->counter) : "r" (&ptr->counter), "Ir" (oldval), "r" (newval)diff --git a/ksrc/arch/arm/switch.S b/ksrc/arch/arm/switch.Sindex 83f4746..95c355f 100644--- a/ksrc/arch/arm/switch.S+++ b/ksrc/arch/arm/switch.S@@ -37,6 +37,11 @@ .endm #endif+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)+#define ARM(x...) x+#define THUMB(x...)+#endif+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 37) #ifdef CONFIG_MMU #define USE_DOMAINS@@ -83,18 +88,19 @@ * r0 = pointer to union vfp_state, r1 = fpexc */ ENTRY(rthal_vfp_save)- VFPFSTMIA r0, r2 @ save the working registers- VFPFMRX r2, FPSCR @ current status- tst r1, #FPEXC_EX @ is there additional state to save?- beq 1f- VFPFMRX r3, FPINST @ FPINST (only if FPEXC.EX is set)- tst r1, #FPEXC_FP2V @ is there an FPINST2 to read?- beq 1f- VFPFMRX r12, FPINST2 @ FPINST2 if needed (and present)+ VFPFSTMIA r0, r2 @ save the working registers+ VFPFMRX r2, FPSCR @ current status+ tst r1, #FPEXC_EX @ is there additional state to save?+ beq 1f+ VFPFMRX r3, FPINST @ FPINST (only if FPEXC.EX is set)+ tst r1, #FPEXC_FP2V @ is there an FPINST2 to read?+ beq 1f+ VFPFMRX r12, FPINST2 @ FPINST2 if needed (and present) 1:- stmia r0, {r1, r2, r3, r12} @ save FPEXC, FPSCR, FPINST, FPINST2- mov pc, lr