From 686e4055ef51f366a0ccb26548bcdabdfea7f8b6 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 14 Oct 2002 05:16:42 +0000 Subject: [PATCH] * archures.c (bfd_mach_i386_i386, bfd_mach_i386_i8086, bfd_mach_i386_i386_intel_syntax, bfd_mach_x86_64, bfd_mach_x86_64_intel_syntax bfd_mach_ppc, bfd_mach_ppc64, bfd_mach_rs6k, bfd_mach_d10v, bfd_mach_sh, bfd_mach_v850, bfd_mach_arc_5, bfd_mach_arc_6, bfd_mach_arc_7, bfd_mach_arc_8, bfd_mach_m32r, bfd_mach_frv, bfd_mach_frvsimple, bfd_mach_ia64_elf64, bfd_mach_ia64_elf32, bfd_mach_ip2022, bfd_mach_ip2022ext, bfd_mach_s390_31, bfd_mach_s390_64, bfd_mach_xstormy16): Renumber. * bfd-in2.h: Regenerate. --- bfd/ChangeLog | 13 +++++++++++++ bfd/archures.c | 50 +++++++++++++++++++++++++------------------------- bfd/bfd-in2.h | 50 +++++++++++++++++++++++++------------------------- 3 files changed, 63 insertions(+), 50 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4620c74..694b06d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,16 @@ +2002-10-14 Alan Modra + + * archures.c (bfd_mach_i386_i386, bfd_mach_i386_i8086, + bfd_mach_i386_i386_intel_syntax, bfd_mach_x86_64, + bfd_mach_x86_64_intel_syntax bfd_mach_ppc, bfd_mach_ppc64, + bfd_mach_rs6k, bfd_mach_d10v, bfd_mach_sh, bfd_mach_v850, + bfd_mach_arc_5, bfd_mach_arc_6, bfd_mach_arc_7, bfd_mach_arc_8, + bfd_mach_m32r, bfd_mach_frv, bfd_mach_frvsimple, + bfd_mach_ia64_elf64, bfd_mach_ia64_elf32, + bfd_mach_ip2022, bfd_mach_ip2022ext, + bfd_mach_s390_31, bfd_mach_s390_64, bfd_mach_xstormy16): Renumber. + * bfd-in2.h: Regenerate. + 2002-10-14 Kaz Kojima * config.bfd (sh*eb-*-linux*, sh*-*-linux*): Add the alternative diff --git a/bfd/archures.c b/bfd/archures.c index f84fc13..1ab0cfa 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -147,11 +147,11 @@ DESCRIPTION .#define bfd_mach_mipsisa32 32 .#define bfd_mach_mipsisa64 64 . bfd_arch_i386, {* Intel 386 *} -.#define bfd_mach_i386_i386 0 -.#define bfd_mach_i386_i8086 1 -.#define bfd_mach_i386_i386_intel_syntax 2 -.#define bfd_mach_x86_64 3 -.#define bfd_mach_x86_64_intel_syntax 4 +.#define bfd_mach_i386_i386 1 +.#define bfd_mach_i386_i8086 2 +.#define bfd_mach_i386_i386_intel_syntax 3 +.#define bfd_mach_x86_64 64 +.#define bfd_mach_x86_64_intel_syntax 65 . bfd_arch_we32k, {* AT&T WE32xxx *} . bfd_arch_tahoe, {* CCI/Harris Tahoe *} . bfd_arch_i860, {* Intel 860 *} @@ -167,8 +167,8 @@ DESCRIPTION .#define bfd_mach_h8300s 3 . bfd_arch_pdp11, {* DEC PDP-11 *} . bfd_arch_powerpc, {* PowerPC *} -.#define bfd_mach_ppc 0 -.#define bfd_mach_ppc64 1 +.#define bfd_mach_ppc 32 +.#define bfd_mach_ppc64 64 .#define bfd_mach_ppc_403 403 .#define bfd_mach_ppc_403gc 4030 .#define bfd_mach_ppc_505 505 @@ -187,13 +187,13 @@ DESCRIPTION .#define bfd_mach_ppc_7400 7400 .#define bfd_mach_ppc_e500 500 . bfd_arch_rs6000, {* IBM RS/6000 *} -.#define bfd_mach_rs6k 0 +.#define bfd_mach_rs6k 6000 .#define bfd_mach_rs6k_rs1 6001 .#define bfd_mach_rs6k_rsc 6003 .#define bfd_mach_rs6k_rs2 6002 . bfd_arch_hppa, {* HP PA RISC *} . bfd_arch_d10v, {* Mitsubishi D10V *} -.#define bfd_mach_d10v 0 +.#define bfd_mach_d10v 1 .#define bfd_mach_d10v_ts2 2 .#define bfd_mach_d10v_ts3 3 . bfd_arch_d30v, {* Mitsubishi D30V *} @@ -205,7 +205,7 @@ DESCRIPTION .#define bfd_mach_z8002 2 . bfd_arch_h8500, {* Hitachi H8/500 *} . bfd_arch_sh, {* Hitachi SH *} -.#define bfd_mach_sh 0 +.#define bfd_mach_sh 1 .#define bfd_mach_sh2 0x20 .#define bfd_mach_sh_dsp 0x2d .#define bfd_mach_sh3 0x30 @@ -237,15 +237,15 @@ DESCRIPTION . bfd_arch_tic54x, {* Texas Instruments TMS320C54X *} . bfd_arch_tic80, {* TI TMS320c80 (MVP) *} . bfd_arch_v850, {* NEC V850 *} -.#define bfd_mach_v850 0 +.#define bfd_mach_v850 1 .#define bfd_mach_v850e 'E' . bfd_arch_arc, {* ARC Cores *} -.#define bfd_mach_arc_5 0 -.#define bfd_mach_arc_6 1 -.#define bfd_mach_arc_7 2 -.#define bfd_mach_arc_8 3 +.#define bfd_mach_arc_5 5 +.#define bfd_mach_arc_6 6 +.#define bfd_mach_arc_7 7 +.#define bfd_mach_arc_8 8 . bfd_arch_m32r, {* Mitsubishi M32R/D *} -.#define bfd_mach_m32r 0 {* For backwards compatibility. *} +.#define bfd_mach_m32r 1 {* For backwards compatibility. *} .#define bfd_mach_m32rx 'x' . bfd_arch_mn10200, {* Matsushita MN10200 *} . bfd_arch_mn10300, {* Matsushita MN10300 *} @@ -254,19 +254,19 @@ DESCRIPTION . bfd_arch_fr30, .#define bfd_mach_fr30 0x46523330 . bfd_arch_frv, -.#define bfd_mach_frv 0 -.#define bfd_mach_frvsimple 1 +.#define bfd_mach_frv 1 +.#define bfd_mach_frvsimple 2 .#define bfd_mach_fr300 300 .#define bfd_mach_fr400 400 .#define bfd_mach_frvtomcat 499 {* fr500 prototype *} .#define bfd_mach_fr500 500 . bfd_arch_mcore, . bfd_arch_ia64, {* HP/Intel ia64 *} -.#define bfd_mach_ia64_elf64 0 -.#define bfd_mach_ia64_elf32 1 +.#define bfd_mach_ia64_elf64 64 +.#define bfd_mach_ia64_elf32 32 . bfd_arch_ip2k, {* Ubicom IP2K microcontrollers. *} -.#define bfd_mach_ip2022 0 -.#define bfd_mach_ip2022ext 1 +.#define bfd_mach_ip2022 1 +.#define bfd_mach_ip2022ext 2 . bfd_arch_pj, . bfd_arch_avr, {* Atmel AVR microcontrollers. *} .#define bfd_mach_avr1 1 @@ -276,12 +276,12 @@ DESCRIPTION .#define bfd_mach_avr5 5 . bfd_arch_cris, {* Axis CRIS *} . bfd_arch_s390, {* IBM s390 *} -.#define bfd_mach_s390_31 0 -.#define bfd_mach_s390_64 1 +.#define bfd_mach_s390_31 31 +.#define bfd_mach_s390_64 64 . bfd_arch_openrisc, {* OpenRISC *} . bfd_arch_mmix, {* Donald Knuth's educational processor. *} . bfd_arch_xstormy16, -.#define bfd_mach_xstormy16 0 +.#define bfd_mach_xstormy16 1 . bfd_arch_last . }; */ diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 5f226d4..f5b262c 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -1542,11 +1542,11 @@ enum bfd_architecture #define bfd_mach_mipsisa32 32 #define bfd_mach_mipsisa64 64 bfd_arch_i386, /* Intel 386 */ -#define bfd_mach_i386_i386 0 -#define bfd_mach_i386_i8086 1 -#define bfd_mach_i386_i386_intel_syntax 2 -#define bfd_mach_x86_64 3 -#define bfd_mach_x86_64_intel_syntax 4 +#define bfd_mach_i386_i386 1 +#define bfd_mach_i386_i8086 2 +#define bfd_mach_i386_i386_intel_syntax 3 +#define bfd_mach_x86_64 64 +#define bfd_mach_x86_64_intel_syntax 65 bfd_arch_we32k, /* AT&T WE32xxx */ bfd_arch_tahoe, /* CCI/Harris Tahoe */ bfd_arch_i860, /* Intel 860 */ @@ -1562,8 +1562,8 @@ enum bfd_architecture #define bfd_mach_h8300s 3 bfd_arch_pdp11, /* DEC PDP-11 */ bfd_arch_powerpc, /* PowerPC */ -#define bfd_mach_ppc 0 -#define bfd_mach_ppc64 1 +#define bfd_mach_ppc 32 +#define bfd_mach_ppc64 64 #define bfd_mach_ppc_403 403 #define bfd_mach_ppc_403gc 4030 #define bfd_mach_ppc_505 505 @@ -1582,13 +1582,13 @@ enum bfd_architecture #define bfd_mach_ppc_7400 7400 #define bfd_mach_ppc_e500 500 bfd_arch_rs6000, /* IBM RS/6000 */ -#define bfd_mach_rs6k 0 +#define bfd_mach_rs6k 6000 #define bfd_mach_rs6k_rs1 6001 #define bfd_mach_rs6k_rsc 6003 #define bfd_mach_rs6k_rs2 6002 bfd_arch_hppa, /* HP PA RISC */ bfd_arch_d10v, /* Mitsubishi D10V */ -#define bfd_mach_d10v 0 +#define bfd_mach_d10v 1 #define bfd_mach_d10v_ts2 2 #define bfd_mach_d10v_ts3 3 bfd_arch_d30v, /* Mitsubishi D30V */ @@ -1600,7 +1600,7 @@ enum bfd_architecture #define bfd_mach_z8002 2 bfd_arch_h8500, /* Hitachi H8/500 */ bfd_arch_sh, /* Hitachi SH */ -#define bfd_mach_sh 0 +#define bfd_mach_sh 1 #define bfd_mach_sh2 0x20 #define bfd_mach_sh_dsp 0x2d #define bfd_mach_sh3 0x30 @@ -1632,15 +1632,15 @@ enum bfd_architecture bfd_arch_tic54x, /* Texas Instruments TMS320C54X */ bfd_arch_tic80, /* TI TMS320c80 (MVP) */ bfd_arch_v850, /* NEC V850 */ -#define bfd_mach_v850 0 +#define bfd_mach_v850 1 #define bfd_mach_v850e 'E' bfd_arch_arc, /* ARC Cores */ -#define bfd_mach_arc_5 0 -#define bfd_mach_arc_6 1 -#define bfd_mach_arc_7 2 -#define bfd_mach_arc_8 3 +#define bfd_mach_arc_5 5 +#define bfd_mach_arc_6 6 +#define bfd_mach_arc_7 7 +#define bfd_mach_arc_8 8 bfd_arch_m32r, /* Mitsubishi M32R/D */ -#define bfd_mach_m32r 0 /* For backwards compatibility. */ +#define bfd_mach_m32r 1 /* For backwards compatibility. */ #define bfd_mach_m32rx 'x' bfd_arch_mn10200, /* Matsushita MN10200 */ bfd_arch_mn10300, /* Matsushita MN10300 */ @@ -1649,19 +1649,19 @@ enum bfd_architecture bfd_arch_fr30, #define bfd_mach_fr30 0x46523330 bfd_arch_frv, -#define bfd_mach_frv 0 -#define bfd_mach_frvsimple 1 +#define bfd_mach_frv 1 +#define bfd_mach_frvsimple 2 #define bfd_mach_fr300 300 #define bfd_mach_fr400 400 #define bfd_mach_frvtomcat 499 /* fr500 prototype */ #define bfd_mach_fr500 500 bfd_arch_mcore, bfd_arch_ia64, /* HP/Intel ia64 */ -#define bfd_mach_ia64_elf64 0 -#define bfd_mach_ia64_elf32 1 +#define bfd_mach_ia64_elf64 64 +#define bfd_mach_ia64_elf32 32 bfd_arch_ip2k, /* Ubicom IP2K microcontrollers. */ -#define bfd_mach_ip2022 0 -#define bfd_mach_ip2022ext 1 +#define bfd_mach_ip2022 1 +#define bfd_mach_ip2022ext 2 bfd_arch_pj, bfd_arch_avr, /* Atmel AVR microcontrollers. */ #define bfd_mach_avr1 1 @@ -1671,12 +1671,12 @@ enum bfd_architecture #define bfd_mach_avr5 5 bfd_arch_cris, /* Axis CRIS */ bfd_arch_s390, /* IBM s390 */ -#define bfd_mach_s390_31 0 -#define bfd_mach_s390_64 1 +#define bfd_mach_s390_31 31 +#define bfd_mach_s390_64 64 bfd_arch_openrisc, /* OpenRISC */ bfd_arch_mmix, /* Donald Knuth's educational processor. */ bfd_arch_xstormy16, -#define bfd_mach_xstormy16 0 +#define bfd_mach_xstormy16 1 bfd_arch_last }; -- 2.7.4