From fbc68912b9812e63e3670af7dfd511361ec696e5 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 10 Jan 2021 00:05:43 -0800 Subject: [PATCH] arch/sim: Simplify SYMBOL macro definition Change-Id: I1772b65b9bbe29917885e432056f84921b562eb0 Signed-off-by: Xiang Xiao --- arch/sim/src/sim/up_setjmp32.S | 4 +--- arch/sim/src/sim/up_setjmp64.S | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/sim/src/sim/up_setjmp32.S b/arch/sim/src/sim/up_setjmp32.S index c135849c12..6d858350da 100644 --- a/arch/sim/src/sim/up_setjmp32.S +++ b/arch/sim/src/sim/up_setjmp32.S @@ -45,13 +45,11 @@ #ifdef __CYGWIN__ # define SYMBOL(s) _##s -#else -#ifdef __ELF__ +#elif defined(__ELF__) # define SYMBOL(s) s #else # define SYMBOL(s) _##s #endif -#endif /************************************************************************** * Public Functions diff --git a/arch/sim/src/sim/up_setjmp64.S b/arch/sim/src/sim/up_setjmp64.S index fc5091917c..5ce5f1dc4d 100644 --- a/arch/sim/src/sim/up_setjmp64.S +++ b/arch/sim/src/sim/up_setjmp64.S @@ -78,15 +78,12 @@ #endif #ifdef __CYGWIN__ -//# define SYMBOL(s) _##s # define SYMBOL(s) s -#else -#ifdef __ELF__ +#elif defined(__ELF__) # define SYMBOL(s) s #else # define SYMBOL(s) _##s #endif -#endif /************************************************************************** * Public Functions