Don't use bfd_get_* macro to set bfd fields

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

diff --git a/bfd/ns32knetbsd.c b/bfd/ns32knetbsd.c
index dd2c40d9e3ecf752285999336c1e58d01a8817a9..1f63b7de3be3e35ea394c3dd852ec84dd7d3b0f8 100644 (file)
--- a/bfd/ns32knetbsd.c
+++ b/bfd/ns32knetbsd.c
@@ -1,12 +1,11 @@
 /* BFD back-end for NetBSD/ns32k a.out-ish binaries.
 /* BFD back-end for NetBSD/ns32k a.out-ish binaries.

-   Copyright 1990, 1991, 1992, 1994, 1995, 1998, 2000, 2001, 2002, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1990-2019 Free Software Foundation, Inc.

 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,7 +15,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

 
 #define        BYTES_IN_WORD           4
 #undef TARGET_IS_BIG_ENDIAN_P
 
 #define        BYTES_IN_WORD           4
 #undef TARGET_IS_BIG_ENDIAN_P


@@ -25,12 +25,12 @@
 #define        SEGMENT_SIZE            4096
 
 #define        DEFAULT_ARCH            bfd_arch_ns32k
 #define        SEGMENT_SIZE            4096
 
 #define        DEFAULT_ARCH            bfd_arch_ns32k

-#define        DEFAULT_MID             M_532_NETBSD
+#define        DEFAULT_MID             M_532_NETBSD

 
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
 
 /* 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 (pc532netbsd_,OP)
+#define MY(OP) CONCAT2 (ns32k_aout_pc532nbsd_,OP)

 
 #define NAME(x,y) CONCAT3 (ns32kaout,_32_,y)
 
 
 #define NAME(x,y) CONCAT3 (ns32kaout,_32_,y)
 


@@ -43,10 +43,11 @@
 
 /* We can`t use the MYNS macro here for cpp reasons too subtle
    for me -- IWD.  */
 
 /* We can`t use the MYNS macro here for cpp reasons too subtle
    for me -- IWD.  */

-#define MY_bfd_reloc_type_lookup ns32kaout_bfd_reloc_type_lookup
+#define MY_bfd_reloc_type_lookup ns32k_aout_bfd_reloc_type_lookup

 
 

+#include "sysdep.h"

 #include "bfd.h"               /* To ensure following declaration is OK.  */
 
 #include "bfd.h"               /* To ensure following declaration is OK.  */
 

-const struct reloc_howto_struct * MY_bfd_reloc_type_lookup (bfd *, bfd_reloc_code_real_type);
+reloc_howto_type * MY_bfd_reloc_type_lookup (bfd *, bfd_reloc_code_real_type);

 
 #include "netbsd.h"
 
 #include "netbsd.h"