Tweak for i386 vxworks support
Daniel Jacobowitz
drow@false.org
Wed May 18 15:23:00 GMT 2005
The VxWorks dynamic loader pretty much only honors R_*_COPY and
R_*_JUMP_SLOT relocations in executables - the normal range of relocations
are processed in shared libraries. This works except for some cases
involving weak symbols (which VxWorks doesn't use), and when ld decides to
eliminate a copy relocation. So disable that for VxWorks. I'm trying to
persuade them to process relocations more normally, but no luck so far.
Is this patch OK?
--
Daniel Jacobowitz
CodeSourcery, LLC
2005-05-17 Daniel Jacobowitz <dan@codesourcery.com>
* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Don't eliminate
copy relocations for VxWorks.
Index: elf32-i386.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-i386.c,v
retrieving revision 1.140
diff -u -p -r1.140 elf32-i386.c
--- elf32-i386.c 17 May 2005 16:43:02 -0000 1.140
+++ elf32-i386.c 17 May 2005 20:24:52 -0000
@@ -1431,7 +1431,13 @@ elf_i386_adjust_dynamic_symbol (struct b
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 b
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 b
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. */
More information about the Binutils
mailing list