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 6c879582367b7073825d1b1e625c9dd2aed9ed1a..099faadd1a96d6526587fd78d190a4eef32763f7 100644 (file)
--- a/gas/config/obj-multi.h
+++ b/gas/config/obj-multi.h
@@ -1,6 +1,5 @@
 /* Multiple object format emulation.
-   Copyright 1995, 1996, 1997, 1999, 2000, 2002, 2004, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -81,11 +80,21 @@
         ? (*this_format->symbol_new_hook) (S)          \
         : (void) 0)
 
+#define obj_symbol_clone_hook(N, O)                    \
+       (this_format->symbol_clone_hook                 \
+        ? (*this_format->symbol_clone_hook) (N, O)     \
+        : (void) 0)
+
 #define obj_sec_sym_ok_for_reloc(A)                    \
        (this_format->sec_sym_ok_for_reloc              \
         ? (*this_format->sec_sym_ok_for_reloc) (A)     \
         : 0)
 
+#define obj_adjust_symtab()                            \
+       (this_format->adjust_symtab                     \
+        ? (*this_format->adjust_symtab) ()             \
+        : (void) 0)
+
 #define S_GET_SIZE                                     \
        (*this_format->s_get_size)
 
@@ -146,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