From 91068ec6ae02e85c5ca4fbe3c6e214bd87bb872f Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Mon, 19 Dec 2016 11:35:14 +0000 Subject: [PATCH] MIPS/opcodes: Only examine ELF file structures if SYMTAB_AVAILABLE Correct commit 640c0ccdc980 ("some objdump -M options, better reg dumps"), , and only execute code setting up disassembler options based on ELF file structures if SYMTAB_AVAILABLE is set. opcodes/ * mips-dis.c (set_default_mips_dis_options) [SYMTAB_AVAILABLE]: Only examine ELF file structures here. --- opcodes/ChangeLog | 5 +++++ opcodes/mips-dis.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 2618f908507..763701882b3 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2016-12-19 Maciej W. Rozycki + + * mips-dis.c (set_default_mips_dis_options) [SYMTAB_AVAILABLE]: + Only examine ELF file structures here. + 2016-12-19 Maciej W. Rozycki * mips-dis.c (set_default_mips_dis_options) [BFD64]: Only call diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c index cd9893e70eb..8c35759ffda 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c @@ -839,7 +839,6 @@ set_default_mips_dis_options (struct disassemble_info *info) mips_cp1_names = chosen_arch->cp1_names; mips_hwr_names = chosen_arch->hwr_names; } -#endif /* Update settings according to the ELF file header flags. */ if (info->flavour == bfd_target_elf_flavour && info->section != NULL) @@ -866,6 +865,7 @@ set_default_mips_dis_options (struct disassemble_info *info) else if (header->e_flags & EF_MIPS_ARCH_ASE_MDMX) mips_ase |= ASE_MDMX; } +#endif } static void -- 2.30.2