solib_global_lookup: Fetch arch from objfile, not target_gdbarch.

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

diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index 6684278abf5157b34d081130c564841db760e4a6..b14aab09dff6d9147b800e3739b32553091ae322 100644 (file)
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -427,12 +427,9 @@ struct objfile
 #define OBJF_REORDERED (1 << 0)        /* Functions are reordered */
 
 /* Distinguish between an objfile for a shared library and a "vanilla"
-   objfile.  (If not set, the objfile may still actually be a solib.
-   This can happen if the user created the objfile by using the
-   add-symbol-file command.  GDB doesn't in that situation actually
-   check whether the file is a solib.  Rather, the target's
-   implementation of the solib interface is responsible for setting
-   this flag when noticing solibs used by an inferior.)  */
+   objfile.  This may come from a target's implementation of the solib
+   interface, from add-symbol-file, or any other mechanism that loads
+   dynamic objects.  */
 
 #define OBJF_SHARED     (1 << 1)       /* From a shared library */
 
@@ -468,7 +465,7 @@ struct objfile
 
 extern struct objfile *allocate_objfile (bfd *, const char *name, int);
 
-extern struct gdbarch *get_objfile_arch (struct objfile *);
+extern struct gdbarch *get_objfile_arch (const struct objfile *);
 
 extern int entry_point_address_query (CORE_ADDR *entry_p);
 
@@ -515,12 +512,11 @@ extern void objfiles_changed (void);
 
 extern int is_addr_in_objfile (CORE_ADDR addr, const struct objfile *objfile);
 
-/* Return true if ADDRESS maps into one of the sections of the
-   userloaded ("add-symbol-file") objfiles of PSPACE and false
-   otherwise.  */
+/* Return true if ADDRESS maps into one of the sections of a
+   OBJF_SHARED objfile of PSPACE and false otherwise.  */
 
-extern int userloaded_objfile_contains_address_p (struct program_space *pspace,
-                                                 CORE_ADDR address);
+extern int shared_objfile_contains_address_p (struct program_space *pspace,
+                                             CORE_ADDR address);
 
 /* This operation deletes all objfile entries that represent solibs that
    weren't explicitly loaded by the user, via e.g., the add-symbol-file
@@ -582,11 +578,6 @@ extern void default_iterate_over_objfiles_in_search_order
 #define ALL_PSPACE_OBJFILES(ss, obj)                                   \
   for ((obj) = ss->objfiles; (obj) != NULL; (obj) = (obj)->next)
 
-#define ALL_PSPACE_OBJFILES_SAFE(ss, obj, nxt)         \
-  for ((obj) = ss->objfiles;                   \
-       (obj) != NULL? ((nxt)=(obj)->next,1) :0;        \
-       (obj) = (nxt))
-
 #define ALL_OBJFILES(obj)                          \
   for ((obj) = current_program_space->objfiles; \
        (obj) != NULL;                              \
@@ -622,10 +613,6 @@ extern void default_iterate_over_objfiles_in_search_order
   ALL_OBJFILES (objfile)        \
     ALL_OBJFILE_SYMTABS (objfile, s)
 
-#define ALL_PSPACE_SYMTABS(ss, objfile, s)             \
-  ALL_PSPACE_OBJFILES (ss, objfile)                    \
-    ALL_OBJFILE_SYMTABS (objfile, s)
-
 /* Traverse all symtabs in all objfiles in the current program space,
    skipping included files (which share a blockvector with their
    primary symtab).  */
@@ -634,10 +621,6 @@ extern void default_iterate_over_objfiles_in_search_order
   ALL_OBJFILES (objfile)               \
     ALL_OBJFILE_PRIMARY_SYMTABS (objfile, s)
 
-#define ALL_PSPACE_PRIMARY_SYMTABS(pspace, objfile, s) \
-  ALL_PSPACE_OBJFILES (ss, objfile)                    \
-    ALL_OBJFILE_PRIMARY_SYMTABS (objfile, s)
-
 /* Traverse all minimal symbols in all objfiles in the current symbol
    space.  */