summaryrefslogtreecommitdiff
path: root/debuggerd
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2016-02-05 02:20:13 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-02-05 02:20:13 +0000
commit840887053cee03190cbcff42a9629999052828fe (patch)
treeab183a3456f26d29309ef846b1d5ab7db3129f9c /debuggerd
parent22ac670f6793f743501c72b7b5bcacc015235652 (diff)
parent14c06e0769817d81f18fcdc41132747ffc158745 (diff)
Merge "Newer kernels added SEGV_BNDERR."
am: 14c06e0769 * commit '14c06e0769817d81f18fcdc41132747ffc158745': Newer kernels added SEGV_BNDERR.
Diffstat (limited to 'debuggerd')
-rw-r--r--debuggerd/tombstone.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp
index dda6677a9..7cf2ffc71 100644
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@@ -134,8 +134,15 @@ static const char* get_sigcode(int signo, int code) {
switch (code) {
case SEGV_MAPERR: return "SEGV_MAPERR";
case SEGV_ACCERR: return "SEGV_ACCERR";
+#if defined(SEGV_BNDERR)
+ case SEGV_BNDERR: return "SEGV_BNDERR";
+#endif
}
+#if defined(SEGV_BNDERR)
+ static_assert(NSIGSEGV == SEGV_BNDERR, "missing SEGV_* si_code");
+#else
static_assert(NSIGSEGV == SEGV_ACCERR, "missing SEGV_* si_code");
+#endif
break;
case SIGTRAP:
switch (code) {