aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--binutils/ChangeLog4
-rw-r--r--binutils/readelf.c11
-rw-r--r--opcodes/ChangeLog7
-rw-r--r--opcodes/mips-dis.c21
4 files changed, 25 insertions, 18 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 7c88231..6b1d848 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-31 Eric Christopher <echristo@redhat.com>
+
+ * readelf.c (get_machine_flags): Remove E_MIPS_MACH_MIPS32_4K.
+
2001-08-29 Peter Targett <peter.targett@arccores.com>
* MAINTAINERS: Include ARC Maintainer.
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 3c29c8d..8b8e8b6 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -1639,7 +1639,6 @@ get_machine_flags (e_flags, e_machine)
case E_MIPS_MACH_4100: strcat (buf, ", 4100"); break;
case E_MIPS_MACH_4650: strcat (buf, ", 4650"); break;
case E_MIPS_MACH_4111: strcat (buf, ", 4111"); break;
- case E_MIPS_MACH_MIPS32_4K: strcat (buf, ", mips32-4k"); break;
case E_MIPS_MACH_SB1: strcat (buf, ", sb1"); break;
default: strcat (buf, " UNKNOWN"); break;
}
@@ -6384,7 +6383,7 @@ display_debug_macinfo (section, start, file)
return 1;
}
-
+
static int
display_debug_abbrev (section, start, file)
@@ -7109,7 +7108,7 @@ display_debug_info (section, start, file)
!= (bfd_vma) ((unsigned char *) &external->cu_abbrev_offset
- section_begin))
continue;
-
+
if (is_32bit_elf)
{
sym = symtab + ELF32_R_SYM (rp->r_info);
@@ -7180,7 +7179,7 @@ display_debug_info (section, start, file)
}
begin = ((unsigned char *)
- get_data (NULL, file, sec->sh_offset, sec->sh_size,
+ get_data (NULL, file, sec->sh_offset, sec->sh_size,
_("debug_abbrev section data")));
if (!begin)
return 0;
@@ -8061,7 +8060,7 @@ display_debug_section (section, file)
return 0;
}
- start = (unsigned char *) get_data (NULL, file, section->sh_offset, length,
+ start = (unsigned char *) get_data (NULL, file, section->sh_offset, length,
_("debug section data"));
if (!start)
return 0;
@@ -8124,7 +8123,7 @@ process_section_contents (file)
length = section->sh_size;
start = ((unsigned char *)
- get_data (NULL, file, section->sh_offset, length,
+ get_data (NULL, file, section->sh_offset, length,
_("debug section data")));
if (!start)
return 0;
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index e3f28d8..3d95187 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-31 Eric Christopher <echristo@redhat.com>
+ Jason Eckhardt <jle@redhat.com>
+
+ * mips-dis.c: Add support for bfd_mach_mipsisa32 and
+ bfd_mach_mipsisa64. Remove bfd_mach_mips32, bfd_mach_mips32_4k,
+ bfd_mach_mips64.
+
2001-08-31 Andreas Jaeger <aj@suse.de>
* tic54x-opc.c: Add default initializers to avoid warnings.
diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
index 58b7dcd..9112898 100644
--- a/opcodes/mips-dis.c
+++ b/opcodes/mips-dis.c
@@ -369,26 +369,23 @@ mips_isa_type (mach, isa, cputype)
*cputype = CPU_MIPS16;
*isa = ISA_MIPS3;
break;
- case bfd_mach_mips32:
- *cputype = CPU_MIPS32;
- *isa = ISA_MIPS32;
- break;
- case bfd_mach_mips32_4k:
- *cputype = CPU_MIPS32_4K;
- *isa = ISA_MIPS32;
- break;
case bfd_mach_mips5:
*cputype = CPU_MIPS5;
*isa = ISA_MIPS5;
break;
- case bfd_mach_mips64:
- *cputype = CPU_MIPS64;
- *isa = ISA_MIPS64;
- break;
case bfd_mach_mips_sb1:
*cputype = CPU_SB1;
*isa = ISA_MIPS64;
break;
+ case bfd_mach_mipsisa32:
+ * cputype = CPU_MIPS32;
+ * isa = ISA_MIPS32;
+ break;
+ case bfd_mach_mipsisa64:
+ * cputype = CPU_MIPS64;
+ * isa = ISA_MIPS64;
+ break;
+
default:
*cputype = CPU_R3000;
*isa = ISA_MIPS3;