diff --git a/arch/arm/src/arm/up_fullcontextrestore.S b/arch/arm/src/arm/arm_fullcontextrestore.S
similarity index 95%
rename from arch/arm/src/arm/up_fullcontextrestore.S
rename to arch/arm/src/arm/arm_fullcontextrestore.S
index e393c83a9e4..ab4591429eb 100644
--- a/arch/arm/src/arm/up_fullcontextrestore.S
+++ b/arch/arm/src/arm/arm_fullcontextrestore.S
@@ -1,5 +1,5 @@
 /**************************************************************************
- * arch/arm/src/arm/up_fullcontextrestore.S
+ * arch/arm/src/arm/arm_fullcontextrestore.S
  *
  *   Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -69,12 +69,12 @@
  **************************************************************************/
 
 /**************************************************************************
- * Name: up_fullcontextrestore
+ * Name: arm_fullcontextrestore
  **************************************************************************/
 
-	.globl	up_fullcontextrestore
-	.type	up_fullcontextrestore, function
-up_fullcontextrestore:
+	.globl	arm_fullcontextrestore
+	.type	arm_fullcontextrestore, function
+arm_fullcontextrestore:
 
 	/* On entry, a1 (r0) holds address of the register save area */
 
@@ -108,4 +108,4 @@ up_fullcontextrestore:
 	 */
 
 	ldmia	sp!, {r0-r1, r15}
-	.size up_fullcontextrestore, . - up_fullcontextrestore
+	.size arm_fullcontextrestore, . - arm_fullcontextrestore
diff --git a/arch/arm/src/arm/up_blocktask.c b/arch/arm/src/arm/up_blocktask.c
index 3afbe5a69ee..fddb2d3f481 100644
--- a/arch/arm/src/arm/up_blocktask.c
+++ b/arch/arm/src/arm/up_blocktask.c
@@ -167,7 +167,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
 
           /* Then switch contexts */
 
-          up_fullcontextrestore(rtcb->xcp.regs);
+          arm_fullcontextrestore(rtcb->xcp.regs);
         }
     }
 }
diff --git a/arch/arm/src/arm/up_releasepending.c b/arch/arm/src/arm/up_releasepending.c
index 9b402a7d704..b0735b6aa07 100644
--- a/arch/arm/src/arm/up_releasepending.c
+++ b/arch/arm/src/arm/up_releasepending.c
@@ -138,7 +138,7 @@ void up_release_pending(void)
 
           /* Then switch contexts */
 
-          up_fullcontextrestore(rtcb->xcp.regs);
+          arm_fullcontextrestore(rtcb->xcp.regs);
         }
     }
 }
diff --git a/arch/arm/src/arm/up_reprioritizertr.c b/arch/arm/src/arm/up_reprioritizertr.c
index 1c577f0c437..9582ec8667e 100644
--- a/arch/arm/src/arm/up_reprioritizertr.c
+++ b/arch/arm/src/arm/up_reprioritizertr.c
@@ -191,7 +191,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 
               /* Then switch contexts */
 
-              up_fullcontextrestore(rtcb->xcp.regs);
+              arm_fullcontextrestore(rtcb->xcp.regs);
             }
         }
     }
diff --git a/arch/arm/src/arm/up_sigdeliver.c b/arch/arm/src/arm/up_sigdeliver.c
index 8c3ecbb0ff0..15b83a8509c 100644
--- a/arch/arm/src/arm/up_sigdeliver.c
+++ b/arch/arm/src/arm/up_sigdeliver.c
@@ -127,5 +127,5 @@ void up_sigdeliver(void)
   /* Then restore the correct state for this thread of execution. */
 
   board_autoled_off(LED_SIGNAL);
-  up_fullcontextrestore(regs);
+  arm_fullcontextrestore(regs);
 }
diff --git a/arch/arm/src/arm/up_unblocktask.c b/arch/arm/src/arm/up_unblocktask.c
index 66b1b588d00..b517ced5c77 100644
--- a/arch/arm/src/arm/up_unblocktask.c
+++ b/arch/arm/src/arm/up_unblocktask.c
@@ -153,7 +153,7 @@ void up_unblock_task(struct tcb_s *tcb)
 
           /* Then switch contexts */
 
-          up_fullcontextrestore(rtcb->xcp.regs);
+          arm_fullcontextrestore(rtcb->xcp.regs);
         }
     }
 }
diff --git a/arch/arm/src/armv6-m/up_fullcontextrestore.S b/arch/arm/src/armv6-m/arm_fullcontextrestore.S
similarity index 91%
rename from arch/arm/src/armv6-m/up_fullcontextrestore.S
rename to arch/arm/src/armv6-m/arm_fullcontextrestore.S
index d59990acc8e..3d9940df1b3 100644
--- a/arch/arm/src/armv6-m/up_fullcontextrestore.S
+++ b/arch/arm/src/armv6-m/arm_fullcontextrestore.S
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/armv6-m/up_fullcontextrestore.S
+ * arch/arm/src/armv6-m/arm_fullcontextrestore.S
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +52,7 @@
  ************************************************************************************/
 
 	.cpu	cortex-m0
-	.file	"up_fullcontextrestore.S"
+	.file	"arm_fullcontextrestore.S"
 
 /************************************************************************************
  * Macros
@@ -63,12 +63,12 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_fullcontextrestore
+ * Name: arm_fullcontextrestore
  *
  * Description:
  *   Restore the current thread context.  Full prototype is:
  *
- *   void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+ *   void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
  *
  * Returned Value:
  *   None
@@ -78,9 +78,9 @@
 	.align	2
 	.code	16
 	.thumb_func
-	.globl	up_fullcontextrestore
-	.type	up_fullcontextrestore, function
-up_fullcontextrestore:
+	.globl	arm_fullcontextrestore
+	.type	arm_fullcontextrestore, function
+arm_fullcontextrestore:
 
 	/* Perform the System call with R0=1 and R1=regs */
 
@@ -91,5 +91,5 @@ up_fullcontextrestore:
 	/* This call should not return */
 
 	bx		lr							/* Unnecessary ... will not return */
-	.size	up_fullcontextrestore, .-up_fullcontextrestore
+	.size	arm_fullcontextrestore, .-arm_fullcontextrestore
 	.end
diff --git a/arch/arm/src/armv6-m/svcall.h b/arch/arm/src/armv6-m/svcall.h
index b3d11d8747a..619b314babc 100644
--- a/arch/arm/src/armv6-m/svcall.h
+++ b/arch/arm/src/armv6-m/svcall.h
@@ -83,7 +83,7 @@
 
 /* SYS call 1:
  *
- * void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+ * void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
  */
 
 #define SYS_restore_context       (1)
diff --git a/arch/arm/src/armv6-m/up_sigdeliver.c b/arch/arm/src/armv6-m/up_sigdeliver.c
index 0194f249e70..b0eff696d1d 100644
--- a/arch/arm/src/armv6-m/up_sigdeliver.c
+++ b/arch/arm/src/armv6-m/up_sigdeliver.c
@@ -69,7 +69,7 @@
 void up_sigdeliver(void)
 {
   /* NOTE the "magic" guard space added to regs.  This is a little kludge
-   * because up_fullcontextrestore (called below) will do a stack-to-stack
+   * because arm_fullcontextrestore (called below) will do a stack-to-stack
    * copy an may overwrite the regs[] array contents.  Sorry.
    */
 
@@ -137,5 +137,5 @@ void up_sigdeliver(void)
    */
 
   board_autoled_off(LED_SIGNAL);
-  up_fullcontextrestore(regs);
+  arm_fullcontextrestore(regs);
 }
diff --git a/arch/arm/src/armv6-m/up_svcall.c b/arch/arm/src/armv6-m/up_svcall.c
index da17b221d4b..4acb494fa4b 100644
--- a/arch/arm/src/armv6-m/up_svcall.c
+++ b/arch/arm/src/armv6-m/up_svcall.c
@@ -191,7 +191,7 @@ int up_svcall(int irq, FAR void *context, FAR void *arg)
 
       /* R0=SYS_restore_context:  This a restore context command:
        *
-       *   void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+       *   void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
        *
        * At this point, the following values are saved in context:
        *
diff --git a/arch/arm/src/armv7-a/arm_blocktask.c b/arch/arm/src/armv7-a/arm_blocktask.c
index 9069de5ce3f..5c63861807e 100644
--- a/arch/arm/src/armv7-a/arm_blocktask.c
+++ b/arch/arm/src/armv7-a/arm_blocktask.c
@@ -167,7 +167,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
 
           /* Then switch contexts */
 
-          up_fullcontextrestore(rtcb->xcp.regs);
+          arm_fullcontextrestore(rtcb->xcp.regs);
         }
     }
 }
diff --git a/arch/arm/src/armv7-a/arm_fullcontextrestore.S b/arch/arm/src/armv7-a/arm_fullcontextrestore.S
index c8ed1108e9f..b87d9bfc3b1 100644
--- a/arch/arm/src/armv7-a/arm_fullcontextrestore.S
+++ b/arch/arm/src/armv7-a/arm_fullcontextrestore.S
@@ -49,29 +49,29 @@
  * Public Symbols
  ****************************************************************************/
 
-	.globl	up_fullcontextrestore
+	.globl	arm_fullcontextrestore
 
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_fullcontextrestore
+ * Name: arm_fullcontextrestore
  *
  * Description:
  *   Restore the specified task context. Full prototype is:
  *
- *     void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+ *     void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
  *
  * Returned Value:
  *   None
  *
  ****************************************************************************/
 
-	.globl	up_fullcontextrestore
-	.type	up_fullcontextrestore, function
+	.globl	arm_fullcontextrestore
+	.type	arm_fullcontextrestore, function
 
-up_fullcontextrestore:
+arm_fullcontextrestore:
 
 	/* On entry, a1 (r0) holds address of the register save area.  All other
 	 * registers are available for use.
@@ -157,4 +157,4 @@ up_fullcontextrestore:
 
 #endif
 
-	.size up_fullcontextrestore, . - up_fullcontextrestore
+	.size arm_fullcontextrestore, . - arm_fullcontextrestore
diff --git a/arch/arm/src/armv7-a/arm_releasepending.c b/arch/arm/src/armv7-a/arm_releasepending.c
index a30460be78f..82940d87dd7 100644
--- a/arch/arm/src/armv7-a/arm_releasepending.c
+++ b/arch/arm/src/armv7-a/arm_releasepending.c
@@ -137,7 +137,7 @@ void up_release_pending(void)
 
           /* Then switch contexts */
 
-          up_fullcontextrestore(rtcb->xcp.regs);
+          arm_fullcontextrestore(rtcb->xcp.regs);
         }
     }
 }
diff --git a/arch/arm/src/armv7-a/arm_reprioritizertr.c b/arch/arm/src/armv7-a/arm_reprioritizertr.c
index 399a7f50c9a..b92c917e93d 100644
--- a/arch/arm/src/armv7-a/arm_reprioritizertr.c
+++ b/arch/arm/src/armv7-a/arm_reprioritizertr.c
@@ -191,7 +191,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 
               /* Then switch contexts */
 
-              up_fullcontextrestore(rtcb->xcp.regs);
+              arm_fullcontextrestore(rtcb->xcp.regs);
             }
         }
     }
diff --git a/arch/arm/src/armv7-a/arm_sigdeliver.c b/arch/arm/src/armv7-a/arm_sigdeliver.c
index dff2f7f948a..86bbc6fbad4 100644
--- a/arch/arm/src/armv7-a/arm_sigdeliver.c
+++ b/arch/arm/src/armv7-a/arm_sigdeliver.c
@@ -135,7 +135,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    *
    * I would prefer that all interrupts are disabled when
-   * up_fullcontextrestore() is called, but that may not be necessary.
+   * arm_fullcontextrestore() is called, but that may not be necessary.
    */
 
   sinfo("Resuming\n");
@@ -194,5 +194,5 @@ void up_sigdeliver(void)
   /* Then restore the correct state for this thread of execution. */
 
   board_autoled_off(LED_SIGNAL);
-  up_fullcontextrestore(regs);
+  arm_fullcontextrestore(regs);
 }
diff --git a/arch/arm/src/armv7-a/arm_syscall.c b/arch/arm/src/armv7-a/arm_syscall.c
index 10ca503933d..6e039507164 100644
--- a/arch/arm/src/armv7-a/arm_syscall.c
+++ b/arch/arm/src/armv7-a/arm_syscall.c
@@ -232,7 +232,7 @@ uint32_t *arm_syscall(uint32_t *regs)
 
       /* R0=SYS_context_restore:  Restore task context
        *
-       * void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+       * void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
        *
        * At this point, the following values are saved in context:
        *
diff --git a/arch/arm/src/armv7-a/arm_unblocktask.c b/arch/arm/src/armv7-a/arm_unblocktask.c
index c2133aa38ab..7eb97a24857 100644
--- a/arch/arm/src/armv7-a/arm_unblocktask.c
+++ b/arch/arm/src/armv7-a/arm_unblocktask.c
@@ -174,7 +174,7 @@ void up_unblock_task(struct tcb_s *tcb)
 
           /* Then switch contexts */
 
-          up_fullcontextrestore(rtcb->xcp.regs);
+          arm_fullcontextrestore(rtcb->xcp.regs);
         }
     }
 }
diff --git a/arch/arm/src/armv7-a/svcall.h b/arch/arm/src/armv7-a/svcall.h
index 6b2933f46b0..455de54a3f2 100644
--- a/arch/arm/src/armv7-a/svcall.h
+++ b/arch/arm/src/armv7-a/svcall.h
@@ -84,7 +84,7 @@
 #ifdef CONFIG_BUILD_KERNEL
 /* SYS call 1:
  *
- * void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+ * void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
  */
 
 #define SYS_context_restore       (1)
diff --git a/arch/arm/src/armv7-m/gnu/up_fullcontextrestore.S b/arch/arm/src/armv7-m/gnu/arm_fullcontextrestore.S
similarity index 88%
rename from arch/arm/src/armv7-m/gnu/up_fullcontextrestore.S
rename to arch/arm/src/armv7-m/gnu/arm_fullcontextrestore.S
index b77e9b9c5f6..dd3c82468e2 100644
--- a/arch/arm/src/armv7-m/gnu/up_fullcontextrestore.S
+++ b/arch/arm/src/armv7-m/gnu/arm_fullcontextrestore.S
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/armv7-m/gnu/up_fullcontextrestore.S
+ * arch/arm/src/armv7-m/gnu/arm_fullcontextrestore.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -38,7 +38,7 @@
 
 	.syntax	unified
 	.thumb
-	.file	"up_fullcontextrestore.S"
+	.file	"arm_fullcontextrestore.S"
 
 /************************************************************************************
  * Macros
@@ -49,12 +49,12 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_fullcontextrestore
+ * Name: arm_fullcontextrestore
  *
  * Description:
  *   Restore the current thread context.  Full prototype is:
  *
- *   void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+ *   void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
  *
  * Returned Value:
  *   None
@@ -62,9 +62,9 @@
  ************************************************************************************/
 
 	.thumb_func
-	.globl	up_fullcontextrestore
-	.type	up_fullcontextrestore, function
-up_fullcontextrestore:
+	.globl	arm_fullcontextrestore
+	.type	arm_fullcontextrestore, function
+arm_fullcontextrestore:
 
 	/* Perform the System call with R0=1 and R1=regs */
 
@@ -75,5 +75,5 @@ up_fullcontextrestore:
 	/* This call should not return */
 
 	bx		lr							/* Unnecessary ... will not return */
-	.size	up_fullcontextrestore, .-up_fullcontextrestore
+	.size	arm_fullcontextrestore, .-arm_fullcontextrestore
 	.end
diff --git a/arch/arm/src/armv7-m/iar/up_fullcontextrestore.S b/arch/arm/src/armv7-m/iar/arm_fullcontextrestore.S
similarity index 91%
rename from arch/arm/src/armv7-m/iar/up_fullcontextrestore.S
rename to arch/arm/src/armv7-m/iar/arm_fullcontextrestore.S
index 856048db742..20c1533641d 100644
--- a/arch/arm/src/armv7-m/iar/up_fullcontextrestore.S
+++ b/arch/arm/src/armv7-m/iar/arm_fullcontextrestore.S
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/armv7-m/iar/up_fullcontextrestore.S
+ * arch/arm/src/armv7-m/iar/arm_fullcontextrestore.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -28,7 +28,7 @@
 #include "nvic.h"
 #include "svcall.h"
 
-	MODULE up_fullcontextrestore
+	MODULE arm_fullcontextrestore
 	SECTION .text:CODE:NOROOT(2)
 
 /************************************************************************************
@@ -39,7 +39,7 @@
  * Public Symbols
  ************************************************************************************/
 
-	PUBLIC up_fullcontextrestore
+	PUBLIC arm_fullcontextrestore
 
 /************************************************************************************
  * Macros
@@ -50,12 +50,12 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_fullcontextrestore
+ * Name: arm_fullcontextrestore
  *
  * Description:
  *   Restore the current thread context.  Full prototype is:
  *
- *   void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+ *   void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
  *
  * Returned Value:
  *   None
@@ -64,7 +64,7 @@
 
 	THUMB
 
-up_fullcontextrestore:
+arm_fullcontextrestore:
 
 	/* Perform the System call with R0=1 and R1=regs */
 
diff --git a/arch/arm/src/armv7-m/svcall.h b/arch/arm/src/armv7-m/svcall.h
index 536573b8932..80d6b611d23 100644
--- a/arch/arm/src/armv7-m/svcall.h
+++ b/arch/arm/src/armv7-m/svcall.h
@@ -69,7 +69,7 @@
 
 /* SYS call 1:
  *
- * void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+ * void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
  */
 
 #define SYS_restore_context       (1)
diff --git a/arch/arm/src/armv7-m/up_sigdeliver.c b/arch/arm/src/armv7-m/up_sigdeliver.c
index 3600a94bf3a..90316fb6532 100644
--- a/arch/arm/src/armv7-m/up_sigdeliver.c
+++ b/arch/arm/src/armv7-m/up_sigdeliver.c
@@ -123,7 +123,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    *
    * I would prefer that all interrupts are disabled when
-   * up_fullcontextrestore() is called, but that may not be necessary.
+   * arm_fullcontextrestore() is called, but that may not be necessary.
    */
 
   sinfo("Resuming\n");
@@ -192,5 +192,5 @@ void up_sigdeliver(void)
    */
 
   board_autoled_off(LED_SIGNAL);
-  up_fullcontextrestore(regs);
+  arm_fullcontextrestore(regs);
 }
diff --git a/arch/arm/src/armv7-m/up_svcall.c b/arch/arm/src/armv7-m/up_svcall.c
index 5dcc57754c0..383da7e6767 100644
--- a/arch/arm/src/armv7-m/up_svcall.c
+++ b/arch/arm/src/armv7-m/up_svcall.c
@@ -186,7 +186,7 @@ int up_svcall(int irq, FAR void *context, FAR void *arg)
 
       /* R0=SYS_restore_context:  This a restore context command:
        *
-       *   void up_fullcontextrestore(uint32_t *restoreregs)
+       *   void arm_fullcontextrestore(uint32_t *restoreregs)
        *          noreturn_function;
        *
        * At this point, the following values are saved in context:
diff --git a/arch/arm/src/armv7-r/arm_blocktask.c b/arch/arm/src/armv7-r/arm_blocktask.c
index 648f3aa4f1e..e8c28cf3f5f 100644
--- a/arch/arm/src/armv7-r/arm_blocktask.c
+++ b/arch/arm/src/armv7-r/arm_blocktask.c
@@ -156,7 +156,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
 
           /* Then switch contexts */
 
-          up_fullcontextrestore(rtcb->xcp.regs);
+          arm_fullcontextrestore(rtcb->xcp.regs);
         }
     }
 }
diff --git a/arch/arm/src/armv7-r/arm_fullcontextrestore.S b/arch/arm/src/armv7-r/arm_fullcontextrestore.S
index 59df43e3230..b346a1742df 100644
--- a/arch/arm/src/armv7-r/arm_fullcontextrestore.S
+++ b/arch/arm/src/armv7-r/arm_fullcontextrestore.S
@@ -52,7 +52,7 @@
  * Public Symbols
  ****************************************************************************/
 
-	.globl	up_fullcontextrestore
+	.globl	arm_fullcontextrestore
 
 #ifdef CONFIG_ARCH_FPU
 	.cpu	cortex-r4f
@@ -68,22 +68,22 @@
 	.text
 
 /****************************************************************************
- * Name: up_fullcontextrestore
+ * Name: arm_fullcontextrestore
  *
  * Description:
  *   Restore the specified task context. Full prototype is:
  *
- *     void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+ *     void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
  *
  * Returned Value:
  *   None
  *
  ****************************************************************************/
 
-	.globl	up_fullcontextrestore
-	.type	up_fullcontextrestore, function
+	.globl	arm_fullcontextrestore
+	.type	arm_fullcontextrestore, function
 
-up_fullcontextrestore:
+arm_fullcontextrestore:
 
 	/* On entry, a1 (r0) holds address of the register save area.  All other
 	 * registers are available for use.
@@ -163,4 +163,4 @@ up_fullcontextrestore:
 	ldmia		sp!, {r0-r1, pc}^
 #endif
 
-	.size up_fullcontextrestore, . - up_fullcontextrestore
+	.size arm_fullcontextrestore, . - arm_fullcontextrestore
diff --git a/arch/arm/src/armv7-r/arm_releasepending.c b/arch/arm/src/armv7-r/arm_releasepending.c
index a66de941356..8f7534b2923 100644
--- a/arch/arm/src/armv7-r/arm_releasepending.c
+++ b/arch/arm/src/armv7-r/arm_releasepending.c
@@ -129,7 +129,7 @@ void up_release_pending(void)
 
           /* Then switch contexts */
 
-          up_fullcontextrestore(rtcb->xcp.regs);
+          arm_fullcontextrestore(rtcb->xcp.regs);
         }
     }
 }
diff --git a/arch/arm/src/armv7-r/arm_reprioritizertr.c b/arch/arm/src/armv7-r/arm_reprioritizertr.c
index 4ea30b66d75..7a5e468a2a5 100644
--- a/arch/arm/src/armv7-r/arm_reprioritizertr.c
+++ b/arch/arm/src/armv7-r/arm_reprioritizertr.c
@@ -182,7 +182,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 
               /* Then switch contexts */
 
-              up_fullcontextrestore(rtcb->xcp.regs);
+              arm_fullcontextrestore(rtcb->xcp.regs);
             }
         }
     }
diff --git a/arch/arm/src/armv7-r/arm_sigdeliver.c b/arch/arm/src/armv7-r/arm_sigdeliver.c
index 9b979018117..a726aad03bf 100644
--- a/arch/arm/src/armv7-r/arm_sigdeliver.c
+++ b/arch/arm/src/armv7-r/arm_sigdeliver.c
@@ -126,5 +126,5 @@ void up_sigdeliver(void)
   /* Then restore the correct state for this thread of execution. */
 
   board_autoled_off(LED_SIGNAL);
-  up_fullcontextrestore(regs);
+  arm_fullcontextrestore(regs);
 }
diff --git a/arch/arm/src/armv7-r/arm_syscall.c b/arch/arm/src/armv7-r/arm_syscall.c
index 7573a79b89a..976bc474387 100644
--- a/arch/arm/src/armv7-r/arm_syscall.c
+++ b/arch/arm/src/armv7-r/arm_syscall.c
@@ -230,7 +230,7 @@ uint32_t *arm_syscall(uint32_t *regs)
 
       /* R0=SYS_context_restore:  Restore task context
        *
-       * void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+       * void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
        *
        * At this point, the following values are saved in context:
        *
diff --git a/arch/arm/src/armv7-r/arm_unblocktask.c b/arch/arm/src/armv7-r/arm_unblocktask.c
index b1946fadf55..24b8984549c 100644
--- a/arch/arm/src/armv7-r/arm_unblocktask.c
+++ b/arch/arm/src/armv7-r/arm_unblocktask.c
@@ -156,7 +156,7 @@ void up_unblock_task(struct tcb_s *tcb)
 
           /* Then switch contexts */
 
-          up_fullcontextrestore(rtcb->xcp.regs);
+          arm_fullcontextrestore(rtcb->xcp.regs);
         }
     }
 }
diff --git a/arch/arm/src/armv7-r/svcall.h b/arch/arm/src/armv7-r/svcall.h
index 3c371b2a4c6..decddb20d02 100644
--- a/arch/arm/src/armv7-r/svcall.h
+++ b/arch/arm/src/armv7-r/svcall.h
@@ -84,7 +84,7 @@
 #ifdef CONFIG_BUILD_PROTECTED
 /* SYS call 1:
  *
- * void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+ * void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
  */
 
 #define SYS_context_restore       (1)
diff --git a/arch/arm/src/c5471/Make.defs b/arch/arm/src/c5471/Make.defs
index b5322e2bebf..fdf281ee1a7 100644
--- a/arch/arm/src/c5471/Make.defs
+++ b/arch/arm/src/c5471/Make.defs
@@ -35,7 +35,7 @@
 
 HEAD_ASRC = up_nommuhead.S
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S vfork.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S vfork.S
 
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c up_copyfullstate.c
 CMN_CSRCS += up_createstack.c up_dataabort.c up_mdelay.c up_udelay.c up_doirq.c
diff --git a/arch/arm/src/common/up_exit.c b/arch/arm/src/common/up_exit.c
index 9fe3fdaa2f8..8a021fb6115 100644
--- a/arch/arm/src/common/up_exit.c
+++ b/arch/arm/src/common/up_exit.c
@@ -187,9 +187,5 @@ void _exit(int status)
 
   /* Then switch contexts */
 
-#ifdef CONFIG_ARCH_ARMV8M
   arm_fullcontextrestore(tcb->xcp.regs);
-#else
-  up_fullcontextrestore(tcb->xcp.regs);
-#endif
 }
diff --git a/arch/arm/src/common/up_internal.h b/arch/arm/src/common/up_internal.h
index 745be3422a4..1e532c8822e 100644
--- a/arch/arm/src/common/up_internal.h
+++ b/arch/arm/src/common/up_internal.h
@@ -300,7 +300,7 @@ void up_copyarmstate(uint32_t *dest, uint32_t *src);
 #endif
 void up_decodeirq(uint32_t *regs);
 int  up_saveusercontext(uint32_t *saveregs);
-void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
 void up_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
 
 /* Signal handling **********************************************************/
diff --git a/arch/arm/src/cxd56xx/Make.defs b/arch/arm/src/cxd56xx/Make.defs
index 943a905146e..afce8b05ec3 100644
--- a/arch/arm/src/cxd56xx/Make.defs
+++ b/arch/arm/src/cxd56xx/Make.defs
@@ -37,7 +37,7 @@
 
 HEAD_ASRC  =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/dm320/Make.defs b/arch/arm/src/dm320/Make.defs
index 0abcb9cccc8..aec6d977835 100644
--- a/arch/arm/src/dm320/Make.defs
+++ b/arch/arm/src/dm320/Make.defs
@@ -35,7 +35,7 @@
 
 HEAD_ASRC = up_head.S
 
-CMN_ASRCS  = up_cache.S up_fullcontextrestore.S up_saveusercontext.S
+CMN_ASRCS  = up_cache.S arm_fullcontextrestore.S up_saveusercontext.S
 CMN_ASRCS += up_vectors.S up_vectoraddrexcptn.S up_vectortab.S vfork.S
 
 CMN_CSRCS  = up_assert.c up_blocktask.c up_copyfullstate.c up_createstack.c
diff --git a/arch/arm/src/efm32/Make.defs b/arch/arm/src/efm32/Make.defs
index 7c289df6aff..924f3884f97 100644
--- a/arch/arm/src/efm32/Make.defs
+++ b/arch/arm/src/efm32/Make.defs
@@ -38,7 +38,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/imx1/Make.defs b/arch/arm/src/imx1/Make.defs
index ef9ef5cc4e3..96d987e3edb 100644
--- a/arch/arm/src/imx1/Make.defs
+++ b/arch/arm/src/imx1/Make.defs
@@ -35,7 +35,7 @@
 
 HEAD_ASRC = up_head.S
 
-CMN_ASRCS  = up_cache.S up_fullcontextrestore.S up_saveusercontext.S
+CMN_ASRCS  = up_cache.S arm_fullcontextrestore.S up_saveusercontext.S
 CMN_ASRCS += up_vectors.S up_vectoraddrexcptn.S up_vectortab.S vfork.S
 CMN_CSRCS  = up_assert.c up_blocktask.c up_copyfullstate.c up_createstack.c
 CMN_CSRCS += up_dataabort.c up_mdelay.c up_udelay.c up_exit.c
diff --git a/arch/arm/src/imxrt/Make.defs b/arch/arm/src/imxrt/Make.defs
index c045b2a5eb4..c0053e745ab 100644
--- a/arch/arm/src/imxrt/Make.defs
+++ b/arch/arm/src/imxrt/Make.defs
@@ -38,7 +38,7 @@ HEAD_ASRC  =
 
 # Common ARM and Cortex-M7 files
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/kinetis/Make.defs b/arch/arm/src/kinetis/Make.defs
index 0126ba0f67f..57b2e611cb9 100644
--- a/arch/arm/src/kinetis/Make.defs
+++ b/arch/arm/src/kinetis/Make.defs
@@ -38,7 +38,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/kl/Make.defs b/arch/arm/src/kl/Make.defs
index 47cda3b01d3..53188dbd0b2 100644
--- a/arch/arm/src/kl/Make.defs
+++ b/arch/arm/src/kl/Make.defs
@@ -35,7 +35,7 @@
 
 HEAD_ASRC =
 
-CMN_ASRCS  = up_exception.S up_saveusercontext.S up_fullcontextrestore.S
+CMN_ASRCS  = up_exception.S up_saveusercontext.S arm_fullcontextrestore.S
 CMN_ASRCS += up_switchcontext.S vfork.S
 
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c up_copyfullstate.c
diff --git a/arch/arm/src/lc823450/Make.defs b/arch/arm/src/lc823450/Make.defs
index c195a2e0ced..aadadac2458 100644
--- a/arch/arm/src/lc823450/Make.defs
+++ b/arch/arm/src/lc823450/Make.defs
@@ -40,7 +40,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/lpc17xx_40xx/Make.defs b/arch/arm/src/lpc17xx_40xx/Make.defs
index e611b3c5dc9..4bb9c2256b5 100644
--- a/arch/arm/src/lpc17xx_40xx/Make.defs
+++ b/arch/arm/src/lpc17xx_40xx/Make.defs
@@ -42,7 +42,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/lpc214x/Make.defs b/arch/arm/src/lpc214x/Make.defs
index e1edb2cd015..7df4d2fe03b 100644
--- a/arch/arm/src/lpc214x/Make.defs
+++ b/arch/arm/src/lpc214x/Make.defs
@@ -36,7 +36,7 @@
 
 HEAD_ASRC = lpc214x_head.S
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_vectors.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
 CMN_ASRCS += vfork.S
 
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c up_copyfullstate.c
diff --git a/arch/arm/src/lpc2378/Make.defs b/arch/arm/src/lpc2378/Make.defs
index 15be9977b98..e3e1c1c6344 100644
--- a/arch/arm/src/lpc2378/Make.defs
+++ b/arch/arm/src/lpc2378/Make.defs
@@ -40,7 +40,7 @@
 
 HEAD_ASRC = lpc23xx_head.S
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_vectors.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
 CMN_ASRCS += vfork.S
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c up_copyfullstate.c
 CMN_CSRCS += up_createstack.c up_dataabort.c up_mdelay.c up_udelay.c
diff --git a/arch/arm/src/lpc31xx/Make.defs b/arch/arm/src/lpc31xx/Make.defs
index cfea841b66a..9318bdb5244 100644
--- a/arch/arm/src/lpc31xx/Make.defs
+++ b/arch/arm/src/lpc31xx/Make.defs
@@ -35,7 +35,7 @@
 
 HEAD_ASRC = up_head.S
 
-CMN_ASRCS  = up_cache.S up_fullcontextrestore.S up_saveusercontext.S
+CMN_ASRCS  = up_cache.S arm_fullcontextrestore.S up_saveusercontext.S
 CMN_ASRCS += up_vectors.S up_vectoraddrexcptn.S up_vectortab.S vfork.S
 
 CMN_CSRCS  = up_assert.c up_blocktask.c up_copyfullstate.c up_createstack.c
diff --git a/arch/arm/src/lpc43xx/Make.defs b/arch/arm/src/lpc43xx/Make.defs
index dc3b3833eba..4e368025f84 100644
--- a/arch/arm/src/lpc43xx/Make.defs
+++ b/arch/arm/src/lpc43xx/Make.defs
@@ -35,7 +35,7 @@
 
 HEAD_ASRC  =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/lpc54xx/Make.defs b/arch/arm/src/lpc54xx/Make.defs
index e95ad9b1a68..8d41d880d58 100644
--- a/arch/arm/src/lpc54xx/Make.defs
+++ b/arch/arm/src/lpc54xx/Make.defs
@@ -35,7 +35,7 @@
 
 HEAD_ASRC  =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/max326xx/Make.defs b/arch/arm/src/max326xx/Make.defs
index 2841260962b..afd2e158686 100644
--- a/arch/arm/src/max326xx/Make.defs
+++ b/arch/arm/src/max326xx/Make.defs
@@ -37,7 +37,7 @@
 
 HEAD_ASRC  =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/moxart/Make.defs b/arch/arm/src/moxart/Make.defs
index 0dbb72b60dd..957cb366b5d 100644
--- a/arch/arm/src/moxart/Make.defs
+++ b/arch/arm/src/moxart/Make.defs
@@ -38,7 +38,7 @@
 
 HEAD_ASRC = moxart_head.S
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_vectors.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
 CMN_ASRCS += up_nommuhead.S vfork.S
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c up_copyfullstate.c
 CMN_CSRCS += up_createstack.c up_dataabort.c up_mdelay.c up_udelay.c
diff --git a/arch/arm/src/nrf52/Make.defs b/arch/arm/src/nrf52/Make.defs
index 57fb5042089..d0cec8fd6c2 100644
--- a/arch/arm/src/nrf52/Make.defs
+++ b/arch/arm/src/nrf52/Make.defs
@@ -35,7 +35,7 @@
 
 HEAD_ASRC  =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/nuc1xx/Make.defs b/arch/arm/src/nuc1xx/Make.defs
index 440bf500675..fb7ba984f95 100644
--- a/arch/arm/src/nuc1xx/Make.defs
+++ b/arch/arm/src/nuc1xx/Make.defs
@@ -35,7 +35,7 @@
 
 HEAD_ASRC =
 
-CMN_ASRCS  = up_exception.S up_saveusercontext.S up_fullcontextrestore.S
+CMN_ASRCS  = up_exception.S up_saveusercontext.S arm_fullcontextrestore.S
 CMN_ASRCS += up_switchcontext.S vfork.S
 
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c up_copyfullstate.c
diff --git a/arch/arm/src/s32k1xx/s32k11x/Make.defs b/arch/arm/src/s32k1xx/s32k11x/Make.defs
index 82b79dff7e7..504ae24f319 100644
--- a/arch/arm/src/s32k1xx/s32k11x/Make.defs
+++ b/arch/arm/src/s32k1xx/s32k11x/Make.defs
@@ -35,7 +35,7 @@
 
 # Source files specific to the Cortex-M0+
 
-CMN_ASRCS += up_exception.S up_saveusercontext.S up_fullcontextrestore.S
+CMN_ASRCS += up_exception.S up_saveusercontext.S arm_fullcontextrestore.S
 CMN_ASRCS += up_switchcontext.S vfork.S
 
 CMN_CSRCS += up_assert.c up_blocktask.c up_copyfullstate.c up_createstack.c
diff --git a/arch/arm/src/s32k1xx/s32k14x/Make.defs b/arch/arm/src/s32k1xx/s32k14x/Make.defs
index a0c67d51154..a1b7d397622 100644
--- a/arch/arm/src/s32k1xx/s32k14x/Make.defs
+++ b/arch/arm/src/s32k1xx/s32k14x/Make.defs
@@ -35,7 +35,7 @@
 
 # Source files specific to the Cortex-M4F
 
-CMN_ASRCS += up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS += up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/sam34/Make.defs b/arch/arm/src/sam34/Make.defs
index 0192cafaf73..f6ee2b1c94a 100644
--- a/arch/arm/src/sam34/Make.defs
+++ b/arch/arm/src/sam34/Make.defs
@@ -43,7 +43,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/samd2l2/Make.defs b/arch/arm/src/samd2l2/Make.defs
index 0e34da3b79c..597c48d7fba 100644
--- a/arch/arm/src/samd2l2/Make.defs
+++ b/arch/arm/src/samd2l2/Make.defs
@@ -35,7 +35,7 @@
 
 HEAD_ASRC =
 
-CMN_ASRCS  = up_exception.S up_saveusercontext.S up_fullcontextrestore.S
+CMN_ASRCS  = up_exception.S up_saveusercontext.S arm_fullcontextrestore.S
 CMN_ASRCS += up_switchcontext.S vfork.S
 
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c up_copyfullstate.c
diff --git a/arch/arm/src/samd5e5/Make.defs b/arch/arm/src/samd5e5/Make.defs
index 71e5de2ca84..d533bf01916 100644
--- a/arch/arm/src/samd5e5/Make.defs
+++ b/arch/arm/src/samd5e5/Make.defs
@@ -42,7 +42,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/samv7/Make.defs b/arch/arm/src/samv7/Make.defs
index 138cf3fb9e7..795c971c679 100644
--- a/arch/arm/src/samv7/Make.defs
+++ b/arch/arm/src/samv7/Make.defs
@@ -43,7 +43,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/stm32/Make.defs b/arch/arm/src/stm32/Make.defs
index 30bb8395a99..d8e3967d4ca 100644
--- a/arch/arm/src/stm32/Make.defs
+++ b/arch/arm/src/stm32/Make.defs
@@ -38,7 +38,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/stm32f0l0g0/Make.defs b/arch/arm/src/stm32f0l0g0/Make.defs
index bbee90a912a..ad7e8cac642 100644
--- a/arch/arm/src/stm32f0l0g0/Make.defs
+++ b/arch/arm/src/stm32f0l0g0/Make.defs
@@ -36,7 +36,7 @@
 
 HEAD_ASRC =
 
-CMN_ASRCS  = up_exception.S up_saveusercontext.S up_fullcontextrestore.S
+CMN_ASRCS  = up_exception.S up_saveusercontext.S arm_fullcontextrestore.S
 CMN_ASRCS += up_switchcontext.S vfork.S
 
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c up_copyfullstate.c
diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs
index 62a94b55ece..501d1d3d144 100644
--- a/arch/arm/src/stm32f7/Make.defs
+++ b/arch/arm/src/stm32f7/Make.defs
@@ -43,7 +43,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/stm32h7/Make.defs b/arch/arm/src/stm32h7/Make.defs
index ee0d8713cf5..d630f6a1bf4 100644
--- a/arch/arm/src/stm32h7/Make.defs
+++ b/arch/arm/src/stm32h7/Make.defs
@@ -43,7 +43,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/stm32l4/Make.defs b/arch/arm/src/stm32l4/Make.defs
index 2c8356c3e56..3e728d58752 100644
--- a/arch/arm/src/stm32l4/Make.defs
+++ b/arch/arm/src/stm32l4/Make.defs
@@ -44,7 +44,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/str71x/Make.defs b/arch/arm/src/str71x/Make.defs
index 7e88732b21f..0cc31fe2710 100644
--- a/arch/arm/src/str71x/Make.defs
+++ b/arch/arm/src/str71x/Make.defs
@@ -35,7 +35,7 @@
 
 HEAD_ASRC = str71x_head.S
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_vectors.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
 CMN_ASRCS += vfork.S
 
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c up_copyfullstate.c
diff --git a/arch/arm/src/tiva/Make.defs b/arch/arm/src/tiva/Make.defs
index ae89ef006a2..67cb895f91c 100644
--- a/arch/arm/src/tiva/Make.defs
+++ b/arch/arm/src/tiva/Make.defs
@@ -36,7 +36,7 @@
 
 HEAD_ASRC  =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S  vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)
diff --git a/arch/arm/src/xmc4/Make.defs b/arch/arm/src/xmc4/Make.defs
index f686dc18f31..33589c7145b 100644
--- a/arch/arm/src/xmc4/Make.defs
+++ b/arch/arm/src/xmc4/Make.defs
@@ -38,7 +38,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)