From: Timothy Wall <twall@alum.mit.edu>
Date: Sat, 22 Apr 2000 20:08:12 +0000 (+0000)
Subject: Fix bug selecting octets per byte value when loading binary files.
X-Git-Tag: binutils-2_10~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=334126957817befe7f2bed463fd1427006460cb4;p=thirdparty%2Fbinutils-gdb.git

Fix bug selecting octets per byte value when loading binary files.
---

diff --git a/binutils/objdump.c b/binutils/objdump.c
index d8c907e7285..6f0a63e5c05 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1576,7 +1576,7 @@ disassemble_data (abfd)
   struct disassemble_info disasm_info;
   struct objdump_disasm_info aux;
   asection *section;
-  unsigned int opb = bfd_octets_per_byte (abfd);
+  unsigned int opb;
 
   print_files = NULL;
   prev_functionname = NULL;
@@ -1598,7 +1598,6 @@ disassemble_data (abfd)
   aux.require_sec = false;
   disasm_info.print_address_func = objdump_print_address;
   disasm_info.symbol_at_address_func = objdump_symbol_at_address;
-  disasm_info.octets_per_byte = opb;
 
   if (machine != (char *) NULL)
     {
@@ -1629,10 +1628,13 @@ disassemble_data (abfd)
       return;
     }
 
+  opb = bfd_octets_per_byte (abfd);
+
   disasm_info.flavour = bfd_get_flavour (abfd);
   disasm_info.arch = bfd_get_arch (abfd);
   disasm_info.mach = bfd_get_mach (abfd);
   disasm_info.disassembler_options = disassembler_options;
+  disasm_info.octets_per_byte = opb;
   
   if (bfd_big_endian (abfd))
     disasm_info.display_endian = disasm_info.endian = BFD_ENDIAN_BIG;