From 3c02b2abd682691244e6e039c5e232a506038142 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Fri, 31 Aug 2001 21:06:40 +0000 Subject: [PATCH] 2001-08-31 Eric Christopher Jason Eckhardt * config/tc-mips.c (mips_cpu_info): Add support for mipsisa32, 5kc, and 20kc. Clean up old entries. --- gas/ChangeLog | 10 ++++++++-- gas/config/tc-mips.c | 27 ++++++++++----------------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 5f7d54a5692..5bb6f2b2af0 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2001-08-31 Eric Christopher + Jason Eckhardt + + * config/tc-mips.c (mips_cpu_info): Add support for mipsisa32, + 5kc, and 20kc. Clean up old entries. + Fri Aug 31 12:05:13 2001 J"orn Rennecke Jeff Law @@ -17,13 +23,13 @@ Thu Aug 30 12:05:13 2001 J"orn Rennecke Wed Aug 29 12:49:58 2001 Jeffrey A Law (law@cygnus.com) - * config/tc-h8300.c (h8300hmode): Record the machine type + * config/tc-h8300.c (h8300hmode): Record the machine type if BFD_ASSEMBLER is defined. (h8300smode, md_begin): Similarly. 2001-08-29 Joel Sherrill - * configure.in (i[3456]86-*-rtems*, m68*-*-rtems*): Change + * configure.in (i[3456]86-*-rtems*, m68*-*-rtems*): Change default from coff to elf. * configure: Regenerate. diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 906641dfe58..8057de9e6c8 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -9372,7 +9372,6 @@ MIPS options:\n\ show (stream, "8000", &column, &first); show (stream, "10000", &column, &first); show (stream, "12000", &column, &first); - show (stream, "mips32-4k", &column, &first); show (stream, "sb-1", &column, &first); fputc ('\n', stream); @@ -12068,17 +12067,20 @@ static const struct mips_cpu_info mips_cpu_info_table[] = /* MIPS32 ISA */ { "MIPS32", 1, ISA_MIPS32, CPU_MIPS32, }, + { "mipsisa32", 0, ISA_MIPS32, CPU_MIPS32, }, { "Generic-MIPS32", 0, ISA_MIPS32, CPU_MIPS32, }, + { "4kc", 0, ISA_MIPS32, CPU_MIPS32, }, + { "4km", 0, ISA_MIPS32, CPU_MIPS32, }, + { "4kp", 0, ISA_MIPS32, CPU_MIPS32, }, + + /* For historical reasons. */ + { "MIPS64", 1, ISA_MIPS3, CPU_R4000, }, -#if 1 - /* XXX for now, MIPS64 -> MIPS3 because of history */ - { "MIPS64", 1, ISA_MIPS3, CPU_R4000 }, /* XXX! */ -#else /* MIPS64 ISA */ - { "MIPS64", 1, ISA_MIPS64, CPU_MIPS64 }, -#endif - { "mips64isa", 1, ISA_MIPS64, CPU_MIPS64 }, + { "mipsisa64", 1, ISA_MIPS64, CPU_MIPS64, }, { "Generic-MIPS64", 0, ISA_MIPS64, CPU_MIPS64, }, + { "5kc", 0, ISA_MIPS64, CPU_MIPS64, }, + { "20kc", 0, ISA_MIPS64, CPU_MIPS64, }, /* R2000 CPU */ { "R2000", 0, ISA_MIPS1, CPU_R2000, }, @@ -12182,15 +12184,6 @@ static const struct mips_cpu_info mips_cpu_info_table[] = { "r5k", 0, ISA_MIPS4, CPU_R5000, }, { "r7000", 0, ISA_MIPS4, CPU_R5000, }, - /* MIPS32 4K CPU */ - { "MIPS32-4K", 0, ISA_MIPS32, CPU_MIPS32_4K, }, - { "4kc", 0, ISA_MIPS32, CPU_MIPS32_4K, }, - { "4km", 0, ISA_MIPS32, CPU_MIPS32_4K, }, - { "4kp", 0, ISA_MIPS32, CPU_MIPS32_4K, }, - { "mips32-4kc", 0, ISA_MIPS32, CPU_MIPS32_4K, }, - { "mips32-4km", 0, ISA_MIPS32, CPU_MIPS32_4K, }, - { "mips32-4kp", 0, ISA_MIPS32, CPU_MIPS32_4K, }, - /* SiByte SB-1 CPU */ { "SB-1", 0, ISA_MIPS64, CPU_SB1, }, { "sb-1250", 0, ISA_MIPS64, CPU_SB1, }, -- 2.30.2