From c486d4130d01f1034901d65c764b8e8ae329a01b Mon Sep 17 00:00:00 2001 From: Dave Cheney Date: Tue, 23 Sep 2014 15:34:38 +1000 Subject: [PATCH] runtime: fix runtime.Breakpoint on ARMv5 Fixes #8775. Use the illegal instruction suggested by Ian in https://golang.org/cl/144180043/#msg4 on all arm arches. LGTM=minux R=golang-codereviews, gobot, rsc CC=golang-codereviews, iant, minux https://golang.org/cl/146130043 --- src/runtime/asm_arm.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/asm_arm.s b/src/runtime/asm_arm.s index f67f94939b..38d97b78f3 100644 --- a/src/runtime/asm_arm.s +++ b/src/runtime/asm_arm.s @@ -96,7 +96,7 @@ TEXT runtime·breakpoint(SB),NOSPLIT,$0-0 #ifdef GOOS_nacl WORD $0xe125be7f // BKPT 0x5bef, NACL_INSTR_ARM_BREAKPOINT #else - WORD $0xe1200071 // BKPT 0x0001 + WORD $0xe7f001f0 // undefined instruction that gdb understands is a software breakpoint #endif RET -- 2.50.0