x86: use IS_ELF

... instead of (inefficiently) open-coding it.
This commit is contained in:
Jan Beulich
2023-11-17 11:21:13 +01:00
parent 071c5d81c7
commit ed049bd6d8
2 changed files with 4 additions and 7 deletions

View File

@@ -3063,8 +3063,7 @@ i386_arch (void)
{
if (cpu_arch_isa == PROCESSOR_IAMCU)
{
if (OUTPUT_FLAVOR != bfd_target_elf_flavour
|| flag_code == CODE_64BIT)
if (!IS_ELF || flag_code == CODE_64BIT)
as_fatal (_("Intel MCU is 32bit ELF only"));
return bfd_arch_iamcu;
}
@@ -3087,7 +3086,7 @@ i386_mach (void)
{
if (cpu_arch_isa == PROCESSOR_IAMCU)
{
if (OUTPUT_FLAVOR != bfd_target_elf_flavour)
if (!IS_ELF)
as_fatal (_("Intel MCU is 32bit ELF only"));
return bfd_mach_i386_iamcu;
}

View File

@@ -154,11 +154,9 @@ extern int tc_i386_fix_adjustable (struct fix *);
/* ELF wants external syms kept, as does PE COFF. */
#if defined (TE_PE) && defined (STRICT_PE_FORMAT)
#define EXTERN_FORCE_RELOC \
(OUTPUT_FLAVOR == bfd_target_elf_flavour \
|| OUTPUT_FLAVOR == bfd_target_coff_flavour)
(IS_ELF || OUTPUT_FLAVOR == bfd_target_coff_flavour)
#else
#define EXTERN_FORCE_RELOC \
(OUTPUT_FLAVOR == bfd_target_elf_flavour)
#define EXTERN_FORCE_RELOC IS_ELF
#endif
/* This expression evaluates to true if the relocation is for a local