1 files changed, 2 insertions, 0 deletions
diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.c b/os/ports/GCC/ARMCMx/chcore_v7m.c
index e4ea3a72e..ca45f4f1a 100644
--- a/os/ports/GCC/ARMCMx/chcore_v7m.c
+++ b/os/ports/GCC/ARMCMx/chcore_v7m.c
@@ -76,6 +76,7 @@ void SVCallVector(void) {
 #if CORTEX_USE_FPU
   /* Restoring the special register SCB_FPCCR.*/
   SCB_FPCCR = (uint32_t)ctxp->fpccr;
+  SCB_FPCAR = SCB_FPCAR + sizeof (struct extctx);
 #endif
   asm volatile ("msr     PSP, %0" : : "r" (ctxp) : "memory");
   port_unlock_from_isr();
@@ -102,6 +103,7 @@ void PendSVVector(void) {
 #if CORTEX_USE_FPU
   /* Restoring the special register SCB_FPCCR.*/
   SCB_FPCCR = (uint32_t)ctxp->fpccr;
+  SCB_FPCAR = SCB_FPCAR + sizeof (struct extctx);
 #endif
   asm volatile ("msr     PSP, %0" : : "r" (ctxp) : "memory");
 }