Antoine Tremblay <antoine.tremblay@ericsson.com> writes:
-#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
-
+
+#ifndef __ARM_EABI__
+static const unsigned long arm_breakpoint = arm_abi_breakpoint;
+#else
+static const unsigned long arm_breakpoint = arm_eabi_breakpoint;
+#endif
Your code move actually changes the code. My recent fix
https://sourceware.org/ml/gdb-patches/2015-12/msg00215.html was removed
by mistake. This breaks the whole aarch64 multi-arch debugging.
I'll push the patch below in.