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  <yao.qi@linaro.org>

	* linux-aarch32-low.h [__aarch64__]: Use arm_abi_breakpoint
	arm breakpoint.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index e38d71d91b2ca748d1d1f7a73c19ef4cad52fac0..1d240f25e186597dc72f2db32e85c2aadd92b5af 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-21  Yao Qi  <yao.qi@linaro.org>
+
+       * linux-aarch32-low.h [__aarch64__]: Use arm_abi_breakpoint
+       arm breakpoint.
+
 2015-12-18  Antoine Tremblay  <antoine.tremblay@ericsson.com>
 
        * 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 d452894ffe7ff536897fd55ce2aea0ee9313f7f1..fe0aaf53bae84cf235ef48d4df2ca4b17fdd4bb2 100644 (file)
--- 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