* bfd.c (bfd_get_synthetic_symtab): Pass counts and both symbol tables.
* elf-bfd.h (_bfd_elf_get_synthetic_symtab): Adjust.
* elf.c (_bfd_elf_get_synthetic_symtab): Adjust.
* libbfd-in.h (_bfd_nodynamic_get_synthetic_symtab): Adjust.
* targets.c (struct bfd_target <_bfd_get_synthetic_symtab>): Adjust.
* elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Don't read symbols.
Use both symbol tables on non-relocatable objects. Use a common
error exit. Fix "mid" warning.
* libbfd.h: Regenerate.
* bfd-in2.h: Regenerate.
binutils/
* objdump.c (dump_bfd): Pass both symbol tables to
bfd_get_synthetic_symtab.
2004-08-28 Alan Modra <amodra@bigpond.net.au>
+ * targets.c (struct bfd_target <_bfd_get_synthetic_symtab>): Pass
+ symbol counts and both symbol tables.
+ * bfd.c (bfd_get_synthetic_symtab): Adjust.
+ * elf-bfd.h (_bfd_elf_get_synthetic_symtab): Adjust.
+ * elf.c (_bfd_elf_get_synthetic_symtab): Adjust.
+ * libbfd-in.h (_bfd_nodynamic_get_synthetic_symtab): Adjust.
+ * elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Adjust. Use both
+ symbol tables on non-relocatable objects.
+ * libbfd.h: Regenerate.
+ * bfd-in2.h: Regenerate.
+
+2004-08-28 Alan Modra <amodra@bigpond.net.au>
+
* elf64-ppc.c (ppc64_elf_branch_reloc): Check .opd is in a regular
object file.
(struct sfpr_def_parms): Save some space.
#define bfd_canonicalize_dynamic_symtab(abfd, asymbols) \
BFD_SEND (abfd, _bfd_canonicalize_dynamic_symtab, (abfd, asymbols))
-#define bfd_get_synthetic_symtab(abfd, relsyms, ret) \
- BFD_SEND (abfd, _bfd_get_synthetic_symtab, (abfd, relsyms, ret))
+#define bfd_get_synthetic_symtab(abfd, count, syms, dyncount, dynsyms, ret) \
+ BFD_SEND (abfd, _bfd_get_synthetic_symtab, (abfd, count, syms, \
+ dyncount, dynsyms, ret))
#define bfd_get_dynamic_reloc_upper_bound(abfd) \
BFD_SEND (abfd, _bfd_get_dynamic_reloc_upper_bound, (abfd))
(bfd *, struct bfd_symbol **);
/* Create synthetized symbols. */
long (*_bfd_get_synthetic_symtab)
- (bfd *, struct bfd_symbol **, struct bfd_symbol **);
+ (bfd *, long, struct bfd_symbol **, long, struct bfd_symbol **,
+ struct bfd_symbol **);
/* Get the amount of memory required to hold the dynamic relocs. */
long (*_bfd_get_dynamic_reloc_upper_bound) (bfd *);
/* Read in the dynamic relocs. */
.#define bfd_canonicalize_dynamic_symtab(abfd, asymbols) \
. BFD_SEND (abfd, _bfd_canonicalize_dynamic_symtab, (abfd, asymbols))
.
-.#define bfd_get_synthetic_symtab(abfd, relsyms, ret) \
-. BFD_SEND (abfd, _bfd_get_synthetic_symtab, (abfd, relsyms, ret))
+.#define bfd_get_synthetic_symtab(abfd, count, syms, dyncount, dynsyms, ret) \
+. BFD_SEND (abfd, _bfd_get_synthetic_symtab, (abfd, count, syms, \
+. dyncount, dynsyms, ret))
.
.#define bfd_get_dynamic_reloc_upper_bound(abfd) \
. BFD_SEND (abfd, _bfd_get_dynamic_reloc_upper_bound, (abfd))
extern long _bfd_elf_canonicalize_dynamic_symtab
(bfd *, asymbol **);
extern long _bfd_elf_get_synthetic_symtab
- (bfd *, asymbol **, asymbol **);
+ (bfd *, long, asymbol **, long, asymbol **, asymbol **);
extern long _bfd_elf_get_reloc_upper_bound
(bfd *, sec_ptr);
extern long _bfd_elf_canonicalize_reloc
}
\f
long
-_bfd_elf_get_synthetic_symtab (bfd *abfd, asymbol **relsyms, asymbol **ret)
+_bfd_elf_get_synthetic_symtab (bfd *abfd,
+ long symcount ATTRIBUTE_UNUSED,
+ asymbol **syms ATTRIBUTE_UNUSED,
+ long dynsymcount ATTRIBUTE_UNUSED,
+ asymbol **dynsyms,
+ asymbol **ret)
{
const struct elf_backend_data *bed = get_elf_backend_data (abfd);
asection *relplt;
return 0;
slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table;
- if (! (*slurp_relocs) (abfd, relplt, relsyms, TRUE))
+ if (! (*slurp_relocs) (abfd, relplt, dynsyms, TRUE))
return -1;
count = relplt->size / hdr->sh_entsize;
entry syms. */
static long
-ppc64_elf_get_synthetic_symtab (bfd *abfd, asymbol **relsyms, asymbol **ret)
+ppc64_elf_get_synthetic_symtab (bfd *abfd, long symcount, asymbol **syms,
+ long dynsymcount, asymbol **dynsyms,
+ asymbol **ret)
{
asymbol *s;
long i;
long count;
char *names;
- asymbol **syms = NULL;
- long symcount = 0, codesecsym, codesecsymend, secsymend, opdsymend;
+ long codesecsym, codesecsymend, secsymend, opdsymend;
asection *opd;
bfd_boolean relocatable = (abfd->flags & (EXEC_P | DYNAMIC)) == 0;
+ asymbol **sy = NULL;
*ret = NULL;
if (opd == NULL)
return 0;
- if ((bfd_get_file_flags (abfd) & HAS_SYMS))
+ if (!relocatable)
{
- long storage;
- storage = bfd_get_symtab_upper_bound (abfd);
- if (storage < 0)
- return 0;
-
- if (storage)
+ if (symcount != 0 && dynsymcount != 0)
{
- syms = bfd_malloc (storage);
- if (syms == NULL)
+ /* Use both symbol tables. */
+ sy = bfd_malloc ((symcount + dynsymcount + 1) * sizeof (*syms));
+ if (sy == NULL)
return 0;
+ memcpy (sy, syms, symcount * sizeof (*syms));
+ memcpy (sy + symcount, dynsyms, (dynsymcount + 1) * sizeof (*syms));
+ syms = sy;
+ symcount = symcount + dynsymcount;
}
-
- symcount = bfd_canonicalize_symtab (abfd, syms);
- if (symcount < 0)
- {
- free (syms);
- return 0;
- }
-
- if (symcount == 0)
+ else if (symcount == 0)
{
- free (syms);
- syms = NULL;
+ syms = dynsyms;
+ symcount = dynsymcount;
}
}
if (symcount == 0)
- {
- long storage;
-
- storage = bfd_get_dynamic_symtab_upper_bound (abfd);
- if (storage < 0)
- return 0;
-
- if (storage)
- {
- syms = bfd_malloc (storage);
- if (syms == NULL)
- return 0;
- }
-
- symcount = bfd_canonicalize_dynamic_symtab (abfd, syms);
- if (symcount < 0)
- {
- free (syms);
- return 0;
- }
- }
+ return 0;
synthetic_opd = opd;
synthetic_relocatable = relocatable;
qsort (syms, symcount, sizeof (asymbol *), compare_symbols);
+ if (!relocatable && symcount > 1)
+ {
+ long j;
+ /* Trim duplicate syms, since we may have merged the normal and
+ dynamic symbols. Actually, we only care about syms that have
+ different values, so trim any with the same value. */
+ for (i = 1, j = 1; i < symcount; ++i)
+ if (syms[i - 1]->value + syms[i - 1]->section->vma
+ != syms[i]->value + syms[i]->section->vma)
+ syms[j++] = syms[i];
+ symcount = j;
+ }
+
i = 0;
if (syms[i]->section == opd)
++i;
break;
symcount = i;
+ count = 0;
if (opdsymend == secsymend)
- {
- free (syms);
- return 0;
- }
+ goto done;
- count = 0;
if (relocatable)
{
bfd_boolean (*slurp_relocs) (bfd *, asection *, asymbol **, bfd_boolean);
relcount = (opd->flags & SEC_RELOC) ? opd->reloc_count : 0;
if (! relcount
- || ! (*slurp_relocs) (abfd, relopd, relsyms, FALSE))
- {
- free (syms);
- return 0;
- }
+ || ! (*slurp_relocs) (abfd, relopd, syms, FALSE))
+ goto done;
size = 0;
for (i = secsymend, r = relopd->relocation; i < opdsymend; ++i)
s = *ret = bfd_malloc (size);
if (s == NULL)
{
- free (syms);
- return 0;
+ count = 0;
+ goto done;
}
names = (char *) (s + count);
if (!bfd_malloc_and_get_section (abfd, opd, &contents))
{
if (contents)
- free (contents);
- free (syms);
- return 0;
+ {
+ free_contents_and_exit:
+ free (contents);
+ }
+ goto done;
}
size = 0;
s = *ret = bfd_malloc (size);
if (s == NULL)
{
- free (contents);
- free (syms);
- return 0;
+ count = 0;
+ goto free_contents_and_exit;
}
names = (char *) (s + count);
ent = bfd_get_64 (abfd, contents + syms[i]->value);
if (!sym_exists_at (syms, opdsymend, symcount, -1, ent))
{
- long lo, hi, mid;
+ long lo, hi;
size_t len;
- asection *sec;
+ asection *sec = abfd->sections;
*s = *syms[i];
lo = codesecsym;
hi = codesecsymend;
while (lo < hi)
{
- mid = (lo + hi) >> 1;
+ long mid = (lo + hi) >> 1;
if (syms[mid]->section->vma < ent)
lo = mid + 1;
else if (syms[mid]->section->vma > ent)
hi = mid;
else
- break;
+ {
+ sec = syms[mid]->section;
+ break;
+ }
}
- if (lo < hi)
- sec = syms[mid]->section;
- else if (lo > codesecsym)
+ if (lo >= hi && lo > codesecsym)
sec = syms[lo - 1]->section;
- else
- sec = abfd->sections;
for (; sec != NULL; sec = sec->next)
{
free (contents);
}
- free (syms);
+ done:
+ if (sy != NULL)
+ free (sy);
return count;
}
\f
#define _bfd_nodynamic_canonicalize_dynamic_symtab \
((long (*) (bfd *, asymbol **)) _bfd_n1)
#define _bfd_nodynamic_get_synthetic_symtab \
- ((long (*) (bfd *, asymbol **, asymbol **)) _bfd_n1)
+ ((long (*) (bfd *, long, asymbol **, long, asymbol **, asymbol **)) _bfd_n1)
#define _bfd_nodynamic_get_dynamic_reloc_upper_bound _bfd_n1
#define _bfd_nodynamic_canonicalize_dynamic_reloc \
((long (*) (bfd *, arelent **, asymbol **)) _bfd_n1)
#define _bfd_nodynamic_canonicalize_dynamic_symtab \
((long (*) (bfd *, asymbol **)) _bfd_n1)
#define _bfd_nodynamic_get_synthetic_symtab \
- ((long (*) (bfd *, asymbol **, asymbol **)) _bfd_n1)
+ ((long (*) (bfd *, long, asymbol **, long, asymbol **, asymbol **)) _bfd_n1)
#define _bfd_nodynamic_get_dynamic_reloc_upper_bound _bfd_n1
#define _bfd_nodynamic_canonicalize_dynamic_reloc \
((long (*) (bfd *, arelent **, asymbol **)) _bfd_n1)
. (bfd *, struct bfd_symbol **);
. {* Create synthetized symbols. *}
. long (*_bfd_get_synthetic_symtab)
-. (bfd *, struct bfd_symbol **, struct bfd_symbol **);
+. (bfd *, long, struct bfd_symbol **, long, struct bfd_symbol **,
+. struct bfd_symbol **);
. {* Get the amount of memory required to hold the dynamic relocs. *}
. long (*_bfd_get_dynamic_reloc_upper_bound) (bfd *);
. {* Read in the dynamic relocs. *}
+2004-08-28 Alan Modra <amodra@bigpond.net.au>
+
+ * objdump.c (dump_bfd): Pass both symbol tables to
+ bfd_get_synthetic_symtab.
+
2004-08-17 Jakub Jelinek <jakub@redhat.com>
* objdump.c (dump_bfd): For relocatable objects, pass syms instead
dynsyms = slurp_dynamic_symtab (abfd);
if (disassemble)
{
- synthcount = 0;
- if (bfd_get_file_flags (abfd) & (DYNAMIC | EXEC_P))
- {
- if (dynsymcount > 0)
- synthcount = bfd_get_synthetic_symtab (abfd, dynsyms, &synthsyms);
- }
- else
- {
- if (symcount > 0)
- synthcount = bfd_get_synthetic_symtab (abfd, syms, &synthsyms);
- }
- if (synthcount < 0) synthcount = 0;
+ synthcount = bfd_get_synthetic_symtab (abfd, symcount, syms,
+ dynsymcount, dynsyms, &synthsyms);
+ if (synthcount < 0)
+ synthcount = 0;
}
if (dump_symtab)
OSDN Git Service
