From 22abe5566abcf48d81c4b485de722f2634d394f2 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 11 May 2015 08:52:43 -0700 Subject: [PATCH] Rename EM_486 to EM_IAMCU bfd/ * elfcode.h (elf_object_p): Replace EM_486 with EM_IAMCU. binutils/ * dwarf.c (init_dwarf_regnames): Replace EM_486 with EM_IAMCU. * readelf.c (guess_is_rela): Likewise. (dump_relocations): Likewise. (get_machine_name): Likewise. (get_elf_section_flags): Likewise. (process_section_headers): Likewise. (is_32bit_abs_reloc): Likewise. (is_32bit_pcrel_reloc): Likewise. include/elf/ * common.h (EM_486): Renamed to ... (EM_IAMCU): This. --- bfd/ChangeLog | 4 ++++ bfd/elfcode.h | 2 +- binutils/ChangeLog | 11 +++++++++++ binutils/dwarf.c | 2 +- binutils/readelf.c | 14 +++++++------- include/elf/ChangeLog | 5 +++++ include/elf/common.h | 2 +- 7 files changed, 30 insertions(+), 10 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f8e97ceee7..f2930e57f6 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2015-05-11 H.J. Lu + + * elfcode.h (elf_object_p): Replace EM_486 with EM_IAMCU. + 2015-05-10 H.J. Lu * elf32-i386.c (elf_i386_convert_mov_to_lea): Replace input_bfd diff --git a/bfd/elfcode.h b/bfd/elfcode.h index 1a9d304512..7e309cf998 100644 --- a/bfd/elfcode.h +++ b/bfd/elfcode.h @@ -712,7 +712,7 @@ elf_object_p (bfd *abfd) switch (ebd->elf_machine_code) { case EM_386: - case EM_486: + case EM_IAMCU: case EM_X86_64: case EM_OLD_SPARCV9: case EM_SPARC32PLUS: diff --git a/binutils/ChangeLog b/binutils/ChangeLog index b2271eed9d..37378a5558 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,14 @@ +2015-05-11 H.J. Lu + + * dwarf.c (init_dwarf_regnames): Replace EM_486 with EM_IAMCU. + * readelf.c (guess_is_rela): Likewise. + (dump_relocations): Likewise. + (get_machine_name): Likewise. + (get_elf_section_flags): Likewise. + (process_section_headers): Likewise. + (is_32bit_abs_reloc): Likewise. + (is_32bit_pcrel_reloc): Likewise. + 2015-04-30 Nick Clifton * readelf.c (get_machine_flags): Add description of MeP flags. diff --git a/binutils/dwarf.c b/binutils/dwarf.c index e1ed1fab13..5f773bb51d 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -5413,7 +5413,7 @@ init_dwarf_regnames (unsigned int e_machine) switch (e_machine) { case EM_386: - case EM_486: + case EM_IAMCU: init_dwarf_regnames_i386 (); break; diff --git a/binutils/readelf.c b/binutils/readelf.c index 0f5373534e..c2531ed22f 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -701,7 +701,7 @@ guess_is_rela (unsigned int e_machine) { /* Targets that use REL relocations. */ case EM_386: - case EM_486: + case EM_IAMCU: case EM_960: case EM_ARM: case EM_D10V: @@ -1178,7 +1178,7 @@ dump_relocations (FILE * file, break; case EM_386: - case EM_486: + case EM_IAMCU: rtype = elf_i386_reloc_type (type); break; @@ -2091,7 +2091,7 @@ get_machine_name (unsigned e_machine) case EM_386: return "Intel 80386"; case EM_68K: return "MC68000"; case EM_88K: return "MC88000"; - case EM_486: return "Intel 80486"; + case EM_IAMCU: return "Intel MCU"; case EM_860: return "Intel 80860"; case EM_MIPS: return "MIPS R3000"; case EM_S370: return "IBM System/370"; @@ -5252,7 +5252,7 @@ get_elf_section_flags (bfd_vma sh_flags) break; case EM_386: - case EM_486: + case EM_IAMCU: case EM_X86_64: case EM_L1OM: case EM_K1OM: @@ -5734,7 +5734,7 @@ process_section_headers (FILE * file) switch (elf_header.e_machine) { case EM_386: - case EM_486: + case EM_IAMCU: case EM_X86_64: case EM_L1OM: case EM_K1OM: @@ -11253,7 +11253,7 @@ is_32bit_abs_reloc (unsigned int reloc_type) switch (elf_header.e_machine) { case EM_386: - case EM_486: + case EM_IAMCU: return reloc_type == 1; /* R_386_32. */ case EM_68K: return reloc_type == 1; /* R_68K_32. */ @@ -11430,7 +11430,7 @@ is_32bit_pcrel_reloc (unsigned int reloc_type) switch (elf_header.e_machine) { case EM_386: - case EM_486: + case EM_IAMCU: return reloc_type == 2; /* R_386_PC32. */ case EM_68K: return reloc_type == 4; /* R_68K_PC32. */ diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index a30b2de821..c09a05b05e 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,3 +1,8 @@ +2015-05-11 H.J. Lu + + * common.h (EM_486): Renamed to ... + (EM_IAMCU): This. + 2015-04-27 Andreas Krebbel * s390.h: Define Tag_GNU_S390_ABI_Vector. diff --git a/include/elf/common.h b/include/elf/common.h index 25cfef2d6b..b087d9c80f 100644 --- a/include/elf/common.h +++ b/include/elf/common.h @@ -106,7 +106,7 @@ #define EM_386 3 /* Intel 80386 */ #define EM_68K 4 /* Motorola m68k family */ #define EM_88K 5 /* Motorola m88k family */ -#define EM_486 6 /* Intel 80486 *//* Reserved for future use */ +#define EM_IAMCU 6 /* Intel MCU */ #define EM_860 7 /* Intel 80860 */ #define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */ #define EM_S370 9 /* IBM System/370 */ -- 2.34.1