From e6300bee2dd29ca392b573d55bb93b614028c30e Mon Sep 17 00:00:00 2001 From: Eugeniy Paltsev Date: Fri, 20 Nov 2020 22:12:14 +0300 Subject: [PATCH] ARC: handle the difference of GNU & MWDT assembly for CONFIG_SMP=y Handle the difference of GNU & MWDT assembly for ARC-specific code guarded by CONFIG_SMP define. That fixies SMP platforms build with MWDT toolchain. Signed-off-by: Eugeniy Paltsev --- arch/arc/include/swap_macros.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arc/include/swap_macros.h b/arch/arc/include/swap_macros.h index 56367311dfe..dbffcce3a36 100644 --- a/arch/arc/include/swap_macros.h +++ b/arch/arc/include/swap_macros.h @@ -304,7 +304,7 @@ .macro _check_and_inc_int_nest_counter, reg1, reg2 #ifdef CONFIG_SMP _get_cpu_id MACRO_ARG(reg1) - ld.as MACRO_ARG(reg1), [@_curr_cpu, MACRO_ARG(reg1)] + ld.as MACRO_ARG(reg1), [_curr_cpu, MACRO_ARG(reg1)] ld MACRO_ARG(reg2), [MACRO_ARG(reg1), ___cpu_t_nested_OFFSET] #else mov MACRO_ARG(reg1), _kernel @@ -326,7 +326,7 @@ .macro _dec_int_nest_counter, reg1, reg2 #ifdef CONFIG_SMP _get_cpu_id MACRO_ARG(reg1) - ld.as MACRO_ARG(reg1), [@_curr_cpu, MACRO_ARG(reg1)] + ld.as MACRO_ARG(reg1), [_curr_cpu, MACRO_ARG(reg1)] ld MACRO_ARG(reg2), [MACRO_ARG(reg1), ___cpu_t_nested_OFFSET] #else mov MACRO_ARG(reg1), _kernel @@ -371,7 +371,7 @@ .macro _get_curr_cpu_irq_stack, irq_sp #ifdef CONFIG_SMP _get_cpu_id MACRO_ARG(irq_sp) - ld.as MACRO_ARG(irq_sp), [@_curr_cpu, MACRO_ARG(irq_sp)] + ld.as MACRO_ARG(irq_sp), [_curr_cpu, MACRO_ARG(irq_sp)] ld MACRO_ARG(irq_sp), [MACRO_ARG(irq_sp), ___cpu_t_irq_stack_OFFSET] #else mov MACRO_ARG(irq_sp), _kernel