From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 17 Nov 2023 10:21:13 +0000 (+0100)
Subject: x86: use IS_ELF
X-Git-Tag: binutils-2_42~928
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed049bd6d8108f0e762c58b9c90334ea1f2cb0e9;p=thirdparty%2Fbinutils-gdb.git

x86: use IS_ELF

... instead of (inefficiently) open-coding it.
---

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 1076d51bc7d..96065ae3b71 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -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;
 	}
diff --git a/gas/config/tc-i386.h b/gas/config/tc-i386.h
index 31f2f015c74..5db25087290 100644
--- a/gas/config/tc-i386.h
+++ b/gas/config/tc-i386.h
@@ -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