Arm/AArch64: Split DISPLACED_MODIFIED_INSNS name clash
authorAlan Hayward <alan.hayward@arm.com>
Thu, 4 Jul 2019 11:41:20 +0000 (12:41 +0100)
committerAlan Hayward <alan.hayward@arm.com>
Thu, 4 Jul 2019 11:47:26 +0000 (12:47 +0100)
commite935475cb6bcd8146717896e88824ae93a0897c7
treeeb5596ff723475a39bb57d980124b635063720ef
parentdf0bb381e27a8b1594c492a34c48ff6e6bbd29d1
Arm/AArch64: Split DISPLACED_MODIFIED_INSNS name clash

Both targets define DISPLACED_MODIFIED_INSNS, each with different values.
Add ARM_ and AARCH64_ to the start of the name to prevent confusion.

No functionality changes.

gdb/ChangeLog:

* aarch64-linux-tdep.c (aarch64_linux_init_abi): Use
AARCH64_DISPLACED_MODIFIED_INSNS.
* aarch64-tdep.c (struct aarch64_displaced_step_data)
(aarch64_displaced_step_copy_insn): Likewise.
* aarch64-tdep.h (DISPLACED_MODIFIED_INSNS): Rename from..
(AARCH64_DISPLACED_MODIFIED_INSNS): ...to this.
* arm-linux-tdep.c (arm_linux_cleanup_svc): Use
ARM_DISPLACED_MODIFIED_INSNS.
* arm-tdep.c (arm_gdbarch_init): Likewise.
* arm-tdep.h (DISPLACED_MODIFIED_INSNS): Rename from..
(ARM_DISPLACED_MODIFIED_INSNS): ...to this.
(struct arm_displaced_step_closure): Use
ARM_DISPLACED_MODIFIED_INSNS.
gdb/ChangeLog
gdb/aarch64-linux-tdep.c
gdb/aarch64-tdep.c
gdb/aarch64-tdep.h
gdb/arm-linux-tdep.c
gdb/arm-tdep.c
gdb/arm-tdep.h