* archures.c: Add new machine names for hppa.

        * bfd-in2.h: Regenerate.
        * cpu-hppa.c: Use the new machine names.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1e4df13b40a20adf9610c9e35fa69a303c6c8293..3e08a66140cc7d53216e9e1e6d63d681e91b8ed3 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-08  Joel Brobecker  <[email protected]>
+
+       * archures.c: Add new machine names for hppa.
+       * bfd-in2.h: Regenerate.
+       * cpu-hppa.c: Use the new machine names.
+
 2003-09-06  Stephane Carrez  <[email protected]>
 
        * elf32-m68hc1x.h (struct m68hc11_elf_link_hash_table): Remove

diff --git a/bfd/archures.c b/bfd/archures.c
index 3e0cafdd3b40d25fb1298adffbf7ed2eca7d5db3..9033f2826de71bd95f256afb117e78f5d0bd9577 100644 (file)
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -199,6 +199,10 @@ DESCRIPTION
 .#define bfd_mach_rs6k_rsc     6003
 .#define bfd_mach_rs6k_rs2     6002
 .  bfd_arch_hppa,      {* HP PA RISC *}
+.#define bfd_mach_hppa10       10
+.#define bfd_mach_hppa11       11
+.#define bfd_mach_hppa20       20
+.#define bfd_mach_hppa20w      25
 .  bfd_arch_d10v,      {* Mitsubishi D10V *}
 .#define bfd_mach_d10v         1
 .#define bfd_mach_d10v_ts2     2

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index d81e56fad3c318a28a00c468c695de8b50095efe..a7cca3e26cde616e8227902120067c591af333f9 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1628,6 +1628,10 @@ enum bfd_architecture
 #define bfd_mach_rs6k_rsc      6003
 #define bfd_mach_rs6k_rs2      6002
   bfd_arch_hppa,      /* HP PA RISC */
+#define bfd_mach_hppa10        10
+#define bfd_mach_hppa11        11
+#define bfd_mach_hppa20        20
+#define bfd_mach_hppa20w       25
   bfd_arch_d10v,      /* Mitsubishi D10V */
 #define bfd_mach_d10v          1
 #define bfd_mach_d10v_ts2      2

diff --git a/bfd/cpu-hppa.c b/bfd/cpu-hppa.c
index 5757e49fe63cc17e740000ea28af214882be7390..250c630cd1dbaeb6974e7a29d52e2fe27777b411 100644 (file)
--- a/bfd/cpu-hppa.c
+++ b/bfd/cpu-hppa.c
@@ -28,7 +28,7 @@ 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,
@@ -45,7 +45,7 @@ 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,
@@ -58,11 +58,11 @@ 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,
@@ -78,7 +78,7 @@ 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,