This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH v3 4/5] [ARC] Remove NPS-400 as a machine type
- From: Graham Markall <graham dot markall at embecosm dot com>
- To: binutils at sourceware dot org
- Cc: Claudiu dot Zissulescu at synopsys dot com, nickc at redhat dot com, Graham Markall <graham dot markall at embecosm dot com>
- Date: Mon, 20 Jun 2016 17:45:53 +0100
- Subject: [PATCH v3 4/5] [ARC] Remove NPS-400 as a machine type
- Authentication-results: sourceware.org; auth=none
- References: <cover dot 1466439864 dot git dot graham dot markall at embecosm dot com>
- References: <cover dot 1466085017 dot git dot graham dot markall at embecosm dot com> <cover dot 1466439864 dot git dot graham dot markall at embecosm dot com>
bfd/ChangeLog:
* archures.c: Remove bfd_mach_arc_nps400.
* bfd-in2.h: Likewise.
* cpu-arc.c (arch_info_struct): Likewise.
* elf32-arc.c (arc_elf_object_p, arc_elf_final_write_processing):
Likewise.
binutils/ChangeLog:
* readelf.c (decode_ARC_machine_flags): Remove E_ARC_MACH_NPS400 case.
gas/ChangeLog:
* config/tc-arc.c (cpu_type): Remove nps400 CPU type entry
* config/tc-arc.c (check_zol): Remove bfd_mach_arc_nps400 case.
include/ChangeLog:
* elf/arc.h: Remove E_ARC_MACH_NPS400
* opcode/arc.h: Remove ARC_OPCODE_NPS400
opcodes/ChangeLog:
* arc-dis.c (arc_insn_length, print_insn_arc): Remove
bfd_mach_arc_nps400.
---
bfd/ChangeLog | 8 ++++++++
bfd/archures.c | 1 -
bfd/bfd-in2.h | 1 -
bfd/cpu-arc.c | 5 ++---
bfd/elf32-arc.c | 6 ------
binutils/ChangeLog | 4 ++++
binutils/readelf.c | 3 ---
gas/ChangeLog | 7 ++++++-
gas/config/tc-arc.c | 3 ---
include/ChangeLog | 5 +++++
include/elf/arc.h | 1 -
include/opcode/arc.h | 1 -
opcodes/ChangeLog | 5 +++++
opcodes/arc-dis.c | 5 -----
14 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/bfd/archures.c b/bfd/archures.c
index a00c712..96c9109 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -375,7 +375,6 @@ DESCRIPTION
.#define bfd_mach_arc_arc601 4
.#define bfd_mach_arc_arc700 3
.#define bfd_mach_arc_arcv2 5
-.#define bfd_mach_arc_nps400 6
. bfd_arch_m32c, {* Renesas M16C/M32C. *}
.#define bfd_mach_m16c 0x75
.#define bfd_mach_m32c 0x78
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index af950a0..ebed966 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -2186,7 +2186,6 @@ enum bfd_architecture
#define bfd_mach_arc_arc601 4
#define bfd_mach_arc_arc700 3
#define bfd_mach_arc_arcv2 5
-#define bfd_mach_arc_nps400 6
bfd_arch_m32c, /* Renesas M16C/M32C. */
#define bfd_mach_m16c 0x75
#define bfd_mach_m32c 0x78
diff --git a/bfd/cpu-arc.c b/bfd/cpu-arc.c
index 472af8d..07a052b 100644
--- a/bfd/cpu-arc.c
+++ b/bfd/cpu-arc.c
@@ -47,9 +47,8 @@ static const bfd_arch_info_type arch_info_struct[] =
ARC (bfd_mach_arc_arc601, "ARC601", FALSE, &arch_info_struct[3]),
ARC (bfd_mach_arc_arc700, "ARC700", FALSE, &arch_info_struct[4]),
ARC (bfd_mach_arc_arc700, "A7", FALSE, &arch_info_struct[5]),
- ARC (bfd_mach_arc_nps400, "NPS400", FALSE, &arch_info_struct[6]),
- ARC (bfd_mach_arc_arcv2, "ARCv2", FALSE, &arch_info_struct[7]),
- ARC (bfd_mach_arc_arcv2, "EM", FALSE, &arch_info_struct[8]),
+ ARC (bfd_mach_arc_arcv2, "ARCv2", FALSE, &arch_info_struct[6]),
+ ARC (bfd_mach_arc_arcv2, "EM", FALSE, &arch_info_struct[7]),
ARC (bfd_mach_arc_arcv2, "HS", FALSE, NULL),
};
diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
index 82bfe02..0161832 100644
--- a/bfd/elf32-arc.c
+++ b/bfd/elf32-arc.c
@@ -621,9 +621,6 @@ arc_elf_object_p (bfd * abfd)
case E_ARC_MACH_ARC700:
mach = bfd_mach_arc_arc700;
break;
- case E_ARC_MACH_NPS400:
- mach = bfd_mach_arc_nps400;
- break;
case EF_ARC_CPU_ARCV2HS:
case EF_ARC_CPU_ARCV2EM:
mach = bfd_mach_arc_arcv2;
@@ -673,9 +670,6 @@ arc_elf_final_write_processing (bfd * abfd,
case bfd_mach_arc_arc700:
emf = EM_ARC_COMPACT;
break;
- case bfd_mach_arc_nps400:
- emf = EM_ARC_COMPACT;
- break;
case bfd_mach_arc_arcv2:
emf = EM_ARC_COMPACT2;
break;
diff --git a/binutils/readelf.c b/binutils/readelf.c
index ac278a4..8145918 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -2381,9 +2381,6 @@ decode_ARC_machine_flags (unsigned e_flags, unsigned e_machine, char buf[])
case E_ARC_MACH_ARC700:
strcat (buf, ", ARC700");
break;
- case E_ARC_MACH_NPS400:
- strcat (buf, ", NPS400");
- break;
/* The only times we should end up here are (a) A corrupt ELF, (b) A
new ELF with new architecture being read by an old version of
diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c
index 174fb69..f7e84d7 100644
--- a/gas/config/tc-arc.c
+++ b/gas/config/tc-arc.c
@@ -428,8 +428,6 @@ static const struct cpu_type
E_ARC_MACH_ARC600, 0x00},
{ "arc700", ARC_OPCODE_ARC700, bfd_mach_arc_arc700,
E_ARC_MACH_ARC700, 0x00},
- { "nps400", ARC_OPCODE_ARC700 | ARC_OPCODE_NPS400, bfd_mach_arc_nps400,
- E_ARC_MACH_NPS400, 0x00},
{ "arcem", ARC_OPCODE_ARCv2EM, bfd_mach_arc_arcv2,
EF_ARC_CPU_ARCV2EM, 0x00},
{ "archs", ARC_OPCODE_ARCv2HS, bfd_mach_arc_arcv2,
@@ -4114,7 +4112,6 @@ check_zol (symbolS *s)
end of the ZOL label @%s"), S_GET_NAME (s));
/* Fall through. */
- case bfd_mach_arc_nps400:
case bfd_mach_arc_arc700:
if (arc_last_insns[0].has_delay_slot)
as_bad (_("An illegal use of delay slot detected at the end of the ZOL label @%s"),
diff --git a/include/elf/arc.h b/include/elf/arc.h
index 2aed25d..47381f3 100644
--- a/include/elf/arc.h
+++ b/include/elf/arc.h
@@ -48,7 +48,6 @@ END_RELOC_NUMBERS (R_ARC_max)
#define E_ARC_MACH_ARC600 0x00000002
#define E_ARC_MACH_ARC601 0x00000004
#define E_ARC_MACH_ARC700 0x00000003
-#define E_ARC_MACH_NPS400 0x00000007
#define EF_ARC_CPU_ARCV2EM 0x00000005
#define EF_ARC_CPU_ARCV2HS 0x00000006
diff --git a/include/opcode/arc.h b/include/opcode/arc.h
index c3a007c..f8f1955 100644
--- a/include/opcode/arc.h
+++ b/include/opcode/arc.h
@@ -173,7 +173,6 @@ extern const struct arc_opcode arc_opcodes[];
#define ARC_OPCODE_ARC700 0x0002 /* ARC 700 specific insns. */
#define ARC_OPCODE_ARCv2EM 0x0004 /* ARCv2 EM specific insns. */
#define ARC_OPCODE_ARCv2HS 0x0008 /* ARCv2 HS specific insns. */
-#define ARC_OPCODE_NPS400 0x0010 /* NPS400 specific insns. */
/* CPU combi. */
#define ARC_OPCODE_ARCALL (ARC_OPCODE_ARC600 | ARC_OPCODE_ARC700 \
diff --git a/opcodes/arc-dis.c b/opcodes/arc-dis.c
index f69f1f5..1d1dcd8 100644
--- a/opcodes/arc-dis.c
+++ b/opcodes/arc-dis.c
@@ -557,7 +557,6 @@ arc_insn_length (bfd_byte msb, bfd_byte lsb, struct disassemble_info *info)
switch (info->mach)
{
- case bfd_mach_arc_nps400:
case bfd_mach_arc_arc700:
/* The nps400 extension set requires this special casing of the
instruction length calculation. Right now this is not causing any
@@ -724,10 +723,6 @@ print_insn_arc (bfd_vma memaddr,
switch (info->mach)
{
- case bfd_mach_arc_nps400:
- isa_mask = ARC_OPCODE_ARC700 | ARC_OPCODE_NPS400;
- break;
-
case bfd_mach_arc_arc700:
isa_mask = ARC_OPCODE_ARC700;
break;
--
2.5.5