Ah, the joys of applying patches by hand. Redo r12424 but get the

patch in the right place this time.  re #295428.

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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 85bec7bc14673216bd260e6680ca957b72680584..f1ec4a6ab15b98b28d6e54aa4bc2210bba22a64b 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -2840,9 +2840,9 @@ asm("\n"
     "\taddl  $"VG_STRINGIFY(VG_STACK_ACTIVE_SZB)", %eax\n"
     "\tsubl  $16, %eax\n"
     "\tandl  $~15, %eax\n"
-    "\tsubl  $12, %esp\n"  // keep stack 16 aligned; see #295428
     /* install it, and collect the original one */
     "\txchgl %eax, %esp\n"
+    "\tsubl  $12, %esp\n"  // keep stack 16 aligned; see #295428
     /* call _start_in_C_darwin, passing it the startup %esp */
     "\tpushl %eax\n"
     "\tcall  __start_in_C_darwin\n"