1999-09-11 Donn Terry <donn@interix.com>

[deliverable/binutils-gdb.git] / bfd / archures.c

diff --git a/bfd/archures.c b/bfd/archures.c
index f62f9a7da2a4b5191e3fa55ab09eb3c50f792892..dbd75077ad884071220dd2588d6eac2b341500f2 100644 (file)
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -1,5 +1,5 @@
 /* BFD library support routines for architectures.
-   Copyright (C) 1990, 91-97, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1990, 91-98, 1999 Free Software Foundation, Inc.
    Hacked by John Gilmore and Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -112,47 +112,21 @@ DESCRIPTION
 .#define bfd_mach_sparc_v9_p(mach) \
 .  ((mach) >= bfd_mach_sparc_v8plus && (mach) <= bfd_mach_sparc_v9a)
 .  bfd_arch_mips,      {* MIPS Rxxxx *}
-. {* start-sanitize-tx19 *}
-.#define bfd_mach_mips1900             1900
-. {* end-sanitize-tx19 *}
 .#define bfd_mach_mips3000             3000
 .#define bfd_mach_mips3900             3900
 .#define bfd_mach_mips4000             4000
 .#define bfd_mach_mips4010             4010
 .#define bfd_mach_mips4100             4100
-. {* start-sanitize-vr4xxx *}
 .#define bfd_mach_mips4111             4111
-.#define bfd_mach_mips4121             4121
-. {* end-sanitize-vr4xxx *}
 .#define bfd_mach_mips4300             4300
 .#define bfd_mach_mips4400             4400
 .#define bfd_mach_mips4600             4600
 .#define bfd_mach_mips4650             4650
-. {* start-sanitize-vr4320 *}
-.#define bfd_mach_mips4320             4320
-. {* end-sanitize-vr4320 *}
-. {* start-sanitize-tx49 *}
-.#define bfd_mach_mips4900             4900
-. {* end-sanitize-tx49 *}
 .#define bfd_mach_mips5000             5000
-. {* start-sanitize-cygnus *}
-.#define bfd_mach_mips5400             5400
-. {* end-sanitize-cygnus *}
-. {* start-sanitize-r5900 *}
-.#define bfd_mach_mips5900             5900
-. {* end-sanitize-r5900 *}
 .#define bfd_mach_mips6000             6000
 .#define bfd_mach_mips8000             8000
 .#define bfd_mach_mips10000            10000
 .#define bfd_mach_mips16               16
-. {* start-sanitize-sky *}
-. {* The DVP is a machine within the mips architecture.  *}
-.#define bfd_mach_dvp_dma               42000
-.#define bfd_mach_dvp_vif               42001
-.#define bfd_mach_dvp_vu                42002
-.#define bfd_mach_dvp_gif               42003
-.#define bfd_mach_dvp_p(mach) ((mach) >= 42000 && (mach) <= 42003)
-. {* end-sanitize-sky *}
 .  bfd_arch_i386,      {* Intel 386 *}
 .#define bfd_mach_i386_i386 0
 .#define bfd_mach_i386_i8086 1
@@ -182,45 +156,38 @@ DESCRIPTION
 .#define bfd_mach_sh            0
 .#define bfd_mach_sh3        0x30
 .#define bfd_mach_sh3e       0x3e
-.#define bfd_mach_sh4        0x40
 .  bfd_arch_alpha,     {* Dec Alpha *}
 .#define bfd_mach_alpha_ev4  0x10
 .#define bfd_mach_alpha_ev5  0x20
 .#define bfd_mach_alpha_ev6  0x30
 .  bfd_arch_arm,       {* Advanced Risc Machines ARM *}
 .#define bfd_mach_arm_2                1
-.#define bfd_mach_arm_2a               2
+.#define bfd_mach_arm_2a       2
 .#define bfd_mach_arm_3                3
 .#define bfd_mach_arm_3M       4
-.#define bfd_mach_arm_4                5
+.#define bfd_mach_arm_4        5
 .#define bfd_mach_arm_4T       6
+.#define bfd_mach_arm_5        7
+.#define bfd_mach_arm_5T       8
 .  bfd_arch_ns32k,     {* National Semiconductors ns32000 *}
 .  bfd_arch_w65,       {* WDC 65816 *}
 .  bfd_arch_tic30,     {* Texas Instruments TMS320C30 *}
-. {* start-sanitize-tic80 *}
 .  bfd_arch_tic80,     {* TI TMS320c80 (MVP) *}
-. {* end-sanitize-tic80 *}
 .  bfd_arch_v850,      {* NEC V850 *}
 .#define bfd_mach_v850          0
-. {* start-sanitize-v850e *}
 .#define bfd_mach_v850e        'E'
 .#define bfd_mach_v850ea       'A'
-. {* end-sanitize-v850e *}
 .  bfd_arch_arc,       {* Argonaut RISC Core *}
 .#define bfd_mach_arc_base 0
 .  bfd_arch_m32r,      {* Mitsubishi M32R/D *}
 .#define bfd_mach_m32r         0 {* backwards compatibility *}
-. {* start-sanitize-m32rx *}
-.#define bfd_mach_m32rx                'x'
-. {* end-sanitize-m32rx *}
 .  bfd_arch_mn10200,   {* Matsushita MN10200 *}
 .  bfd_arch_mn10300,   {* Matsushita MN10300 *}
 .#define bfd_mach_mn10300              300
-. {* start-sanitize-cygnus *}
-.#define bfd_mach_am33         330
-. {* end-sanitize-cygnus *}
 .  bfd_arch_fr30,
 .#define bfd_mach_fr30         0x46523330
+.  bfd_arch_mcore,
+.  bfd_arch_pj,
 .  bfd_arch_last
 .  };
 
@@ -279,12 +246,11 @@ extern const bfd_arch_info_type bfd_mn10200_arch;
 extern const bfd_arch_info_type bfd_mn10300_arch;
 extern const bfd_arch_info_type bfd_powerpc_arch;
 extern const bfd_arch_info_type bfd_rs6000_arch;
+extern const bfd_arch_info_type bfd_pj_arch;
 extern const bfd_arch_info_type bfd_sh_arch;
 extern const bfd_arch_info_type bfd_sparc_arch;
 extern const bfd_arch_info_type bfd_tic30_arch;
-/* start-sanitize-tic80 */
 extern const bfd_arch_info_type bfd_tic80_arch;
-/* end-sanitize-tic80 */
 extern const bfd_arch_info_type bfd_vax_arch;
 extern const bfd_arch_info_type bfd_we32k_arch;
 extern const bfd_arch_info_type bfd_z8k_arch;
@@ -292,6 +258,7 @@ extern const bfd_arch_info_type bfd_ns32k_arch;
 extern const bfd_arch_info_type bfd_w65_arch;
 extern const bfd_arch_info_type bfd_v850_arch;
 extern const bfd_arch_info_type bfd_fr30_arch;
+extern const bfd_arch_info_type bfd_mcore_arch;
 
 static const bfd_arch_info_type * const bfd_archures_list[] =
 {
@@ -321,16 +288,15 @@ static const bfd_arch_info_type * const bfd_archures_list[] =
   &bfd_sh_arch,
   &bfd_sparc_arch,
   &bfd_tic30_arch,
-/* start-sanitize-tic80 */
   &bfd_tic80_arch,
-/* end-sanitize-tic80 */
   &bfd_vax_arch,
   &bfd_we32k_arch,
   &bfd_z8k_arch,
   &bfd_ns32k_arch,
   &bfd_w65_arch,
   &bfd_v850_arch,
-  & bfd_fr30_arch,
+  &bfd_fr30_arch,
+  & bfd_mcore_arch,
 #endif
   0
 };