diff options
| author | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 00:05:50 +0000 |
|---|---|---|
| committer | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 00:05:50 +0000 |
| commit | b15bb81d988fd0fc5254aebea4fb5c405f0e51be (patch) | |
| tree | e34626b5d21a8144e64ac711cd063d11b33db528 | |
| parent | cc0eb60a63db3c2cf78875a47c0f1d9f383608c0 (diff) | |
| download | chromium_src-b15bb81d988fd0fc5254aebea4fb5c405f0e51be.zip chromium_src-b15bb81d988fd0fc5254aebea4fb5c405f0e51be.tar.gz chromium_src-b15bb81d988fd0fc5254aebea4fb5c405f0e51be.tar.bz2 | |
Merge 194452 "Fix the CHECK macro for Android x86 builds."
> 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
TBR=shashishekhar@chromium.org
Review URL: https://codereview.chromium.org/14024010
git-svn-id: svn://svn.chromium.org/chrome/branches/1453/src@194490 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/debug/debugger_posix.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/base/debug/debugger_posix.cc b/base/debug/debugger_posix.cc index 0fbefde..7a2c468 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 @@ -228,10 +227,9 @@ bool BeingDebugged() { } \ } \ } while (0) -#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 |