From 42acdc7c30d7bde7f10b3354d547a4750cbcc490 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Mon, 8 Sep 2003 16:46:02 +0000 Subject: [PATCH] * archures.c: Add new machine names for hppa. * bfd-in2.h: Regenerate. * cpu-hppa.c: Use the new machine names. --- bfd/ChangeLog | 6 ++++++ bfd/archures.c | 4 ++++ bfd/bfd-in2.h | 4 ++++ bfd/cpu-hppa.c | 12 ++++++------ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 1e4df13b40a..3e08a66140c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2003-09-08 Joel Brobecker + + * 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 * elf32-m68hc1x.h (struct m68hc11_elf_link_hash_table): Remove diff --git a/bfd/archures.c b/bfd/archures.c index 3e0cafdd3b4..9033f2826de 100644 --- 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 d81e56fad3c..a7cca3e26cd 100644 --- 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 5757e49fe63..250c630cd1d 100644 --- 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,