PR ld/16021

[deliverable/binutils-gdb.git] / gdb / symfile.h

diff --git a/gdb/symfile.h b/gdb/symfile.h
index ac5b711116e3e0f539a4c0bbfe807af3f23b421c..8e5909bd8bcd0918e787154dfeb02bafa190933b 100644 (file)
--- a/gdb/symfile.h
+++ b/gdb/symfile.h
@@ -237,8 +237,9 @@ struct quick_symbol_functions
      CALLBACK returns 0 to indicate that the scan should continue, or
      non-zero to indicate that the scan should be terminated.  */
 
-  void (*map_matching_symbols) (const char *name, domain_enum namespace,
-                               struct objfile *, int global,
+  void (*map_matching_symbols) (struct objfile *,
+                               const char *name, domain_enum namespace,
+                               int global,
                                int (*callback) (struct block *,
                                                 struct symbol *, void *),
                                void *data,
@@ -349,12 +350,6 @@ struct sym_probe_fns
 
 struct sym_fns
 {
-
-  /* BFD flavour that we handle, or (as a special kludge, see
-     xcoffread.c, (enum bfd_flavour)-1 for xcoff).  */
-
-  enum bfd_flavour sym_flavour;
-
   /* Initializes anything that is global to the entire symbol table.
      It is called during symbol_file_add, when we begin debugging an
      entirely new program.  */
@@ -406,7 +401,7 @@ struct sym_fns
      the line table cannot be read while processing the debugging
      information.  */
 
-  void (*sym_read_linetable) (void);
+  void (*sym_read_linetable) (struct objfile *);
 
   /* Relocate the contents of a debug section SECTP.  The
      contents are stored in BUF if it is non-NULL, or returned in a
@@ -453,7 +448,7 @@ extern bfd_byte *default_symfile_relocate (struct objfile *objfile,
 extern struct symtab *allocate_symtab (const char *, struct objfile *)
   ATTRIBUTE_NONNULL (1);
 
-extern void add_symtab_fns (const struct sym_fns *);
+extern void add_symtab_fns (enum bfd_flavour flavour, const struct sym_fns *);
 
 /* This enum encodes bit-flags passed as ADD_FLAGS parameter to
    symbol_file_add, etc.  */