diff --git a/arch/arm/src/common/gnu/arm_signal_handler.S b/arch/arm/src/common/gnu/arm_signal_handler.S
index c2666f9cb93..88b9f1b7879 100644
--- a/arch/arm/src/common/gnu/arm_signal_handler.S
+++ b/arch/arm/src/common/gnu/arm_signal_handler.S
@@ -32,7 +32,6 @@
  * File info
  ****************************************************************************/
 
-	.syntax		unified
 	.file		"arm_signal_handler.S"
 
 /****************************************************************************
@@ -67,9 +66,17 @@
  ****************************************************************************/
 
 	.text
+#ifdef __ghs__
+	.thumb
+#else
 	.thumb_func
+#endif
 	.globl	up_signal_handler
+#ifdef __ghs__
+	.type	up_signal_handler, $function
+#else
 	.type	up_signal_handler, function
+#endif
 up_signal_handler:
 
 	/* Save some register */