X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fpc532-mach.c;h=7ce5848fd80353ea85952834e0b1dff1852f5b11;hb=a13ba30840ba7a8450dcb4edd356de61fcb89130;hp=925233313d136b979c423ce905fe38b7ee5a50f2;hpb=2c3fc38946973ec305b63248abdd170eda059f80;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/pc532-mach.c b/bfd/pc532-mach.c
index 925233313d..7ce5848fd8 100644
--- a/bfd/pc532-mach.c
+++ b/bfd/pc532-mach.c
@@ -1,6 +1,5 @@
 /* BFD back-end for Mach3/532 a.out-ish binaries.
-   Copyright 1990, 1991, 1992, 1994, 1995, 2000, 2001, 2002, 2005, 2007, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 1990-2019 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -21,7 +20,7 @@
 
 
 /* Written by Ian Dall
-              19-Apr-94
+	      19-Apr-94
 
    Formerly part of aout-pc532-mach.c. Split out to allow more
    flexibility with multiple formats.  */
@@ -32,7 +31,7 @@
    1 and specially define our own N_TXTSIZE.  */
 
 #define N_HEADER_IN_TEXT(x) 1
-#define N_TXTSIZE(x) ((x).a_text)
+#define N_TXTSIZE(x) ((x)->a_text)
 
 #define TEXT_START_ADDR 0x10000       /* from old ld */
 #define TARGET_PAGE_SIZE 0x1000       /* from old ld,  032 & 532 are really 512/4k */
@@ -40,7 +39,7 @@
 /* Use a_entry of 0 to distinguish object files from OMAGIC executables */
 #define N_TXTADDR(x) \
   (N_MAGIC(x) == OMAGIC ? \
-   ((x).a_entry < TEXT_START_ADDR? 0: TEXT_START_ADDR): \
+   ((x)->a_entry < TEXT_START_ADDR? 0: TEXT_START_ADDR): \
    (N_MAGIC(x) == NMAGIC? TEXT_START_ADDR: \
     TEXT_START_ADDR + EXEC_BYTES_SIZE))
 
@@ -52,7 +51,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (pc532machaout_,OP)
+#define MY(OP) CONCAT2 (ns32k_aout_pc532mach_,OP)
 
 /* Must be the same as aout-ns32k.c */
 #define NAME(x,y) CONCAT3 (ns32kaout,_32_,y)
@@ -65,7 +64,7 @@
 #include "libbfd.h"
 #include "aout/aout64.h"
 
-#define MY_bfd_reloc_type_lookup ns32kaout_bfd_reloc_type_lookup
+#define MY_bfd_reloc_type_lookup ns32k_aout_bfd_reloc_type_lookup
 
 /* libaout doesn't use NAME for these ...  */
 
@@ -75,7 +74,7 @@
 
 #define MY_exec_header_not_counted 1
 
-reloc_howto_type *ns32kaout_bfd_reloc_type_lookup
+reloc_howto_type *MY_bfd_reloc_type_lookup
   (bfd *abfd, bfd_reloc_code_real_type code);
 
 static bfd_boolean
@@ -90,16 +89,16 @@ MY(write_object_contents) (bfd *abfd)
   switch (bfd_get_mach (abfd))
     {
     case 32032:
-      N_SET_MACHTYPE (*execp, M_NS32032);
+      N_SET_MACHTYPE (execp, M_NS32032);
       break;
     case 32532:
     default:
-      N_SET_MACHTYPE (*execp, M_NS32532);
+      N_SET_MACHTYPE (execp, M_NS32532);
       break;
     }
-  N_SET_FLAGS (*execp, aout_backend_info (abfd)->exec_hdr_flags);
+  N_SET_FLAGS (execp, aout_backend_info (abfd)->exec_hdr_flags);
 
-  WRITE_HEADERS(abfd, execp);
+  WRITE_HEADERS (abfd, execp);
 
   return TRUE;
 }