From c0334580516d147fb0257a2df47ac7b1072f6e82 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Tue, 15 Mar 2016 19:09:23 +0000 Subject: [PATCH] arc: Remove duplicated constant in include/elf/arc.h In the include/elf/arc.h there are two constants that mask out the machine architecture field. One is used lots (EF_ARC_MACH_MSK), the other is used only once (EF_ARC_MACH). Remove EF_ARC_MACH. bfd/ChangeLog: * elf32-arc.c (arc_elf_final_write_processing): Switch to using EF_ARC_MACH_MSK. include/ChangeLog: * elf/arc.h (EF_ARC_MACH): Delete. (EF_ARC_MACH_MSK): Remove out of date comment. --- bfd/ChangeLog | 5 +++++ bfd/elf32-arc.c | 2 +- include/ChangeLog | 5 +++++ include/elf/arc.h | 5 ----- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index fe63bd39206..f1bc44abe73 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2016-03-21 Andrew Burgess + + * elf32-arc.c (arc_elf_final_write_processing): Switch to using + EF_ARC_MACH_MSK. + 2016-03-21 Nick Clifton * warning.m4 (GCC_WARN_CFLAGS): Add -Wstack-usage=262144 diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c index 4090b7a7717..7c856d01a58 100644 --- a/bfd/elf32-arc.c +++ b/bfd/elf32-arc.c @@ -673,7 +673,7 @@ arc_elf_final_write_processing (bfd * abfd, default: abort (); } - if ((elf_elfheader (abfd)->e_flags & EF_ARC_MACH) == EF_ARC_CPU_GENERIC) + if ((elf_elfheader (abfd)->e_flags & EF_ARC_MACH_MSK) == EF_ARC_CPU_GENERIC) elf_elfheader (abfd)->e_flags |= val; elf_elfheader (abfd)->e_machine = emf; diff --git a/include/ChangeLog b/include/ChangeLog index 8b488240f02..7ce9cfad886 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2016-03-21 Andrew Burgess + + * elf/arc.h (EF_ARC_MACH): Delete. + (EF_ARC_MACH_MSK): Remove out of date comment. + 2016-03-21 Andrew Burgess * opcode/arc.h (ARC_OPCODE_BASE): Delete. diff --git a/include/elf/arc.h b/include/elf/arc.h index e535f247b6c..0b7546521c7 100644 --- a/include/elf/arc.h +++ b/include/elf/arc.h @@ -39,15 +39,10 @@ END_RELOC_NUMBERS (R_ARC_max) /* Processor specific flags for the ELF header e_flags field. */ -/* Four bit ARC machine type field. */ #define EF_ARC_MACH_MSK 0x000000ff #define EF_ARC_OSABI_MSK 0x00000f00 #define EF_ARC_ALL_MSK (EF_ARC_MACH_MSK | EF_ARC_OSABI_MSK) -/* Four bit ARC machine type field. */ - -#define EF_ARC_MACH 0x0000000f - /* Various CPU types. */ #define E_ARC_MACH_ARC600 0x00000002 #define E_ARC_MACH_ARC601 0x00000004 -- 2.30.2