summaryrefslogtreecommitdiff
path: root/binutils/objdump.c
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2009-06-15 11:37:26 +0000
committerNick Clifton <nickc@redhat.com>2009-06-15 11:37:26 +0000
commite4ff40ea760664b26a60ec9dc86904c27da43803 (patch)
treeb9f3ed4bd55dd2f7ad4ddc56664f8927d3bdd8ad /binutils/objdump.c
parent8b7cc8f1a780fee4a24e77ba0b1236bace5eb662 (diff)
downloadbinutils-redhat-e4ff40ea760664b26a60ec9dc86904c27da43803.tar.gz
PR 10263
* arm-dis.c (print_insn): Ignore is_data if the user has requested the disassembly of data as well as instructions. * objdump.c (disassemble_bytes): Set the DISASSEMBLE_DATA bit in the flags field of the disassemble_info structure if the -D switch is in operation. * dis-asm.h (struct disassemble_info): New value for the flags field.
Diffstat (limited to 'binutils/objdump.c')
-rw-r--r--binutils/objdump.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/binutils/objdump.c b/binutils/objdump.c
index 265a8ead44..3cf03f7edd 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1525,7 +1525,7 @@ disassemble_bytes (struct disassemble_info * info,
info->stream = &sfile;
info->bytes_per_line = 0;
info->bytes_per_chunk = 0;
- info->flags = 0;
+ info->flags = disassemble_all ? DISASSEMBLE_DATA : 0;
if (info->disassembler_needs_relocs
&& (bfd_get_file_flags (aux->abfd) & EXEC_P) == 0
@@ -1554,7 +1554,7 @@ disassemble_bytes (struct disassemble_info * info,
|| (distance_to_rel > 0
&& distance_to_rel < (bfd_signed_vma) (previous_octets/ opb)))
{
- info->flags = INSN_HAS_RELOC;
+ info->flags |= INSN_HAS_RELOC;
aux->reloc = **relppp;
}
else