commit 4029aec8af72cc047e1797926874a5fed631d083
author Christopher Ferris <cferris@google.com> Fri Feb 05 02:22:25 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 05 02:22:25 2016 +0000
tree ebae52435831343b84e814d3835e875797023797
parent e9163e7f39899ace39aa7533a044a6ad7043d837
parent 840887053cee03190cbcff42a9629999052828fe

Merge "Newer kernels added SEGV_BNDERR." am: 14c06e0769
am: 840887053c

* commit '840887053cee03190cbcff42a9629999052828fe':
  Newer kernels added SEGV_BNDERR.

debuggerd/tombstone.cpp

diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp
index dda6677..7cf2ffc 100644
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@@ -134,8 +134,15 @@
       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) {