X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcpu-hppa.c;h=b7c39330cd49215a82aa6ff8c8723d2eb0730fe8;hb=7f99954970001cfc1b155d877ac2966d77e2c647;hp=5c1774367d5995fbc07eab7d718718c4d2731e7e;hpb=abd8680d6efd97e7ba848a6392ee3ad72be18cd0;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/cpu-hppa.c b/bfd/cpu-hppa.c
index 5c1774367d..b7c39330cd 100644
--- a/bfd/cpu-hppa.c
+++ b/bfd/cpu-hppa.c
@@ -1,24 +1,25 @@
 /* BFD support for the HP Precision Architecture architecture.
-   Copyright 1992 Free Software Foundation, Inc.
+   Copyright (C) 1992-2018 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.
 
-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
-(at your option) any later version.
+   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.
+   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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 "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 
 static const bfd_arch_info_type bfd_hppa10_arch =
@@ -27,13 +28,14 @@ static const bfd_arch_info_type bfd_hppa10_arch =
   32,				/* 32 bits in an address */
   8,				/* 8 bits in a byte */
   bfd_arch_hppa,
-  10,				/* By convention PA1.0 = 10 */
+  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 ,
+  TRUE,				/* Unless we use 1.1 specific features */
+  bfd_default_compatible,
+  bfd_default_scan,
+  bfd_arch_default_fill,
   0,
 };
 
@@ -44,30 +46,32 @@ static const bfd_arch_info_type bfd_hppa20_arch =
   32,				/* 32 bits in an address */
   8,				/* 8 bits in a byte */
   bfd_arch_hppa,
-  20,				/* By convention PA1.0 = 10 */
+  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 ,
+  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,				/* 32 bits in a word */
-  64,				/* 32 bits in an address */
+  64,				/* 64 bits in a word */
+  64,				/* 64 bits in an address */
   8,				/* 8 bits in a byte */
   bfd_arch_hppa,
-  25,				/* ??? How best to describe wide mode here?  */
+  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 ,
+  FALSE,			/* Unless we use 1.1 specific features */
+  bfd_default_compatible,
+  bfd_default_scan,
+  bfd_arch_default_fill,
   &bfd_hppa20_arch,
 };
 
@@ -77,12 +81,13 @@ const bfd_arch_info_type bfd_hppa_arch =
   32,				/* 32 bits in an address */
   8,				/* 8 bits in a byte */
   bfd_arch_hppa,
-  11,				/* By convention PA1.1 = 11 */
+  bfd_mach_hppa11,		/* By convention PA1.1 = 11 */
   "hppa",
   "hppa1.1",
   3,
-  false,			/* 1.1 specific features used */
-  bfd_default_compatible, 
-  bfd_default_scan ,
+  FALSE,			/* 1.1 specific features used */
+  bfd_default_compatible,
+  bfd_default_scan,
+  bfd_arch_default_fill,
   &bfd_hppa20w_arch,
 };