From 86b0c8dda0b762fe3af25fb41bb04a63183d58d7 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 20 Mar 2019 18:35:16 +1030 Subject: [PATCH] Remove strip_underscore from struct emulation This field is unused. I would have liked to also remove leading_underscore and fake_label_name but in an i386-elf/coff/aout multi-obj setup those fields are used to select a different fake_label_name for aout. * emul.h (struct emulation): Delete strip_underscore. * emul-target.h (emul_strip_underscore): Don't define. (emul_struct_name): Update initialization. --- gas/ChangeLog | 6 ++++++ gas/emul-target.h | 6 +----- gas/emul.h | 1 - 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 46a54f78ddd..e2e882a55e1 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2019-03-21 Alan Modra + + * emul.h (struct emulation): Delete strip_underscore. + * emul-target.h (emul_strip_underscore): Don't define. + (emul_struct_name): Update initialization. + 2019-03-21 Alan Modra * config/tc-d10v.c (md_apply_fix): Apply BFD_RELOC_8. diff --git a/gas/emul-target.h b/gas/emul-target.h index bbc4ad16d5a..92b9b1b4beb 100644 --- a/gas/emul-target.h +++ b/gas/emul-target.h @@ -38,10 +38,6 @@ #define emul_leading_underscore 2 #endif -#ifndef emul_strip_underscore -#define emul_strip_underscore 0 -#endif - #ifndef emul_default_endian #define emul_default_endian 2 #endif @@ -57,7 +53,7 @@ struct emulation emul_struct_name = emul_init, emul_bfd_name, emul_local_labels_fb, emul_local_labels_dollar, - emul_leading_underscore, emul_strip_underscore, + emul_leading_underscore, emul_default_endian, emul_fake_label_name, emul_format, diff --git a/gas/emul.h b/gas/emul.h index 7cf8c85a9ed..9266c65a50c 100644 --- a/gas/emul.h +++ b/gas/emul.h @@ -30,7 +30,6 @@ struct emulation unsigned local_labels_fb : 1; unsigned local_labels_dollar : 1; unsigned leading_underscore : 2; - unsigned strip_underscore : 1; unsigned default_endian : 2; const char * fake_label_name; const struct format_ops * format; -- 2.30.2