[pypy-commit] stmgc rewind_setjmp: hg merge default

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: rewind_setjmp
Changeset: r1286:2db7026f8f85
Date: 2014-08-09 18:08 +0200
http://bitbucket.org/pypy/stmgc/changeset/2db7026f8f85/

Log:	hg merge default

diff --git a/c7/stm/forksupport.c b/c7/stm/forksupport.c
--- a/c7/stm/forksupport.c
+++ b/c7/stm/forksupport.c
@@ -190,6 +190,7 @@
 #endif
         pr->pub.running_thread->shadowstack = (
             pr->shadowstack_at_start_of_transaction);
+        strcpy(pr->marker_self, "fork");
         stm_abort_transaction();
     }
     stm_rewind_jmp_leaveframe(tl, &rjbuf);