OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* elf32-i386.c (elf_i386_relocate_section): Revert May 24 patch. 

Don't copy PC32 reloc against section into shared object.
PR 6997, 7381.
This commit is contained in:
Ian Lance Taylor 1995-07-06 19:40:51 +00:00
parent b10e9afbfd
commit 1d5d75e90a
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bfd/ChangeLog
View File

@ -1,5 +1,8 @@
Thu Jul 6 14:37:43 1995 Ian Lance Taylor <ian@cygnus.com> Thu Jul 6 14:37:43 1995 Ian Lance Taylor <ian@cygnus.com>
* elf32-i386.c (elf_i386_relocate_section): Revert May 24 patch.
Don't copy PC32 reloc against section into shared object.
* Makefile.in: Rebuild dependencies. * Makefile.in: Rebuild dependencies.
(CFILES): Added elflink.c. (CFILES): Added elflink.c.
(Makefile): Depend upon config.status, not configure.in. (Makefile): Depend upon config.status, not configure.in.

32
bfd/elf32-i386.c
View File

@ -852,7 +852,6 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
asection *sec; asection *sec;
bfd_vma relocation; bfd_vma relocation;
bfd_reloc_status_type r; bfd_reloc_status_type r;
char *shared_name;
r_type = ELF32_R_TYPE (rel->r_info); r_type = ELF32_R_TYPE (rel->r_info);
if (r_type < 0 || r_type >= (int) R_386_max) if (r_type < 0 || r_type >= (int) R_386_max)
@ -891,8 +890,6 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
h = NULL; h = NULL;
sym = NULL; sym = NULL;
sec = NULL; sec = NULL;
shared_name = NULL;
if (r_symndx < symtab_hdr->sh_info) if (r_symndx < symtab_hdr->sh_info)
{ {
sym = local_syms + r_symndx; sym = local_syms + r_symndx;
@ -1091,7 +1088,8 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
case R_386_32: case R_386_32:
case R_386_PC32: case R_386_PC32:
if (info->shared if (info->shared
&& (input_section->flags & SEC_ALLOC) != 0) && (input_section->flags & SEC_ALLOC) != 0
&& (r_type != R_386_PC32 || h != NULL))
{ {
Elf_Internal_Rel outrel; Elf_Internal_Rel outrel;
@ -1101,19 +1099,21 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
if (sreloc == NULL) if (sreloc == NULL)
{ {
shared_name = (bfd_elf_string_from_elf_section const char *name;
name = (bfd_elf_string_from_elf_section
(input_bfd, (input_bfd,
elf_elfheader (input_bfd)->e_shstrndx, elf_elfheader (input_bfd)->e_shstrndx,
elf_section_data (input_section)->rel_hdr.sh_name)); elf_section_data (input_section)->rel_hdr.sh_name));
if (shared_name == NULL) if (name == NULL)
return false; return false;
BFD_ASSERT (strncmp (shared_name, ".rel", 4) == 0 BFD_ASSERT (strncmp (name, ".rel", 4) == 0
&& strcmp (bfd_get_section_name (input_bfd, && strcmp (bfd_get_section_name (input_bfd,
input_section), input_section),
shared_name + 4) == 0); name + 4) == 0);
sreloc = bfd_get_section_by_name (dynobj, shared_name); sreloc = bfd_get_section_by_name (dynobj, name);
BFD_ASSERT (sreloc != NULL); BFD_ASSERT (sreloc != NULL);
} }
@ -1122,18 +1122,8 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
+ input_section->output_offset); + input_section->output_offset);
if (r_type == R_386_PC32) if (r_type == R_386_PC32)
{ {
if (!h) BFD_ASSERT (h != NULL && h->dynindx != -1);
{ outrel.r_info = ELF32_R_INFO (h->dynindx, R_386_PC32);
if (! ((*info->callbacks->undefined_symbol)
(info, shared_name ? shared_name : sec->name, input_bfd,
input_section, rel->r_offset)))
bfd_set_error (bfd_error_bad_value);
return false;
}
else {
BFD_ASSERT (h->dynindx != -1);
outrel.r_info = ELF32_R_INFO (h->dynindx, R_386_PC32);
}
} }
else else
{ {