X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcpu-hppa.c;h=8ec1f5bb6254e89e5309932356df0165641e3e35;hb=8dbe7ca5a5755274fca1d3021ad648a1575e66cb;hp=e5f51bc7bfc894fa788aa37cb408644ede56fc9b;hpb=e3c01e92af3e19579138413fa011b96e467ee62f;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/cpu-hppa.c b/bfd/cpu-hppa.c
index e5f51bc7bf..8ec1f5bb62 100644
--- a/bfd/cpu-hppa.c
+++ b/bfd/cpu-hppa.c
@@ -1,25 +1,93 @@
-#include "bfd.h"
+/* BFD support for the HP Precision Architecture architecture.
+   Copyright (C) 1992-2015 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)
+static const bfd_arch_info_type bfd_hppa10_arch =
+{
+  32,				/* 32 bits in a word */
+  32,				/* 32 bits in an address */
+  8,				/* 8 bits in a byte */
+  bfd_arch_hppa,
+  bfd_mach_hppa10,		/* By convention PA1.0 = 10 */
+  "hppa",
+  "hppa1.0",
+  3,
+  TRUE,				/* Unless we use 1.1 specific features */
+  bfd_default_compatible,
+  bfd_default_scan,
+  bfd_arch_default_fill,
+  0,
+};
+
+/* PA2.0 in narrow mode */
+static const bfd_arch_info_type bfd_hppa20_arch =
+{
+  32,				/* 32 bits in a word */
+  32,				/* 32 bits in an address */
+  8,				/* 8 bits in a byte */
+  bfd_arch_hppa,
+  bfd_mach_hppa20,		/* By convention PA2.0 = 20 */
+  "hppa",
+  "hppa2.0",
+  3,
+  FALSE,			/* Unless we use 1.1 specific features */
+  bfd_default_compatible,
+  bfd_default_scan,
+  bfd_arch_default_fill,
+  &bfd_hppa10_arch,
+};
+
+/* PA2.0 in wide mode */
+static const bfd_arch_info_type bfd_hppa20w_arch =
+{
+  64,				/* 64 bits in a word */
+  64,				/* 64 bits in an address */
+  8,				/* 8 bits in a byte */
+  bfd_arch_hppa,
+  bfd_mach_hppa20w,		/* ??? How best to describe wide mode here?  */
+  "hppa",
+  "hppa2.0w",
+  3,
+  FALSE,			/* Unless we use 1.1 specific features */
+  bfd_default_compatible,
+  bfd_default_scan,
+  bfd_arch_default_fill,
+  &bfd_hppa20_arch,
+};
+
+const bfd_arch_info_type bfd_hppa_arch =
 {
-  bfd_arch_linkin(&arch_info_struct);
-}
+  32,				/* 32 bits in a word */
+  32,				/* 32 bits in an address */
+  8,				/* 8 bits in a byte */
+  bfd_arch_hppa,
+  bfd_mach_hppa11,		/* By convention PA1.1 = 11 */
+  "hppa",
+  "hppa1.1",
+  3,
+  FALSE,			/* 1.1 specific features used */
+  bfd_default_compatible,
+  bfd_default_scan,
+  bfd_arch_default_fill,
+  &bfd_hppa20w_arch,
+};