Prefer object over notype symbols when disassembling

[deliverable/binutils-gdb.git] / bfd / i386aout.c

diff --git a/bfd/i386aout.c b/bfd/i386aout.c
index 59e1ed25f8fe19ec6089b87ccbda608a76f4b388..b00dc9d9d647a2a3cc060a8ebdc9d9627f11634e 100644 (file)
--- a/bfd/i386aout.c
+++ b/bfd/i386aout.c
@@ -1,5 +1,5 @@
 /* BFD back-end for i386 a.out binaries.
 /* BFD back-end for i386 a.out binaries.

-   Copyright (C) 1990-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990-2019 Free Software Foundation, Inc.

 
    This file is part of BFD, the Binary File Descriptor library.
 
 
    This file is part of BFD, the Binary File Descriptor library.
 


@@ -26,12 +26,12 @@
    system, and I'll stick it in for the next release.  */
 
 #define N_HEADER_IN_TEXT(x)    0
    system, and I'll stick it in for the next release.  */
 
 #define N_HEADER_IN_TEXT(x)    0

-#define N_TXTOFF(x)            0x20
-#define N_TXTADDR(x)           (N_MAGIC (x) == ZMAGIC ? 0x1020 : 0)
-#define N_TXTSIZE(x)           ((x).a_text)
-#define TARGET_PAGE_SIZE       4096
-#define SEGMENT_SIZE           0x400000
-#define DEFAULT_ARCH           bfd_arch_i386
+#define N_TXTOFF(x)            0x20
+#define N_TXTADDR(x)           (N_MAGIC (x) == ZMAGIC ? 0x1020 : 0)
+#define N_TXTSIZE(x)           ((x)->a_text)
+#define TARGET_PAGE_SIZE       4096
+#define SEGMENT_SIZE           0x400000
+#define DEFAULT_ARCH           bfd_arch_i386

 
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
 
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate


@@ -54,7 +54,7 @@ i386aout_write_object_contents (bfd *abfd)
   struct external_exec exec_bytes;
   struct internal_exec *execp = exec_hdr (abfd);
 
   struct external_exec exec_bytes;
   struct internal_exec *execp = exec_hdr (abfd);
 

-  N_SET_MACHTYPE (*execp, M_386);
+  N_SET_MACHTYPE (execp, M_386);

 
   obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
 
 
   obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
 


@@ -64,7 +64,7 @@ i386aout_write_object_contents (bfd *abfd)
 }
 
 #define MY_write_object_contents  i386aout_write_object_contents
 }
 
 #define MY_write_object_contents  i386aout_write_object_contents

-#define MY_backend_data           & MY (backend_data)
+#define MY_backend_data                  & MY (backend_data)

 
 static const struct aout_backend_data MY (backend_data);
 
 
 static const struct aout_backend_data MY (backend_data);