diff --git a/arch/arm/src/common/gnu/arm_signal_handler.S b/arch/arm/src/common/gnu/arm_signal_handler.S
index cbbd8c82cb6..0f029cc7306 100644
--- a/arch/arm/src/common/gnu/arm_signal_handler.S
+++ b/arch/arm/src/common/gnu/arm_signal_handler.S
@@ -68,10 +68,12 @@
  ****************************************************************************/
 
 	.text
-#ifdef __ghs__
+#ifdef CONFIG_ARM_THUMB
+#  ifdef __ghs__
 	.thumb
-#else
+#  else
 	.thumb_func
+#  endif
 #endif
 	.globl	up_signal_handler
 #ifdef __ghs__