From 35adc03f3787405297259a1706608bdeaab4fda9 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Mon, 21 Dec 2015 13:55:45 +0000 Subject: [PATCH] Use arm_eabi_breakpoint on aarch32 This patch is to get b37a6290 back again, which was removed by d9311bfa by mistake. gdb/gdbserver: 2015-12-21 Yao Qi * linux-aarch32-low.h [__aarch64__]: Use arm_abi_breakpoint arm breakpoint. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/linux-aarch32-low.h | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index e38d71d..1d240f2 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2015-12-21 Yao Qi + + * linux-aarch32-low.h [__aarch64__]: Use arm_abi_breakpoint + arm breakpoint. + 2015-12-18 Antoine Tremblay * server.c (handle_query): Call target_supports_software_single_step. diff --git a/gdb/gdbserver/linux-aarch32-low.h b/gdb/gdbserver/linux-aarch32-low.h index d452894..fe0aaf5 100644 --- a/gdb/gdbserver/linux-aarch32-low.h +++ b/gdb/gdbserver/linux-aarch32-low.h @@ -24,10 +24,10 @@ ABI's breakpoint instruction. For now at least. */ #define arm_eabi_breakpoint 0xe7f001f0UL -#ifndef __ARM_EABI__ -static const unsigned long arm_breakpoint = arm_abi_breakpoint; -#else +#if (defined __ARM_EABI__ || defined __aarch64__) static const unsigned long arm_breakpoint = arm_eabi_breakpoint; +#else +static const unsigned long arm_breakpoint = arm_abi_breakpoint; #endif #define arm_breakpoint_len 4 -- 2.7.4