gas: drop unused fields from struct emulation Neither .match not .bfd_name appear to ever have been used in the last about 25 years. Purge them.
diff --git a/gas/as.c b/gas/as.c index 1b506f2..7117be2 100644 --- a/gas/as.c +++ b/gas/as.c
@@ -182,13 +182,6 @@ this_emulation->init (); } -const char * -default_emul_bfd_name (void) -{ - abort (); - return NULL; -} - void common_emul_init (void) {
diff --git a/gas/config/e-crisaout.c b/gas/config/e-crisaout.c index 4bd97ae..be2d1b0 100644 --- 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"
diff --git a/gas/config/e-criself.c b/gas/config/e-criself.c index 6998bee..713d851 100644 --- 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"
diff --git a/gas/config/e-i386aout.c b/gas/config/e-i386aout.c index 723a5ac..52f6fa5 100644 --- 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"
diff --git a/gas/config/e-i386coff.c b/gas/config/e-i386coff.c index 62e8631..f767a13 100644 --- 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"
diff --git a/gas/config/e-i386elf.c b/gas/config/e-i386elf.c index 99850e3..5a6ed4b 100644 --- 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"
diff --git a/gas/config/e-mipself.c b/gas/config/e-mipself.c index 42c9e7c..ed38444 100644 --- 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"
diff --git a/gas/emul-target.h b/gas/emul-target.h index d38e121..6b6064a 100644 --- 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,
diff --git a/gas/emul.h b/gas/emul.h index 635dbfd..d4c3f06 100644 --- 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 @@ COMMON struct emulation * this_emulation; -extern const char * default_emul_bfd_name (void); extern void common_emul_init (void); #endif