diff options
| author | Maciej W. Rozycki <macro@imgtec.com> | 2016-12-23 12:11:12 +0000 |
|---|---|---|
| committer | Maciej W. Rozycki <macro@imgtec.com> | 2016-12-23 19:14:17 +0000 |
| commit | 9e76c212e6311abaee4d02473473f7d6dcad972f (patch) | |
| tree | 25b247c7de7d40bd22ad8ae3d7b0bd681d9e0d3c /opcodes/mips-dis.c | |
| parent | 5b362f04b2a56d446b024027963be52d61f939cb (diff) | |
| download | binutils-gdb-9e76c212e6311abaee4d02473473f7d6dcad972f.tar.gz | |
opcodes: Use autoconf to check for `bfd_mips_elf_get_abiflags' in BFD
Fix a regression introduced with commit 5e7fc731f80e ("MIPS/opcodes:
Also set disassembler's ASE flags from ELF structures"), further updated
with commit 4df995c77118 ("MIPS/opcodes: Also set disassembler's ASE
flags from ELF structures"), and use autoconf to check for the presence
of `bfd_mips_elf_get_abiflags' in BFD.
opcodes/
* mips-dis.c (set_default_mips_dis_options): Use
HAVE_BFD_MIPS_ELF_GET_ABIFLAGS rather than BFD64 to guard the
call to `bfd_mips_elf_get_abiflags'.
* configure.ac: Check for `bfd_mips_elf_get_abiflags' in BFD.
* Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add `libbfd.la'.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* config.in: Regenerate.
* Makefile.in: Regenerate.
Diffstat (limited to 'opcodes/mips-dis.c')
| -rw-r--r-- | opcodes/mips-dis.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c index 9cf737dedeb..4bc1f595089 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c @@ -847,11 +847,12 @@ set_default_mips_dis_options (struct disassemble_info *info) Elf_Internal_Ehdr *header = elf_elfheader (abfd); Elf_Internal_ABIFlags_v0 *abiflags = NULL; - /* We won't ever get here if !BFD64, because we won't then have - a MIPS/ELF BFD, however we need to guard against a link error - in a `--enable-targets=...' configuration with a 32-bit host, - where the MIPS target is a secondary. */ -#ifdef BFD64 + /* We won't ever get here if !HAVE_BFD_MIPS_ELF_GET_ABIFLAGS, + because we won't then have a MIPS/ELF BFD, however we need + to guard against a link error in a `--enable-targets=...' + configuration with a 32-bit host where the MIPS target is + a secondary, or with MIPS/ECOFF configurations. */ +#ifdef HAVE_BFD_MIPS_ELF_GET_ABIFLAGS abiflags = bfd_mips_elf_get_abiflags (abfd); #endif /* If an ELF "newabi" binary, use the n32/(n)64 GPR names. */ |