MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* elf32-d30v.c (bfd_elf_d30v_reloc): Don't modify section

Browse Source 
contents when performing a partial link.
        (bfd_elf_d30v_reloc_21): Likewise.
This commit is contained in:
Richard Henderson 2000-04-21 17:25:29 +00:00
parent 66156876b7
commit b51a133817
2 changed files with 24 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2000-04-21 Richard Henderson <rth@cygnus.com>
* elf32-d30v.c (bfd_elf_d30v_reloc): Don't modify section
contents when performing a partial link.
(bfd_elf_d30v_reloc_21): Likewise.
2000-04-20 H.J. Lu <hjl@gnu.org> 2000-04-20 H.J. Lu <hjl@gnu.org>
* elf32-i386.c (elf_i386_relocate_section): Restrict 1998-12-10 * elf32-i386.c (elf_i386_relocate_section): Restrict 1998-12-10

49
bfd/elf32-d30v.c
View File

@ -287,6 +287,13 @@ bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
reloc_howto_type *howto = reloc_entry->howto; reloc_howto_type *howto = reloc_entry->howto;
int make_absolute = 0; int make_absolute = 0;
if (output_bfd != (bfd *) NULL)
{
/* Partial linking -- do nothing. */
reloc_entry->address += input_section->output_offset;
return bfd_reloc_ok;
}
r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data, r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
input_section, output_bfd, error_message); input_section, output_bfd, error_message);
if (r != bfd_reloc_continue) if (r != bfd_reloc_continue)
@ -314,11 +321,7 @@ bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
reloc_target_output_section = symbol->section->output_section; reloc_target_output_section = symbol->section->output_section;
/* Convert input-section-relative symbol value to absolute. */ /* Convert input-section-relative symbol value to absolute. */
if (output_bfd)
output_base = 0;
else
output_base = reloc_target_output_section->vma; output_base = reloc_target_output_section->vma;
relocation += output_base + symbol->section->output_offset; relocation += output_base + symbol->section->output_offset;
/* Add in supplied addend. */ /* Add in supplied addend. */
@ -334,18 +337,6 @@ bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
relocation -= tmp_addr; relocation -= tmp_addr;
} }
if (output_bfd != (bfd *) NULL)
{
/* This is a partial relocation, and we want to apply the relocation
to the reloc entry rather than the raw data. Modify the reloc
inplace to reflect what we now know. */
reloc_entry->addend = relocation;
reloc_entry->address += input_section->output_offset;
return flag;
}
else
reloc_entry->addend = 0;
in1 = bfd_get_32 (abfd, (bfd_byte *) data + addr); in1 = bfd_get_32 (abfd, (bfd_byte *) data + addr);
in2 = bfd_get_32 (abfd, (bfd_byte *) data + addr + 4); in2 = bfd_get_32 (abfd, (bfd_byte *) data + addr + 4);
@ -406,6 +397,13 @@ bfd_elf_d30v_reloc_21 (abfd, reloc_entry, symbol, data, input_section, output_bf
reloc_howto_type *howto = reloc_entry->howto; reloc_howto_type *howto = reloc_entry->howto;
int mask, max; int mask, max;
if (output_bfd != (bfd *) NULL)
{
/* Partial linking -- do nothing. */
reloc_entry->address += input_section->output_offset;
return bfd_reloc_ok;
}
r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data, r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
input_section, output_bfd, error_message); input_section, output_bfd, error_message);
if (r != bfd_reloc_continue) if (r != bfd_reloc_continue)
@ -433,11 +431,7 @@ bfd_elf_d30v_reloc_21 (abfd, reloc_entry, symbol, data, input_section, output_bf
reloc_target_output_section = symbol->section->output_section; reloc_target_output_section = symbol->section->output_section;
/* Convert input-section-relative symbol value to absolute. */ /* Convert input-section-relative symbol value to absolute. */
if (output_bfd)
output_base = 0;
else
output_base = reloc_target_output_section->vma; output_base = reloc_target_output_section->vma;
relocation += output_base + symbol->section->output_offset; relocation += output_base + symbol->section->output_offset;
/* Add in supplied addend. */ /* Add in supplied addend. */
@ -448,23 +442,12 @@ bfd_elf_d30v_reloc_21 (abfd, reloc_entry, symbol, data, input_section, output_bf
if (howto->pc_relative == true) if (howto->pc_relative == true)
{ {
relocation -= input_section->output_section->vma + input_section->output_offset; relocation -= (input_section->output_section->vma
+ input_section->output_offset);
if (howto->pcrel_offset == true) if (howto->pcrel_offset == true)
relocation -= reloc_entry->address; relocation -= reloc_entry->address;
} }
if (output_bfd != (bfd *) NULL)
{
/* This is a partial relocation, and we want to apply the relocation
to the reloc entry rather than the raw data. Modify the reloc
inplace to reflect what we now know. */
reloc_entry->addend = relocation;
reloc_entry->address += input_section->output_offset;
return flag;
}
else
reloc_entry->addend = 0;
in1 = bfd_get_32 (abfd, (bfd_byte *) data + addr); in1 = bfd_get_32 (abfd, (bfd_byte *) data + addr);
mask = (1 << howto->bitsize) - 1; mask = (1 << howto->bitsize) - 1;