From d54398a79e97eff8f51aed2035cb513cdc4fb319 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Fri, 25 Jul 2014 18:57:06 +0100 Subject: [PATCH] MIPS: Respect the "set mips compression" command This fixes gdbarch matching, making sure one for the opposite compressed ISA variation is not chosen. That in turn makes "set mips compression" work; right now the setting sticks to the initial value, either inferred from the ELF header of the binary first loaded or the default value if no binary has been used. This only affects debugging with no symbol table available or no binary chosen at all, as otherwise symbol annotations determine the compressed ISA variation. * mips-tdep.c (mips_gdbarch_init): Also check the compressed ISA variation in gdbarch matching. --- gdb/ChangeLog | 5 +++++ gdb/mips-tdep.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 47205a1cbb0..a73b37f25aa 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2014-07-25 Maciej W. Rozycki + + * mips-tdep.c (mips_gdbarch_init): Also check the compressed ISA + variation in gdbarch matching. + 2014-07-25 Tom Tromey * exec.c (using_exec_ops): Remove. diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index c3e8e77d938..9a530a8055c 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -8296,12 +8296,14 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) arches != NULL; arches = gdbarch_list_lookup_by_info (arches->next, &info)) { - /* MIPS needs to be pedantic about which ABI the object is - using. */ + /* MIPS needs to be pedantic about which ABI and the compressed + ISA variation the object is using. */ if (gdbarch_tdep (arches->gdbarch)->elf_flags != elf_flags) continue; if (gdbarch_tdep (arches->gdbarch)->mips_abi != mips_abi) continue; + if (gdbarch_tdep (arches->gdbarch)->mips_isa != mips_isa) + continue; /* Need to be pedantic about which register virtual size is used. */ if (gdbarch_tdep (arches->gdbarch)->mips64_transfers_32bit_regs_p -- 2.30.2