/* Darwin support for GDB, the GNU debugger.
- Copyright (C) 2008-2018 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
Contributed by AdaCore.
#include "bfd.h"
#include "symfile.h"
#include "objfiles.h"
-#include "buildsym.h"
#include "gdbcmd.h"
#include "gdbcore.h"
#include "mach-o.h"
#include "aout/stab_gnu.h"
-#include "vec.h"
#include "psympriv.h"
#include "complaints.h"
#include "gdb_bfd.h"
if (sym->name == NULL || sym->name[0] == 0)
{
/* Unexpected empty N_SO. */
- complaint (&symfile_complaints,
- _("Unexpected empty N_SO stab"));
+ complaint (_("Unexpected empty N_SO stab"));
}
else
{
}
/* Debugging symbols are not expected here. */
- complaint (&symfile_complaints,
- _("%s: Unexpected debug stab outside SO markers"),
+ complaint (_("%s: Unexpected debug stab outside SO markers"),
objfile_name (objfile));
}
else
if (sym->name == NULL || sym->name[0] == 0)
{
/* Unexpected empty N_SO. */
- complaint (&symfile_complaints, _("Empty SO section"));
+ complaint (_("Empty SO section"));
state = S_NO_SO;
}
else if (state == S_FIRST_SO)
state = S_SECOND_SO;
}
else
- complaint (&symfile_complaints, _("Three SO in a raw"));
+ complaint (_("Three SO in a raw"));
}
else if (mach_o_sym->n_type == N_OSO)
{
}
}
else
- complaint (&symfile_complaints,
- _("Unexpected stab after SO"));
+ complaint (_("Unexpected stab after SO"));
break;
case S_STAB_FILE:
}
else
{
- complaint (&symfile_complaints, _("Missing nul SO"));
+ complaint (_("Missing nul SO"));
file_so = sym;
state = S_FIRST_SO;
}
case N_GSYM:
break;
default:
- complaint (&symfile_complaints,
- _("unhandled stab for dwarf OSO file"));
+ complaint (_("unhandled stab for dwarf OSO file"));
break;
}
}
}
else
- complaint (&symfile_complaints,
- _("non-debugging symbol within SO"));
+ complaint (_("non-debugging symbol within SO"));
break;
}
}
if (state != S_NO_SO)
- complaint (&symfile_complaints, _("missing nul SO"));
+ complaint (_("missing nul SO"));
}
/* If NAME describes an archive member (ie: ARCHIVE '(' MEMBER ')'),
ent = (struct macho_sym_hash_entry *)
bfd_hash_lookup (&table, sym->name, TRUE, FALSE);
if (ent->sym != NULL)
- complaint (&symfile_complaints,
- _("Duplicated symbol %s in symbol table"), sym->name);
+ complaint (_("Duplicated symbol %s in symbol table"), sym->name);
else
{
if (mach_o_debug_level > 4)
sec->name, sym->name,
paddress (arch, res));
}
- bfd_set_section_vma (abfd.get (), sec, res);
+ bfd_set_section_vma (sec, res);
sections_rebased[sec->index] = 1;
}
}
bfd_hash_table_free (&table);
- /* We need to clear SYMFILE_MAINLINE to avoid interractive question
+ /* We need to clear SYMFILE_MAINLINE to avoid interactive question
from symfile.c:symbol_file_add_with_addrs_or_offsets. */
symbol_file_add_from_bfd
(abfd.get (), name, symfile_flags & ~(SYMFILE_MAINLINE | SYMFILE_VERBOSE),
std::sort (oso_vector_ptr->begin (), oso_vector_ptr->end (),
oso_el_compare_name);
- for (ix = 0; ix < oso_vector_ptr->size (); ++ix)
+ for (ix = 0; ix < oso_vector_ptr->size ();)
{
int pfx_len;
/* Load all oso in this library. */
while (member_bfd != NULL)
{
- const char *member_name = member_bfd->filename;
+ const char *member_name = bfd_get_filename (member_bfd.get ());
int member_len = strlen (member_name);
/* If this member is referenced, add it as a symfile. */
member_len))
{
macho_add_oso_symfile (oso2, member_bfd,
- bfd_get_filename (member_bfd),
+ bfd_get_filename (member_bfd.get ()),
main_objfile, symfile_flags);
oso2->name = NULL;
break;
}
for (ix2 = ix; ix2 < last_ix; ix2++)
{
- oso_el *oso2 = &(*oso_vector_ptr)[ix2];
+ oso2 = &(*oso_vector_ptr)[ix2];
if (oso2->name != NULL)
warning (_("Could not find specified archive member "
bfd *abfd = objfile->obfd;
long storage_needed;
std::vector<oso_el> oso_vector;
+ /* We have to hold on to the symbol table until the call to
+ macho_symfile_read_all_oso at the end of this function. */
+ gdb::def_vector<asymbol *> symbol_table;
/* Get symbols from the symbol table only if the file is an executable.
The symbol table of object files is not relocated and is expected to
{
long symcount;
- gdb::def_vector<asymbol *> symbol_table (storage_needed
- / sizeof (asymbol *));
+ symbol_table.resize (storage_needed / sizeof (asymbol *));
minimal_symbol_reader reader (objfile);
{
if (strcmp (asect->name, dsect->name) != 0)
break;
- bfd_set_section_size (dsym_bfd.get (), dsect,
- bfd_get_section_size (asect));
+ bfd_set_section_size (dsect, bfd_section_size (asect));
}
/* Add the dsym file as a separate file. */