Assertion-failure-avoiding hacks from Paul's tree. I don't know why

these are necessary, but they are.

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

diff --git a/coregrind/m_signals.c b/coregrind/m_signals.c
index 81ac0629bf0a42a3fc8b3ab928eeddc55a89e968..2c1a04e8a0c23bf2d30b224baed1e43fcc634c7b 100644 (file)
--- a/coregrind/m_signals.c
+++ b/coregrind/m_signals.c
@@ -446,7 +446,9 @@ static void handle_SCSS_change ( Bool force_update )
 
       ksa.ksa_handler = skss.skss_per_sig[sig].skss_handler;
       ksa.sa_flags    = skss.skss_per_sig[sig].skss_flags;
+#     if !defined(VGP_ppc32_linux)
       ksa.sa_restorer = my_sigreturn;
+#     endif
 
       /* block all signals in handler */
       VG_(sigfillset)( &ksa.sa_mask );
@@ -473,8 +475,10 @@ static void handle_SCSS_change ( Bool force_update )
                    == skss_old.skss_per_sig[sig].skss_handler);
          vg_assert(ksa_old.sa_flags 
                    == skss_old.skss_per_sig[sig].skss_flags);
+#        if !defined(VGP_ppc32_linux)
          vg_assert(ksa_old.sa_restorer 
                    == my_sigreturn);
+#        endif
          VG_(sigaddset)( &ksa_old.sa_mask, VKI_SIGKILL );
          VG_(sigaddset)( &ksa_old.sa_mask, VKI_SIGSTOP );
          vg_assert(VG_(isfullsigset)( &ksa_old.sa_mask ));