aboutsummaryrefslogtreecommitdiff
path: root/bfd/elf32-i386.c
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2005-05-20 22:02:08 +0000
committerDaniel Jacobowitz <drow@false.org>2005-05-20 22:02:08 +0000
commit643796e38cff6ea4e4ed62cc5e00a267c4db23a2 (patch)
tree09c82d0606155f4dbd865275a25581c00bcefa49 /bfd/elf32-i386.c
parent4dc4a9a515d83cbef3d06d21b934df37e85d663c (diff)
downloadgdb-643796e38cff6ea4e4ed62cc5e00a267c4db23a2.zip
gdb-643796e38cff6ea4e4ed62cc5e00a267c4db23a2.tar.gz
gdb-643796e38cff6ea4e4ed62cc5e00a267c4db23a2.tar.bz2
* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Don't eliminate
copy relocations for VxWorks.
Diffstat (limited to 'bfd/elf32-i386.c')
-rw-r--r--bfd/elf32-i386.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index bfc3417..3e5f339 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -1431,7 +1431,13 @@ elf_i386_adjust_dynamic_symbol (struct bfd_link_info *info,
return TRUE;
}
- if (ELIMINATE_COPY_RELOCS)
+ htab = elf_i386_hash_table (info);
+
+ /* If there aren't any dynamic relocs in read-only sections, then
+ we can keep the dynamic relocs and avoid the copy reloc. This
+ doesn't work on VxWorks, where we can not have dynamic relocations
+ (other than copy and jump slot relocations) in an executable. */
+ if (ELIMINATE_COPY_RELOCS && !htab->is_vxworks)
{
struct elf_i386_link_hash_entry * eh;
struct elf_i386_dyn_relocs *p;
@@ -1444,8 +1450,6 @@ elf_i386_adjust_dynamic_symbol (struct bfd_link_info *info,
break;
}
- /* If we didn't find any dynamic relocs in read-only sections, then
- we'll be keeping the dynamic relocs and avoiding the copy reloc. */
if (p == NULL)
{
h->non_got_ref = 0;
@@ -1463,8 +1467,6 @@ elf_i386_adjust_dynamic_symbol (struct bfd_link_info *info,
both the dynamic object and the regular object will refer to the
same memory location for the variable. */
- htab = elf_i386_hash_table (info);
-
/* We must generate a R_386_COPY reloc to tell the dynamic linker to
copy the initial value out of the dynamic object and into the
runtime process image. */