Update version number to 9.0.0rc2.

[freertos] / FreeRTOS / Source / portable / GCC / ARM_CM0 / port.c

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c
index 0b07b0e9ae6bb8b1283111ca68732bdb5cff3db7..ee1a7798b39165ddf1210c08620d15e8d4b5974b 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.2.2 - Copyright (C) 2015 Real Time Engineers Ltd.\r
+    FreeRTOS V9.0.0rc2 - Copyright (C) 2016 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -8,7 +8,7 @@
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.\r
 \r
     ***************************************************************************\r
     >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
@@ -183,12 +183,13 @@ void vPortStartFirstTask( void )
        "       msr psp, r0                                     \n" /* This is now the new top of stack to use in the task. */\r
        "       movs r0, #2                                     \n" /* Switch to the psp stack. */\r
        "       msr CONTROL, r0                         \n"\r
+       "       isb                                                     \n"\r
        "       pop {r0-r5}                                     \n" /* Pop the registers that are saved automatically. */\r
        "       mov lr, r5                                      \n" /* lr is now in r5. */\r
        "       cpsie i                                         \n" /* The first task has its context and interrupts can be enabled. */\r
        "       pop {pc}                                        \n" /* Finally, pop the PC to jump to the user defined task code. */\r
        "                                                               \n"\r
-       "       .align 2                                        \n"\r
+       "       .align 4                                        \n"\r
        "pxCurrentTCBConst2: .word pxCurrentTCB   "\r
                                  );\r
 }\r
@@ -331,7 +332,7 @@ void xPortPendSVHandler( void )
        "                                                                               \n"\r
        "       bx r3                                                           \n"\r
        "                                                                               \n"\r
-       "       .align 2                                                        \n"\r
+       "       .align 4                                                        \n"\r
        "pxCurrentTCBConst: .word pxCurrentTCB    "\r
        );\r
 }\r