2004-02-16 Andrew Cagney <cagney@redhat.com>

[deliverable/binutils-gdb.git] / bfd / cpu-hppa.c

diff --git a/bfd/cpu-hppa.c b/bfd/cpu-hppa.c
index 5c1774367d5995fbc07eab7d718718c4d2731e7e..de5de7ef03c7f109078562ec7196f133f2990629 100644 (file)
--- a/bfd/cpu-hppa.c
+++ b/bfd/cpu-hppa.c
@@ -1,5 +1,6 @@
 /* BFD support for the HP Precision Architecture architecture.
-   Copyright 1992 Free Software Foundation, Inc.
+   Copyright 1992, 1995, 1998, 1999, 2000, 2002, 2003
+   Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -27,12 +28,12 @@ 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, 
+  TRUE,                                /* Unless we use 1.1 specific features */
+  bfd_default_compatible,
   bfd_default_scan ,
   0,
 };
@@ -44,12 +45,12 @@ 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, 
+  FALSE,                       /* Unless we use 1.1 specific features */
+  bfd_default_compatible,
   bfd_default_scan ,
   &bfd_hppa10_arch,
 };
@@ -57,16 +58,16 @@ static const bfd_arch_info_type bfd_hppa20_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, 
+  FALSE,                       /* Unless we use 1.1 specific features */
+  bfd_default_compatible,
   bfd_default_scan ,
   &bfd_hppa20_arch,
 };
@@ -77,12 +78,12 @@ 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, 
+  FALSE,                       /* 1.1 specific features used */
+  bfd_default_compatible,
   bfd_default_scan ,
   &bfd_hppa20w_arch,
 };