From ad83287a53d4151b0a96eb124d4a5fdd773f7a79 Mon Sep 17 00:00:00 2001 From: "shashishekhar@chromium.org" Date: Tue, 16 Apr 2013 21:09:20 +0000 Subject: Fix the CHECK macro for Android x86 builds. Instead of sending SIGABRT CHECK was sending the SIGTRAP signal. BUG=178743 Review URL: https://codereview.chromium.org/13891005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194452 0039d316-1c4b-4281-b951-d872f2087c98 --- base/debug/debugger_posix.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/base/debug/debugger_posix.cc b/base/debug/debugger_posix.cc index 44a8ad6..d0dcbbc 100644 --- a/base/debug/debugger_posix.cc +++ b/base/debug/debugger_posix.cc @@ -209,8 +209,7 @@ bool BeingDebugged() { // should ask for advice from some NaCl experts about the optimum thing here. // http://code.google.com/p/nativeclient/issues/detail?id=645 #define DEBUG_BREAK() abort() -#elif defined(ARCH_CPU_ARM_FAMILY) -#if defined(OS_ANDROID) +#elif defined(OS_ANDROID) // Though Android has a "helpful" process called debuggerd to catch native // signals on the general assumption that they are fatal errors. The bkpt // instruction appears to cause SIGBUS which is trapped by debuggerd, and @@ -231,10 +230,9 @@ void DebugBreak() { } } // namespace #define DEBUG_BREAK() DebugBreak() -#else +#elif defined(ARCH_CPU_ARM_FAMILY) // ARM && !ANDROID #define DEBUG_BREAK() asm("bkpt 0") -#endif #elif defined(ARCH_CPU_MIPS_FAMILY) #define DEBUG_BREAK() asm("break 2") #else -- cgit v1.1