[1/9] gas: drop unused fields from struct emulation

Message ID 2a76b4a2-9f04-407c-8f39-cae3bfeb67a1@suse.com
State New
Headers
Series gas: tidying of emulations |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_build--master-arm fail Patch failed to apply
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 fail Patch failed to apply

Commit Message

Jan Beulich Sept. 27, 2024, 1:02 p.m. UTC
  Neither .match not .bfd_name appear to ever have been used in the last
about 25 years. Purge them.
---
Really .init is also uniformly set to common_emul_init(), but I guess
that may be a useful field to have, in case subtle runtime adjustments
need making (and I may actually have a use for that soon).
  

Patch

--- a/gas/as.c
+++ b/gas/as.c
@@ -182,13 +182,6 @@  select_emulation_mode (int argc, char **
   this_emulation->init ();
 }
 
-const char *
-default_emul_bfd_name (void)
-{
-  abort ();
-  return NULL;
-}
-
 void
 common_emul_init (void)
 {
--- a/gas/config/e-crisaout.c
+++ b/gas/config/e-crisaout.c
@@ -20,16 +20,6 @@ 
 #include "as.h"
 #include "emul.h"
 
-static const char *crisaout_bfd_name (void);
-
-static const char *
-crisaout_bfd_name (void)
-{
-  abort ();
-  return NULL;
-}
-
-#define emul_bfd_name	crisaout_bfd_name
 #define emul_format	&aout_format_ops
 
 #define emul_name	"crisaout"
--- a/gas/config/e-criself.c
+++ b/gas/config/e-criself.c
@@ -20,16 +20,6 @@ 
 #include "as.h"
 #include "emul.h"
 
-static const char *criself_bfd_name (void);
-
-static const char *
-criself_bfd_name (void)
-{
-  abort ();
-  return NULL;
-}
-
-#define emul_bfd_name	criself_bfd_name
 #define emul_format	&elf_format_ops
 
 #define emul_name	"criself"
--- a/gas/config/e-i386aout.c
+++ b/gas/config/e-i386aout.c
@@ -20,16 +20,6 @@ 
 #include "as.h"
 #include "emul.h"
 
-static const char *i386aout_bfd_name (void);
-
-static const char *
-i386aout_bfd_name (void)
-{
-  abort ();
-  return NULL;
-}
-
-#define emul_bfd_name	i386aout_bfd_name
 #define emul_format	&aout_format_ops
 
 #define emul_name	"i386aout"
--- a/gas/config/e-i386coff.c
+++ b/gas/config/e-i386coff.c
@@ -20,16 +20,6 @@ 
 #include "as.h"
 #include "emul.h"
 
-static const char *i386coff_bfd_name (void);
-
-static const char *
-i386coff_bfd_name (void)
-{
-  abort ();
-  return NULL;
-}
-
-#define emul_bfd_name	i386coff_bfd_name
 #define emul_format	&coff_format_ops
 
 #define emul_name	"i386coff"
--- a/gas/config/e-i386elf.c
+++ b/gas/config/e-i386elf.c
@@ -20,16 +20,6 @@ 
 #include "as.h"
 #include "emul.h"
 
-static const char *i386elf_bfd_name (void);
-
-static const char *
-i386elf_bfd_name (void)
-{
-  abort ();
-  return NULL;
-}
-
-#define emul_bfd_name	i386elf_bfd_name
 #define emul_format	&elf_format_ops
 
 #define emul_name	"i386elf"
--- a/gas/config/e-mipself.c
+++ b/gas/config/e-mipself.c
@@ -20,16 +20,6 @@ 
 #include "as.h"
 #include "emul.h"
 
-static const char *mipself_bfd_name (void);
-
-static const char *
-mipself_bfd_name (void)
-{
-  abort ();
-  return NULL;
-}
-
-#define emul_bfd_name	mipself_bfd_name
 #define emul_format	&elf_format_ops
 
 #define emul_name	"mipsbelf"
--- a/gas/emul-target.h
+++ b/gas/emul-target.h
@@ -22,10 +22,6 @@ 
 #define emul_init			common_emul_init
 #endif
 
-#ifndef emul_bfd_name
-#define emul_bfd_name			default_emul_bfd_name
-#endif
-
 #ifndef emul_local_labels_fb
 #define emul_local_labels_fb		0
 #endif
@@ -48,10 +44,8 @@ 
 
 struct emulation emul_struct_name =
   {
-    0,
     emul_name,
     emul_init,
-    emul_bfd_name,
     emul_local_labels_fb, emul_local_labels_dollar,
     emul_leading_underscore,
     emul_default_endian,
--- a/gas/emul.h
+++ b/gas/emul.h
@@ -23,10 +23,8 @@ 
 
 struct emulation
   {
-    void (*                   match) (const char *);
     const char *              name;
     void (*                   init) (void);
-    const char *(*            bfd_name) (void);
     unsigned                  local_labels_fb : 1;
     unsigned                  local_labels_dollar : 1;
     unsigned                  leading_underscore : 2;
@@ -37,7 +35,6 @@  struct emulation
 
 COMMON struct emulation * this_emulation;
 
-extern const char * default_emul_bfd_name (void);
 extern void common_emul_init (void);
 
 #endif