mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-23 10:03:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

* elf32-s390.c (elf_s390_relocate_section): Only convert R_390_32

Browse Source 
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:
Martin Schwidefsky 2003-11-13 15:56:50 +00:00
parent a50d3602e0
commit b5727d755e
3 changed files with 83 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bfd/ChangeLog
View File

@ -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>
* elf-m10300.c (bfd_mn10300_elf_size_dynamic_sections): Use

40
bfd/elf32-s390.c
View File

@ -2626,9 +2626,43 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
else
{
/* This symbol is local, or marked to become local. */
relocate = TRUE;
outrel.r_info = ELF32_R_INFO (0, R_390_RELATIVE);
outrel.r_addend = relocation + rel->r_addend;
if (r_type == R_390_32)
{
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;

40
bfd/elf64-s390.c
View File

@ -2605,9 +2605,43 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
else
{
/* This symbol is local, or marked to become local. */
relocate = TRUE;
outrel.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
outrel.r_addend = relocation + rel->r_addend;
if (r_type == R_390_64)
{
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;