darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use section id in get_dyn_name.

Browse source
This commit is contained in:
Alan Modra 2000-07-12 05:03:01 +00:00
parent 1c64c4ed86
commit 0ba2a60ea9
3 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
bfd/ChangeLog
View file

@ -1,8 +1,21 @@
2000-07-11 Alan Modra <alan@linuxcare.com.au>
* elf64-hppa.c (get_dyn_name): Pass in section pointer instead of
bfd pointer. Print section id instead of bfd pointer for local
syms. Prefix addend with `+' for global syms as well as local.
Correct calculation of name component lengths.
(elf64_hppa_check_relocs): Update call to get_dyn_name.
From David Huggins-Daines <dhd@linuxcare.com>
* elf-hppa.h (elf_hppa_relocate_section): Update calls here too.
* elf64-hppa.c (elf64_hppa_check_relocs): Fix some warnings.
(elf64_hppa_modify_segment_map): Likewise.
Tue Jul 11 17:21:52 2000 Andrew Cagney <cagney@b1.cygnus.com>
* elf.c (bfd_elf_get_sign_extend_vma): Return tendency of VMA
addresses to be "naturally" sign extended. Return -1 if unknown.
* bfd-in.h (bfd_elf_get_sign_extend_vma): : Add declaration.
* bfd-in.h (bfd_elf_get_sign_extend_vma): Add declaration.
* bfd-in2.h: Regenerate.
Tue Jul 11 16:25:52 2000 Andrew Cagney <cagney@b1.cygnus.com>

6
bfd/elf-hppa.h
View file

@ -1299,7 +1299,7 @@ elf_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
/* If this symbol has an entry in the PA64 dynamic hash
table, then get it. */
dyn_name = get_dyn_name (input_bfd, h, rel,
dyn_name = get_dyn_name (input_section, h, rel,
&dynh_buf, &dynh_buflen);
dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table,
dyn_name, false, false);
@ -1322,7 +1322,7 @@ elf_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
/* If this symbol has an entry in the PA64 dynamic hash
table, then get it. */
dyn_name = get_dyn_name (input_bfd, h, rel,
dyn_name = get_dyn_name (input_section, h, rel,
&dynh_buf, &dynh_buflen);
dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table,
dyn_name, false, false);
@ -1358,7 +1358,7 @@ elf_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
/* If this symbol has an entry in the PA64 dynamic hash
table, then get it. */
dyn_name = get_dyn_name (input_bfd, h, rel,
dyn_name = get_dyn_name (input_section, h, rel,
&dynh_buf, &dynh_buflen);
dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table,
dyn_name, false, false);

27
bfd/elf64-hppa.c
View file

@ -172,8 +172,8 @@ static void elf64_hppa_dyn_hash_traverse
PTR info));
static const char *get_dyn_name
PARAMS ((bfd *abfd, struct elf_link_hash_entry *h,
const Elf_Internal_Rela *rel, char **pbuf, size_t *plen));
PARAMS ((asection *, struct elf_link_hash_entry *,
const Elf_Internal_Rela *, char **, size_t *));
/* This must follow the definitions of the various derived linker
@ -399,8 +399,8 @@ elf64_hppa_section_from_shdr (abfd, hdr, name)
allocate memory as necessary, possibly reusing PBUF/PLEN. */
static const char *
get_dyn_name (abfd, h, rel, pbuf, plen)
bfd *abfd;
get_dyn_name (sec, h, rel, pbuf, plen)
asection *sec;
struct elf_link_hash_entry *h;
const Elf_Internal_Rela *rel;
char **pbuf;
@ -416,11 +416,8 @@ get_dyn_name (abfd, h, rel, pbuf, plen)
if (h)
nlen = strlen (h->root.root.string);
else
{
nlen = sizeof(void*)*2 + 1 + sizeof(bfd_vma)*4 + 1 + 1;
nlen += 10; /* %p slop */
}
tlen = nlen + 1 + 16 + 1;
nlen = 8 + 1 + sizeof (rel->r_info) * 2 - 8;
tlen = nlen + 1 + sizeof (rel->r_addend) * 2 + 1;
len = *plen;
buf = *pbuf;
@ -437,11 +434,14 @@ get_dyn_name (abfd, h, rel, pbuf, plen)
if (h)
{
memcpy (buf, h->root.root.string, nlen);
buf[nlen++] = '+';
sprintf_vma (buf + nlen, rel->r_addend);
}
else
{
nlen = sprintf (buf, "%p:%lx", abfd, ELF64_R_SYM (rel->r_info));
nlen = sprintf (buf, "%x:%lx",
sec->id & 0xffffffff,
(long) ELF64_R_SYM (rel->r_info));
if (rel->r_addend)
{
buf[nlen++] = '+';
@ -574,7 +574,8 @@ elf64_hppa_check_relocs (abfd, info, sec, relocs)
if (info->shared && hppa_info->section_syms_bfd != abfd)
{
int i, highest_shndx;
unsigned int i;
int highest_shndx;
Elf_Internal_Sym *local_syms, *isym;
Elf64_External_Sym *ext_syms, *esym;
@ -817,7 +818,7 @@ elf64_hppa_check_relocs (abfd, info, sec, relocs)
continue;
/* Collect a canonical name for this address. */
addr_name = get_dyn_name (abfd, h, rel, &buf, &buf_len);
addr_name = get_dyn_name (sec, h, rel, &buf, &buf_len);
/* Collect the canonical entry data for this address. */
dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table,
@ -2511,7 +2512,7 @@ elf64_hppa_modify_segment_map (abfd)
for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
if (m->p_type == PT_LOAD)
{
int i;
unsigned int i;
for (i = 0; i < m->count; i++)
{