projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ELF: Move dyn_relocs to struct elf_link_hash_entry
[deliverable/binutils-gdb.git]
/
bfd
/
elf32-m32c.c
diff --git
a/bfd/elf32-m32c.c
b/bfd/elf32-m32c.c
index 89bdccacd062cf3c1dd035f3b6058847e9154e6e..7a97d6d9092f8a66a62549acafa602840b49866f 100644
(file)
--- a/
bfd/elf32-m32c.c
+++ b/
bfd/elf32-m32c.c
@@
-1284,7
+1284,7
@@
static bfd_vma
m32c_offset_for_reloc (bfd *abfd,
Elf_Internal_Rela *rel,
Elf_Internal_Shdr *symtab_hdr,
m32c_offset_for_reloc (bfd *abfd,
Elf_Internal_Rela *rel,
Elf_Internal_Shdr *symtab_hdr,
-
Elf_External_Sym_Shndx
*shndx_buf ATTRIBUTE_UNUSED,
+
bfd_byte
*shndx_buf ATTRIBUTE_UNUSED,
Elf_Internal_Sym *intsyms)
{
bfd_vma symval;
Elf_Internal_Sym *intsyms)
{
bfd_vma symval;
@@
-1442,7
+1442,7
@@
m32c_elf_relax_section
bfd_byte * free_contents = NULL;
Elf_Internal_Sym *intsyms = NULL;
Elf_Internal_Sym *free_intsyms = NULL;
bfd_byte * free_contents = NULL;
Elf_Internal_Sym *intsyms = NULL;
Elf_Internal_Sym *free_intsyms = NULL;
-
Elf_External_Sym_Shndx
*shndx_buf = NULL;
+
bfd_byte
*shndx_buf = NULL;
int machine;
if (abfd == elf_hash_table (link_info)->dynobj
int machine;
if (abfd == elf_hash_table (link_info)->dynobj
@@
-1499,13
+1499,12
@@
m32c_elf_relax_section
bfd_set_error (bfd_error_file_too_big);
goto error_return;
}
bfd_set_error (bfd_error_file_too_big);
goto error_return;
}
- shndx_buf = (Elf_External_Sym_Shndx *) bfd_malloc (amt);
- if (shndx_buf == NULL)
+ if (bfd_seek (abfd, shndx_hdr->sh_offset, SEEK_SET) != 0)
goto error_return;
goto error_return;
- if (bfd_seek (abfd, shndx_hdr->sh_offset, SEEK_SET) != 0
-
|| bfd_bread (shndx_buf, amt, abfd) != amt
)
+ shndx_buf = _bfd_malloc_and_read (abfd, amt, amt);
+
if (shndx_buf == NULL
)
goto error_return;
goto error_return;
- shndx_hdr->contents =
(bfd_byte *)
shndx_buf;
+ shndx_hdr->contents = shndx_buf;
}
/* Get a copy of the native relocations. */
}
/* Get a copy of the native relocations. */
@@
-1902,11
+1901,8
@@
m32c_elf_relax_section
} /* next relocation */
} /* next relocation */
- if (free_relocs != NULL)
- {
- free (free_relocs);
- free_relocs = NULL;
- }
+ free (free_relocs);
+ free_relocs = NULL;
if (free_contents != NULL)
{
if (free_contents != NULL)
{
@@
-1932,7
+1928,7
@@
m32c_elf_relax_section
/* Cache the symbols for elf_link_input_bfd. */
else
{
/* Cache the symbols for elf_link_input_bfd. */
else
{
- symtab_hdr->contents = NULL /* (unsigned char *) intsyms*/;
+
symtab_hdr->contents = NULL /* (unsigned char *) intsyms*/;
}
free_intsyms = NULL;
}
free_intsyms = NULL;
@@
-1941,17
+1937,14
@@
m32c_elf_relax_section
return TRUE;
error_return:
return TRUE;
error_return:
- if (free_relocs != NULL)
- free (free_relocs);
- if (free_contents != NULL)
- free (free_contents);
+ free (free_relocs);
+ free (free_contents);
if (shndx_buf != NULL)
{
shndx_hdr->contents = NULL;
free (shndx_buf);
}
if (shndx_buf != NULL)
{
shndx_hdr->contents = NULL;
free (shndx_buf);
}
- if (free_intsyms != NULL)
- free (free_intsyms);
+ free (free_intsyms);
return FALSE;
}
return FALSE;
}
This page took
0.025136 seconds
and
4
git commands to generate.