arm: Move setjmp to common place

Since some Cortex A core supports thumb mode also,
thus they can share same implementation.

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>

arch/arm/include/setjmp.h

@@ -32,7 +32,7 @@
  * Public Types
  ****************************************************************************/
 
-#if defined(CONFIG_ARCH_ARMV7M) || defined(CONFIG_ARCH_ARMV8M)
+#if defined(CONFIG_ARM_THUMB)
 struct setjmp_buf_s
 {
   /* Note: core registers r0-r3 are caller-saved */
@@ -78,7 +78,7 @@ typedef struct setjmp_buf_s jmp_buf[1];
 
 #else
 #  error "setjmp() not compiled!"
-#endif /* CONFIG_ARCH_ARMV7M */
+#endif /* CONFIG_ARM_THUMB */
 
 /****************************************************************************
  * Public Function Prototypes

libs/libc/machine/arm/Make.defs

@@ -51,5 +51,16 @@ ifeq ($(CONFIG_CXX_EXCEPTION),y)
 CSRCS += gnu_unwind_find_exidx.c
 endif
 
+ifeq ($(CONFIG_ARCH_SETJMP_H),y)
+ifeq ($(CONFIG_ARM_THUMB),y)
+ASRCS += arch_setjmp_thumb.S
+endif
+endif
+
+ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
+DEPPATH += --dep-path machine/arm/gnu
+VPATH += :machine/arm/gnu
+endif
+
 DEPPATH += --dep-path machine/arm
 VPATH += :machine/arm

libs/libc/machine/arm/armv7-m/Make.defs

@@ -36,10 +36,6 @@ CSRCS += arch_sqrtf.c
 endif
 endif
 
-ifeq ($(CONFIG_ARCH_SETJMP_H),y)
-ASRCS += arch_setjmp.S
-endif
-
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
 DEPPATH += --dep-path machine/arm/armv7-m/gnu
 VPATH += :machine/arm/armv7-m/gnu

libs/libc/machine/arm/armv8-m/Make.defs

@@ -74,10 +74,6 @@ endif
 
 endif # CONFIG_ARMV8M_LIBM
 
-ifeq ($(CONFIG_ARCH_SETJMP_H),y)
-ASRCS += arch_setjmp.S
-endif
-
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
 DEPPATH += --dep-path machine/arm/armv8-m/gnu
 VPATH += :machine/arm/armv8-m/gnu

libs/libc/machine/arm/armv8-m/gnu/arch_setjmp.S

@@ -1,142 +0,0 @@
-/****************************************************************************
- * libs/libc/machine/arm/armv8-m/gnu/arm_setjmp.S
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Symbols
- ****************************************************************************/
-
-	.globl	setjmp
-	.globl	longjmp
-
-	.syntax	unified
-	.thumb
-	.file	"setjmp.S"
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: setjmp
- *
- * Description:
- *   Given the pointer to a register save area (in R0), save the state of the
- *   all callee-saved registers
- *
- * C Function Prototype:
- *   int setjmp(jmp_buf env);
- *
- * Input Parameters:
- *   env - A pointer to the register save area in which to save the floating point
- *     registers and core registers.  Since setjmp() can not be inlined, we
- *     only need to save the ABI-specified callee-saved registers.
- *
- * Returned Value:
- *   0      setjmp called directly
- *   non-0  we justed returned from a longjmp()
- *
- ****************************************************************************/
-
-	.thumb_func
-	.type	setjmp, function
-setjmp:
-
-	/* Store callee-saved Core registers */
-
-	mov		ip, sp				/* Move sp to ip so we can save it */
-	stmia		r0!, {r4-r11, ip, lr}
-
-#ifdef CONFIG_ARCH_FPU
-	vstmia		r0!, {s16-s31}			/* Save the callee-saved FP registers */
-
-	/* Store the floating point control and status register.  At the end of the
-	 * vstmia, r0 will point to the FPSCR storage location.
-	 */
-
-	vmrs		r1, fpscr			/* Fetch the FPSCR */
-	str		r1, [r0], #4			/* Save the floating point control and status register */
-							/* DSA: don't need to inc r0 */
-#endif /* CONFIG_ARCH_FPU */
-
-	/* we're done, we're out of here */
-
-	mov		r0, #0
-	bx		lr
-
-	.size	setjmp, .-setjmp
-
-/****************************************************************************
- * Name: longjmp
- *
- * Description:
- *   The longjmp() function used the information saved in env to transfer control
- *   control back to the point where setjmp() was called and to restore ("rewind")
- *   the stack to its state at the time of the setjmp() call.  When control is
- *   passed back to where setjmp() had been called, setjmp() will return with
- *   'val', the second parameter passed to longjmp().
- *
- * C Function Prototype:
- *   void longjmp(jmp_buf env, int val);
- *
- * Input Parameters:
- *   jmp_buf env
- *   int     val
- *
- * Returned Value:
- *   This function does not return anything explicitly.
- *
- ****************************************************************************/
-
-	.thumb_func
-	.type	longjmp, function
-longjmp:
-
-	/* Load callee-saved Core registers */
-
-	ldmia		r0!, {r4-r11, ip, lr}
-	mov		sp, ip				/* Restore sp */
-
-#ifdef CONFIG_ARCH_FPU
-	/* Load callee-saved floating point registers.  */
-
-	vldmia		r0!, {s16-s31}			/* Restore FP context */
-
-	/* Load the floating point control and status register. */
-
-	ldr		r2, [r0], #4			/* Fetch the floating point control and status register */
-							/* DSA: don't need to inc r0 */
-	vmsr		fpscr, r2			/* Restore the FPSCR */
-#endif /* CONFIG_ARCH_FPU */
-
-	mov		r0, r1				/* return val */
-	bx		lr
-
-	.size	longjmp, .-longjmp
-	.end

libs/libc/machine/arm/gnu/arch_setjmp_thumb.S

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/machine/arm/armv7-m/gnu/arm_setjmp.S
+ * libs/libc/machine/arm/gnu/arm_setjmp_thumb.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with