arm32-linux: GET_STARTREGS has always been wrong on this target,

confusing SP and LR and resulting in no backtraces during internal
assertion failures etc on this platform.  Fixes #343219.  Noticed by
dimitry@google.com.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14928

diff --git a/coregrind/m_libcassert.c b/coregrind/m_libcassert.c
index d8fe92316372f3fc8bc46c052e66df58a4c21cc3..38a5a5f021d6076cbb78b8e675d041d91090c685 100644 (file)
--- a/coregrind/m_libcassert.c
+++ b/coregrind/m_libcassert.c
@@ -134,8 +134,8 @@
            : /* trash */ "memory"                         \
         );                                                \
         (srP)->r_pc = block[0] - 8;                       \
-        (srP)->r_sp = block[1];                           \
-        (srP)->misc.ARM.r14 = block[2];                   \
+        (srP)->misc.ARM.r14 = block[1];                   \
+        (srP)->r_sp = block[2];                           \
         (srP)->misc.ARM.r12 = block[3];                   \
         (srP)->misc.ARM.r11 = block[4];                   \
         (srP)->misc.ARM.r7  = block[5];                   \