-#include "bfd.h"
+/* BFD support for the HP Precision Architecture architecture.
+ Copyright (C) 1992-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
+ 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,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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., 51 Franklin Street - Fifth Floor, Boston,
+ MA 02110-1301, USA. */
+
#include "sysdep.h"
+#include "bfd.h"
#include "libbfd.h"
-static bfd_arch_info_type arch_info_struct =
- {
- 32, /* 32 bits in a word */
- 32, /* 32 bits in an address */
- 8, /* 8 bits in a byte */
- bfd_arch_hppa,
- 0, /* only 1 machine */
- "hppa",
- "hppa",
- 3,
- true, /* the one and only */
- bfd_default_compatible,
- bfd_default_scan ,
- 0,
- 0,
- };
-
-void DEFUN_VOID(bfd_hppa_arch)
-{
- bfd_arch_linkin(&arch_info_struct);
-}
+#define N(BITS, NUMBER, PRINT, DEFAULT, NEXT) \
+ { \
+ BITS, /* Bits in a word. */ \
+ BITS, /* Bits in an address. */ \
+ 8, /* Bits in a byte. */ \
+ bfd_arch_hppa, \
+ NUMBER, \
+ "hppa", \
+ PRINT, \
+ 3, /* Section alignment power. */ \
+ DEFAULT, \
+ bfd_default_compatible, \
+ bfd_default_scan, \
+ bfd_arch_default_fill, \
+ NEXT, \
+ 0 /* Maximum offset of a reloc from the start of an insn. */ \
+ }
+
+
+static const bfd_arch_info_type bfd_hppa10_arch =
+ N (32, bfd_mach_hppa10, "hppa1.0", TRUE, NULL);
+
+/* PA2.0 in narrow mode. */
+static const bfd_arch_info_type bfd_hppa20_arch =
+ N (32, bfd_mach_hppa20, "hppa2.0", FALSE, &bfd_hppa10_arch);
+
+/* PA2.0 in wide mode. */
+static const bfd_arch_info_type bfd_hppa20w_arch =
+ N (64, bfd_mach_hppa20w, "hppa2.0w", FALSE, &bfd_hppa20_arch);
+
+const bfd_arch_info_type bfd_hppa_arch =
+ N (32, bfd_mach_hppa11, "hppa1.1", FALSE, &bfd_hppa20w_arch);