* elf32-arm.c (elf32_arm_check_relocs): Increment count for all
relocation types. Don't count relocations which will use a PLT.
This commit is contained in:
parent
84798bd6b6
commit
71a976dd82
@ -1,3 +1,8 @@
|
|||||||
|
2005-03-29 Daniel Jacobowitz <dan@codesourcery.com>
|
||||||
|
|
||||||
|
* elf32-arm.c (elf32_arm_check_relocs): Increment count for all
|
||||||
|
relocation types. Don't count relocations which will use a PLT.
|
||||||
|
|
||||||
2005-03-29 Joel Brobecker <brobecker@gnat.com>
|
2005-03-29 Joel Brobecker <brobecker@gnat.com>
|
||||||
|
|
||||||
* elf.c (elfcore_grok_nto_status): Print tid as long.
|
* elf.c (elfcore_grok_nto_status): Print tid as long.
|
||||||
|
@ -4096,18 +4096,9 @@ elf32_arm_check_relocs (bfd *abfd, struct bfd_link_info *info,
|
|||||||
relocs_copied field of the hash table entry. */
|
relocs_copied field of the hash table entry. */
|
||||||
if ((info->shared || htab->root.is_relocatable_executable)
|
if ((info->shared || htab->root.is_relocatable_executable)
|
||||||
&& (sec->flags & SEC_ALLOC) != 0
|
&& (sec->flags & SEC_ALLOC) != 0
|
||||||
&& ((r_type != R_ARM_PC24
|
&& (r_type == R_ARM_ABS32
|
||||||
&& r_type != R_ARM_PLT32
|
|| (h != NULL && ! h->needs_plt
|
||||||
#ifndef OLD_ARM_ABI
|
&& (! info->symbolic || ! h->def_regular))))
|
||||||
&& r_type != R_ARM_CALL
|
|
||||||
&& r_type != R_ARM_JUMP24
|
|
||||||
&& r_type != R_ARM_PREL31
|
|
||||||
#endif
|
|
||||||
&& r_type != R_ARM_REL32
|
|
||||||
&& r_type != R_ARM_THM_PC22)
|
|
||||||
|| (h != NULL
|
|
||||||
&& (! info->symbolic
|
|
||||||
|| !h->def_regular))))
|
|
||||||
{
|
{
|
||||||
struct elf32_arm_relocs_copied *p, **head;
|
struct elf32_arm_relocs_copied *p, **head;
|
||||||
|
|
||||||
@ -4187,8 +4178,6 @@ elf32_arm_check_relocs (bfd *abfd, struct bfd_link_info *info,
|
|||||||
p->count = 0;
|
p->count = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (r_type == R_ARM_ABS32
|
|
||||||
|| r_type == R_ARM_REL32)
|
|
||||||
p->count += 1;
|
p->count += 1;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user