diff options
| author | Alan Hayward <alan.hayward@arm.com> | 2019-07-04 12:41:20 +0100 |
|---|---|---|
| committer | Alan Hayward <alan.hayward@arm.com> | 2019-07-04 12:47:26 +0100 |
| commit | e935475cb6bcd8146717896e88824ae93a0897c7 (patch) | |
| tree | eb5596ff723475a39bb57d980124b635063720ef /gdb/arm-linux-tdep.c | |
| parent | df0bb381e27a8b1594c492a34c48ff6e6bbd29d1 (diff) | |
| download | gdb-e935475cb6bcd8146717896e88824ae93a0897c7.zip gdb-e935475cb6bcd8146717896e88824ae93a0897c7.tar.gz gdb-e935475cb6bcd8146717896e88824ae93a0897c7.tar.bz2 | |
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.
Diffstat (limited to 'gdb/arm-linux-tdep.c')
| -rw-r--r-- | gdb/arm-linux-tdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c index a5ad064..8c0c058 100644 --- a/gdb/arm-linux-tdep.c +++ b/gdb/arm-linux-tdep.c @@ -954,7 +954,7 @@ arm_linux_cleanup_svc (struct gdbarch *gdbarch, within_scratch = (apparent_pc >= dsc->scratch_base && apparent_pc < (dsc->scratch_base - + DISPLACED_MODIFIED_INSNS * 4 + 4)); + + ARM_DISPLACED_MODIFIED_INSNS * 4 + 4)); if (debug_displaced) { |