Merge branch 'master' into merge-job

[deliverable/binutils-gdb.git] / gas / config / obj-multi.h

diff --git a/gas/config/obj-multi.h b/gas/config/obj-multi.h
index 6bb9b00ac318a289fb80d3c5b7449b46928a3664..099faadd1a96d6526587fd78d190a4eef32763f7 100644 (file)
--- a/gas/config/obj-multi.h
+++ b/gas/config/obj-multi.h
@@ -1,5 +1,5 @@
 /* Multiple object format emulation.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
+   Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -155,7 +155,10 @@
 
 #define EMIT_SECTION_SYMBOLS (this_format->emit_section_symbols)
 
+#ifndef INITIALIZING_EMULS
+/* We want to use the default FAKE_LABEL_NAME in as.c.  */
 #define FAKE_LABEL_NAME (this_emulation->fake_label_name)
+#endif
 
 #ifdef OBJ_MAYBE_ELF
 /* We need OBJ_SYMFIELD_TYPE so that symbol_get_obj is defined in symbol.c