mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-23 18:14:13 +08:00
* elf32-s390.c (elf_s390_relocate_section): Only convert R_390_32
to R_390_RELAVITE. Convert the other relocations against local symbols to relocations against the start of the section. * elf64-s390.c (elf_s390_relocate_section): Only convert R_390_64 to R_390_RELAVITE. Convert the other relocations against local symbols to relocations against the start of the section.
This commit is contained in:
parent
a50d3602e0
commit
b5727d755e
@ -1,3 +1,12 @@
|
|||||||
|
2003-11-13 Martin Schwidefsky <schwidefsky@de.ibm.com>
|
||||||
|
|
||||||
|
* elf32-s390.c (elf_s390_relocate_section): Only convert R_390_32
|
||||||
|
to R_390_RELAVITE. Convert the other relocations against local
|
||||||
|
symbols to relocations against the start of the section.
|
||||||
|
* elf64-s390.c (elf_s390_relocate_section): Only convert R_390_64
|
||||||
|
to R_390_RELAVITE. Convert the other relocations against local
|
||||||
|
symbols to relocations against the start of the section.
|
||||||
|
|
||||||
2003-11-11 Nick Clifton <nickc@redhat.com>
|
2003-11-11 Nick Clifton <nickc@redhat.com>
|
||||||
|
|
||||||
* elf-m10300.c (bfd_mn10300_elf_size_dynamic_sections): Use
|
* elf-m10300.c (bfd_mn10300_elf_size_dynamic_sections): Use
|
||||||
|
@ -2626,9 +2626,43 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* This symbol is local, or marked to become local. */
|
/* This symbol is local, or marked to become local. */
|
||||||
relocate = TRUE;
|
if (r_type == R_390_32)
|
||||||
outrel.r_info = ELF32_R_INFO (0, R_390_RELATIVE);
|
{
|
||||||
outrel.r_addend = relocation + rel->r_addend;
|
relocate = TRUE;
|
||||||
|
outrel.r_info = ELF32_R_INFO (0, R_390_RELATIVE);
|
||||||
|
outrel.r_addend = relocation + rel->r_addend;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
long sindx;
|
||||||
|
|
||||||
|
if (h == NULL)
|
||||||
|
sec = local_sections[r_symndx];
|
||||||
|
else
|
||||||
|
{
|
||||||
|
BFD_ASSERT (h->root.type == bfd_link_hash_defined
|
||||||
|
|| (h->root.type
|
||||||
|
== bfd_link_hash_defweak));
|
||||||
|
sec = h->root.u.def.section;
|
||||||
|
}
|
||||||
|
if (sec != NULL && bfd_is_abs_section (sec))
|
||||||
|
sindx = 0;
|
||||||
|
else if (sec == NULL || sec->owner == NULL)
|
||||||
|
{
|
||||||
|
bfd_set_error(bfd_error_bad_value);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
asection *osec;
|
||||||
|
|
||||||
|
osec = sec->output_section;
|
||||||
|
sindx = elf_section_data (osec)->dynindx;
|
||||||
|
BFD_ASSERT (sindx > 0);
|
||||||
|
}
|
||||||
|
outrel.r_info = ELF32_R_INFO (sindx, r_type);
|
||||||
|
outrel.r_addend = relocation + rel->r_addend;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sreloc = elf_section_data (input_section)->sreloc;
|
sreloc = elf_section_data (input_section)->sreloc;
|
||||||
|
@ -2605,9 +2605,43 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* This symbol is local, or marked to become local. */
|
/* This symbol is local, or marked to become local. */
|
||||||
relocate = TRUE;
|
if (r_type == R_390_64)
|
||||||
outrel.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
|
{
|
||||||
outrel.r_addend = relocation + rel->r_addend;
|
relocate = TRUE;
|
||||||
|
outrel.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
|
||||||
|
outrel.r_addend = relocation + rel->r_addend;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
long sindx;
|
||||||
|
|
||||||
|
if (h == NULL)
|
||||||
|
sec = local_sections[r_symndx];
|
||||||
|
else
|
||||||
|
{
|
||||||
|
BFD_ASSERT (h->root.type == bfd_link_hash_defined
|
||||||
|
|| (h->root.type
|
||||||
|
== bfd_link_hash_defweak));
|
||||||
|
sec = h->root.u.def.section;
|
||||||
|
}
|
||||||
|
if (sec != NULL && bfd_is_abs_section (sec))
|
||||||
|
sindx = 0;
|
||||||
|
else if (sec == NULL || sec->owner == NULL)
|
||||||
|
{
|
||||||
|
bfd_set_error(bfd_error_bad_value);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
asection *osec;
|
||||||
|
|
||||||
|
osec = sec->output_section;
|
||||||
|
sindx = elf_section_data (osec)->dynindx;
|
||||||
|
BFD_ASSERT (sindx > 0);
|
||||||
|
}
|
||||||
|
outrel.r_info = ELF64_R_INFO (sindx, r_type);
|
||||||
|
outrel.r_addend = relocation + rel->r_addend;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sreloc = elf_section_data (input_section)->sreloc;
|
sreloc = elf_section_data (input_section)->sreloc;
|
||||||
|
Loading…
Reference in New Issue
Block a user