[src/netbsd-6]: src/lib/libc/arch/arm/gen Pull up following revision(s) (requ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f9d4a22b57f6
branches:  netbsd-6
changeset: 774627:f9d4a22b57f6
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Oct 01 17:53:44 2012 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #576):
        lib/libc/arch/arm/gen/swapcontext.S: revision 1.7
Fixup the stack pointer in the ucontext returned by getcontext.
This fixes the following tests
        lib/libc/sys/t_swapcontext.c
        lib/libpthread/t_swapcontext.c

diffstat:

 lib/libc/arch/arm/gen/swapcontext.S |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r ff9593addb61 -r f9d4a22b57f6 lib/libc/arch/arm/gen/swapcontext.S
--- a/lib/libc/arch/arm/gen/swapcontext.S       Mon Oct 01 17:51:14 2012 +0000
+++ b/lib/libc/arch/arm/gen/swapcontext.S       Mon Oct 01 17:53:44 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: swapcontext.S,v 1.5 2008/04/28 20:22:55 martin Exp $   */
+/*     $NetBSD: swapcontext.S,v 1.5.24.1 2012/10/01 17:53:44 riz Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "SYS.h"
 
 #if defined(LIBC_SCCS) && !defined(lint)
-        RCSID("$NetBSD: swapcontext.S,v 1.5 2008/04/28 20:22:55 martin Exp $")
+        RCSID("$NetBSD: swapcontext.S,v 1.5.24.1 2012/10/01 17:53:44 riz Exp $")
 #endif /* LIBC_SCCS && !lint */
 
 ENTRY(swapcontext)
@@ -41,6 +41,7 @@
        cmp     r0, #0
        ldmfd   sp!, {r0-r1, lr}
        RETc(ne)
+       str     sp, [r0, #(36 + 13*4)]  /* Adjust saved SP. */
        str     lr, [r0, #(36 + 15*4)]  /* Adjust saved PC. */
 #ifdef SOFTFLOAT
        /* Ahem. */