projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2004-12-05 Randolph Chung <tausq@debian.org>
[deliverable/binutils-gdb.git]
/
bfd
/
elf-m10200.c
diff --git
a/bfd/elf-m10200.c
b/bfd/elf-m10200.c
index 52685253062e71e28b307565d6b5b050d014941c..7fb44754dd795106dd64e7b74297a3616f90f92b 100644
(file)
--- a/
bfd/elf-m10200.c
+++ b/
bfd/elf-m10200.c
@@
-410,8
+410,9
@@
mn10200_elf_relocate_section (output_bfd, info, input_bfd, input_section,
{
case bfd_reloc_overflow:
if (! ((*info->callbacks->reloc_overflow)
{
case bfd_reloc_overflow:
if (! ((*info->callbacks->reloc_overflow)
- (info, name, howto->name, (bfd_vma) 0,
- input_bfd, input_section, rel->r_offset)))
+ (info, (h ? &h->root : NULL), name, howto->name,
+ (bfd_vma) 0, input_bfd, input_section,
+ rel->r_offset)))
return FALSE;
break;
return FALSE;
break;
@@
-505,11
+506,6
@@
mn10200_elf_relax_section (abfd, sec, link_info, again)
|| (sec->flags & SEC_CODE) == 0)
return TRUE;
|| (sec->flags & SEC_CODE) == 0)
return TRUE;
- /* If this is the first time we have been called for this section,
- initialize the cooked size. */
- if (sec->_cooked_size == 0)
- sec->_cooked_size = sec->_raw_size;
-
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
/* Get a copy of the native relocations. */
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
/* Get a copy of the native relocations. */
@@
-541,12
+537,7
@@
mn10200_elf_relax_section (abfd, sec, link_info, again)
else
{
/* Go get them off disk. */
else
{
/* Go get them off disk. */
- contents = (bfd_byte *) bfd_malloc (sec->_raw_size);
- if (contents == NULL)
- goto error_return;
-
- if (! bfd_get_section_contents (abfd, sec, contents,
- (file_ptr) 0, sec->_raw_size))
+ if (!bfd_malloc_and_get_section (abfd, sec, &contents))
goto error_return;
}
}
goto error_return;
}
}
@@
-737,7
+728,7
@@
mn10200_elf_relax_section (abfd, sec, link_info, again)
value += irel->r_addend;
/* Do nothing if this reloc is the last byte in the section. */
value += irel->r_addend;
/* Do nothing if this reloc is the last byte in the section. */
- if (irel->r_offset == sec->
_cooked_
size)
+ if (irel->r_offset == sec->size)
continue;
/* See if the next instruction is an unconditional pc-relative
continue;
/* See if the next instruction is an unconditional pc-relative
@@
-1189,7
+1180,7
@@
mn10200_elf_relax_delete_bytes (abfd, sec, addr, count)
power larger than the number of bytes we are deleting. */
irelalign = NULL;
power larger than the number of bytes we are deleting. */
irelalign = NULL;
- toaddr = sec->
_cooked_
size;
+ toaddr = sec->size;
irel = elf_section_data (sec)->relocs;
irelend = irel + sec->reloc_count;
irel = elf_section_data (sec)->relocs;
irelend = irel + sec->reloc_count;
@@
-1197,7
+1188,7
@@
mn10200_elf_relax_delete_bytes (abfd, sec, addr, count)
/* Actually delete the bytes. */
memmove (contents + addr, contents + addr + count,
(size_t) (toaddr - addr - count));
/* Actually delete the bytes. */
memmove (contents + addr, contents + addr + count,
(size_t) (toaddr - addr - count));
- sec->
_cooked_
size -= count;
+ sec->size -= count;
/* Adjust all the relocs. */
for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
/* Adjust all the relocs. */
for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
@@
-1316,7
+1307,7
@@
mn10200_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
memcpy (data, elf_section_data (input_section)->this_hdr.contents,
symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
memcpy (data, elf_section_data (input_section)->this_hdr.contents,
- (size_t) input_section->
_raw_
size);
+ (size_t) input_section->size);
if ((input_section->flags & SEC_RELOC) != 0
&& input_section->reloc_count > 0)
if ((input_section->flags & SEC_RELOC) != 0
&& input_section->reloc_count > 0)
This page took
0.024518 seconds
and
4
git commands to generate.