Fixed bugs 3026528 and 3027975.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2062 35acf78f-673a-0410-8e92-d51de3d6d3f4

os/ports/GCC/ARMCMx/STM32F10x/vectors.s

@@ -20,6 +20,13 @@
 .syntax unified
 .thumb
 
+/* If the macro is not defined in the Makefile then a board.h file must be
+   provided containing the definition of the STM32 family member.*/
+#if !defined(STM32F10X_LD) && !defined(STM32F10X_MD) &&                     \
+    !defined(STM32F10X_HD) && !defined(STM32F10X_CL)
+#include "board.h"
+#endif
+
 .section vectors
 _vectors:
         .word   __ram_end__

os/ports/GCC/MSP430/chcore.c

@@ -51,7 +51,7 @@ void port_switch(Thread *ntp, Thread *otp) {
                 "push    r8                                     \n\t" \
                 "push    r7                                     \n\t" \
                 "push    r6                                     \n\t" \
-                "push    r6                                     \n\t" \
+                "push    r5                                     \n\t" \
                 "push    r4");
   otp->p_ctx.sp = sp;
   sp = ntp->p_ctx.sp;

readme.txt

@@ -59,6 +59,9 @@
 *****************************************************************************
 
 *** 2.1.1 ***
+- FIX: Fixed invalid contex restore in MSP430 port (bug 3027975)(backported
+  to 2.0.2).
+- FIX: Fixed STM32 vectors file (bug 3026528)(backported to 2.0.2).
 - FIX: Fixed race condition in STM32 SPI driver (bug 3025854)(backported to
   2.0.2).
 - FIX: Fixed H_LOCK and H_UNLOCK redefined with CH_USE_MALLOC_HEAP (bug