diff options
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/ChangeLog | 10 | ||||
-rw-r--r-- | gdb/psymtab.c | 2 | ||||
-rw-r--r-- | gdb/symtab.c | 3 | ||||
-rw-r--r-- | gdb/symtab.h | 8 |
4 files changed, 17 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 25a219f64d7..63a8120a29d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,15 @@ 2019-01-10 Tom Tromey <tom@tromey.com> + * symtab.h (SYMBOL_SET_NAMES): Update. + (symbol_set_names): Update. + (MSYMBOL_SET_NAMES): Update. + * symtab.c (symbol_set_names): Change argument to be an + objfile_per_bfd_storage. + * psymtab.c (add_psymbol_to_bcache): Update. + * psympriv.h (PSYMBOL_SET_NAMES): Take per_bfd argument. + +2019-01-10 Tom Tromey <tom@tromey.com> + * symtab.c (create_demangled_names_hash): Change argument to be an objfile_per_bfd_storage. (symbol_set_names): Update. diff --git a/gdb/psymtab.c b/gdb/psymtab.c index 356901f14b7..418530dd9a9 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -1610,7 +1610,7 @@ add_psymbol_to_bcache (const char *name, int namelength, int copy_name, memset (&psymbol.language_specific, 0, sizeof (psymbol.language_specific)); psymbol.ada_mangled = 0; symbol_set_language (&psymbol, language, &objfile->objfile_obstack); - symbol_set_names (&psymbol, name, namelength, copy_name, objfile); + symbol_set_names (&psymbol, name, namelength, copy_name, objfile->per_bfd); /* Stash the partial symbol away in the cache. */ return psymbol_bcache_full (&psymbol, objfile->psymbol_cache, added); diff --git a/gdb/symtab.c b/gdb/symtab.c index 3f15dbdf251..d5e18a64d06 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -772,13 +772,12 @@ symbol_find_demangled_name (struct general_symbol_info *gsymbol, void symbol_set_names (struct general_symbol_info *gsymbol, const char *linkage_name, int len, int copy_name, - struct objfile *objfile) + struct objfile_per_bfd_storage *per_bfd) { struct demangled_name_entry **slot; /* A 0-terminated copy of the linkage name. */ const char *linkage_name_copy; struct demangled_name_entry entry; - struct objfile_per_bfd_storage *per_bfd = objfile->per_bfd; if (gsymbol->language == language_ada) { diff --git a/gdb/symtab.h b/gdb/symtab.h index 7d97372de6b..57ed2c0948e 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -494,10 +494,11 @@ extern void symbol_set_language (struct general_symbol_info *symbol, /* Set the linkage and natural names of a symbol, by demangling the linkage name. */ #define SYMBOL_SET_NAMES(symbol,linkage_name,len,copy_name,objfile) \ - symbol_set_names (&(symbol)->ginfo, linkage_name, len, copy_name, objfile) + symbol_set_names (&(symbol)->ginfo, linkage_name, len, copy_name, \ + (objfile)->per_bfd) extern void symbol_set_names (struct general_symbol_info *symbol, const char *linkage_name, int len, int copy_name, - struct objfile *objfile); + struct objfile_per_bfd_storage *per_bfd); /* Now come lots of name accessor macros. Short version as to when to use which: Use SYMBOL_NATURAL_NAME to refer to the name of the @@ -734,7 +735,8 @@ struct minimal_symbol #define MSYMBOL_SEARCH_NAME(symbol) \ (symbol_search_name (&(symbol)->mginfo)) #define MSYMBOL_SET_NAMES(symbol,linkage_name,len,copy_name,objfile) \ - symbol_set_names (&(symbol)->mginfo, linkage_name, len, copy_name, objfile) + symbol_set_names (&(symbol)->mginfo, linkage_name, len, copy_name, \ + (objfile)->per_bfd) #include "minsyms.h" |