Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / native_client / src / trusted / service_runtime / linux / nacl_signal.c

diff --git a/src/native_client/src/trusted/service_runtime/linux/nacl_signal.c b/src/native_client/src/trusted/service_runtime/linux/nacl_signal.c
index f88febc..a45ffad 100644 (file)
--- a/src/native_client/src/trusted/service_runtime/linux/nacl_signal.c
+++ b/src/native_client/src/trusted/service_runtime/linux/nacl_signal.c
@@ -33,9 +33,7 @@
 
 /*
  * The signals listed here should either be handled by NaCl (or otherwise
- * trusted) or have handlers that are expected to crash.
- * Signals for which handlers are expected to crash should be listed
- * in the NaClSignalHandleCustomCrashHandler function below.
+ * trusted code).
  */
 static int s_Signals[] = {
 #if NACL_ARCH(NACL_BUILD_ARCH) != NACL_mips
@@ -126,21 +124,6 @@ static void GetCurrentThread(const struct NaClSignalContext *sig_ctx,
   }
 }
 
-/*
- * If |sig| had a handler that was expected to crash, exit.
- */
-static void NaClSignalHandleCustomCrashHandler(int sig) {
-  /* Only SIGSYS is expected to have a custom crash handler. */
-  if (sig == SIGSYS) {
-    char tmp[128];
-    SNPRINTF(tmp, sizeof(tmp),
-        "\n** Signal %d has a custom crash handler but did not crash.\n",
-        sig);
-    NaClSignalErrorMessage(tmp);
-    NaClExit(-sig);
-  }
-}
-
 static void FindAndRunHandler(int sig, siginfo_t *info, void *uc) {
   unsigned int a;
 
@@ -161,7 +144,6 @@ static void FindAndRunHandler(int sig, siginfo_t *info, void *uc) {
         if (s_OldActions[a].sa_sigaction != NULL) {
           /* then call the old handler. */
           s_OldActions[a].sa_sigaction(sig, info, uc);
-          NaClSignalHandleCustomCrashHandler(sig);
           break;
         }
       } else {
@@ -170,7 +152,6 @@ static void FindAndRunHandler(int sig, siginfo_t *info, void *uc) {
             (s_OldActions[a].sa_handler != SIG_IGN)) {
           /* and call the old signal. */
           s_OldActions[a].sa_handler(sig);
-          NaClSignalHandleCustomCrashHandler(sig);
           break;
         }
       }