Make --stop-after= work again.

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

diff --git a/coregrind/vg_signals.c b/coregrind/vg_signals.c
index 00818738f77b52daa91ad44ab885562494816114..3dce4d8decc27e19e469cc745be3cba34063e16e 100644 (file)
--- a/coregrind/vg_signals.c
+++ b/coregrind/vg_signals.c
@@ -1495,10 +1495,10 @@ void VG_(sigshutdown_actions) ( void )
          VG_(printf)("restoring handler 0x%x for signal %d\n", 
                      (Addr)(sa.ksa_handler), i );
 
-      /* Get the old host action */
+      /* Set the old host action */
       ret = VG_(ksigaction)(i, &sa, NULL);
-      vg_assert(ret == 0);
-
+      if (i != VKI_SIGKILL && i != VKI_SIGSTOP) 
+         vg_assert(ret == 0);
    }
 
    /* Restore the sig alt stack. */

diff --git a/vg_signals.c b/vg_signals.c
index 00818738f77b52daa91ad44ab885562494816114..3dce4d8decc27e19e469cc745be3cba34063e16e 100644 (file)
--- a/vg_signals.c
+++ b/vg_signals.c
@@ -1495,10 +1495,10 @@ void VG_(sigshutdown_actions) ( void )
          VG_(printf)("restoring handler 0x%x for signal %d\n", 
                      (Addr)(sa.ksa_handler), i );
 
-      /* Get the old host action */
+      /* Set the old host action */
       ret = VG_(ksigaction)(i, &sa, NULL);
-      vg_assert(ret == 0);
-
+      if (i != VKI_SIGKILL && i != VKI_SIGSTOP) 
+         vg_assert(ret == 0);
    }
 
    /* Restore the sig alt stack. */