Index: archures.c
===================================================================
RCS file: /cvs/src/src/bfd/archures.c,v
retrieving revision 1.80
diff -u -p -r1.80 archures.c
--- archures.c	8 Aug 2003 10:14:50 -0000	1.80
+++ archures.c	5 Sep 2003 16:27:14 -0000
@@ -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
Index: bfd-in2.h
===================================================================
RCS file: /cvs/src/src/bfd/bfd-in2.h,v
retrieving revision 1.233
diff -u -p -r1.233 bfd-in2.h
--- bfd-in2.h	8 Aug 2003 10:14:50 -0000	1.233
+++ bfd-in2.h	5 Sep 2003 16:27:17 -0000
@@ -1629,6 +1629,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
Index: cpu-hppa.c
===================================================================
RCS file: /cvs/src/src/bfd/cpu-hppa.c,v
retrieving revision 1.5
diff -u -p -r1.5 cpu-hppa.c
--- cpu-hppa.c	30 Nov 2002 08:39:36 -0000	1.5
+++ cpu-hppa.c	5 Sep 2003 16:27:50 -0000
@@ -28,7 +28,7 @@ static const bfd_arch_info_type bfd_hppa
   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_hppa
   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_hppa
 /* 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,