Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e7eb0e7 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Teach debuggerd about SIGSYS SYS_SECCOMP signals." am: 44d7a876 am:... 

Merge "Teach debuggerd about SIGSYS SYS_SECCOMP signals." am: 44d7a876 am: 9bec09f3 am: 6942f98f
am: ee572c25

Change-Id: I300d8e4cbfeb565323e3299b90d2ae100445f4ff
parents 6e6e1e2f ee572c25

debuggerd/client/debuggerd_client.cpp

+3 −0
Original line number Diff line number Diff line
@@ -129,6 +129,9 @@ static void log_signal_summary(int signum, const siginfo_t* info) { 
      signal_name = "SIGSTKFLT";

      break;

#endif

    case SIGSYS:

      signal_name = "SIGSYS";

      break;

    case SIGTRAP:

      signal_name = "SIGTRAP";

      break;

debuggerd/tombstone.cpp

+9 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ static const char* get_signame(int sig) { 
    case SIGSTKFLT: return "SIGSTKFLT";

#endif

    case SIGSTOP: return "SIGSTOP";

    case SIGSYS: return "SIGSYS";

    case SIGTRAP: return "SIGTRAP";

    default: return "?";

  }
@@ -148,6 +149,14 @@ static const char* get_sigcode(int signo, int code) { 
      static_assert(NSIGSEGV == SEGV_ACCERR, "missing SEGV_* si_code");

#endif

      break;

#if defined(SYS_SECCOMP) // Our glibc is too old, and we build this for the host too.

    case SIGSYS:

      switch (code) {

        case SYS_SECCOMP: return "SYS_SECCOMP";

      }

      static_assert(NSIGSYS == SYS_SECCOMP, "missing SYS_* si_code");

      break;

#endif

    case SIGTRAP:

      switch (code) {

        case TRAP_BRKPT: return "TRAP_BRKPT";