Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / native_client / src / trusted / debug_stub / abi.cc

diff --git a/src/native_client/src/trusted/debug_stub/abi.cc b/src/native_client/src/trusted/debug_stub/abi.cc
index caaf153..6dd7c34 100644 (file)
--- a/src/native_client/src/trusted/debug_stub/abi.cc
+++ b/src/native_client/src/trusted/debug_stub/abi.cc
@@ -247,7 +247,9 @@ static Abi::BPDef breakpoint_x86 = {
   breakpoint_code_x86
 };
 
-static uint32_t breakpoint_code_arm[] = { NACL_INSTR_ARM_BREAKPOINT };
+// We use an illegal instruction rather than BKPT because BKPT cannot
+// be caught under qemu-arm whereas illegal instructions can.
+static uint32_t breakpoint_code_arm[] = { NACL_INSTR_ARM_ABORT_NOW };
 static Abi::BPDef breakpoint_arm = {
   sizeof(breakpoint_code_arm),
   (uint8_t *) breakpoint_code_arm