From fdd07405582d22ef5ceb04fe805e5c32dc9ca12e Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 9 Jul 2003 11:51:53 +0000 Subject: [PATCH] * bfd/elfxx-mips.c (mips_elf_create_dynamic_relocation): Treat forced-local symbols like other locals. Don't create relocations against STN_UNDEF in irix objects. --- bfd/ChangeLog | 6 ++++++ bfd/elfxx-mips.c | 16 ++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b9f0b2ea6ce..426c76ca983 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2003-07-09 Richard Sandiford + + * bfd/elfxx-mips.c (mips_elf_create_dynamic_relocation): Treat + forced-local symbols like other locals. Don't create relocations + against STN_UNDEF in irix objects. + 2003-07-09 Richard Sandiford * bfd/elfxx-mips.c (mips_elf_create_dynamic_relocation): In SGI- diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index 00dc08424b2..bef1c79b5e0 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -3893,13 +3893,12 @@ mips_elf_create_dynamic_relocation (output_bfd, info, rel, h, sec, in the relocation. */ if (h != NULL && (! info->symbolic || (h->root.elf_link_hash_flags - & ELF_LINK_HASH_DEF_REGULAR) == 0)) - { - indx = h->root.dynindx; + & ELF_LINK_HASH_DEF_REGULAR) == 0) /* h->root.dynindx may be -1 if this symbol was marked to become local. */ - if (indx == -1) - indx = 0; + && h->root.dynindx != -1) + { + indx = h->root.dynindx; if (SGI_COMPAT (output_bfd)) defined_p = ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0); @@ -3937,7 +3936,12 @@ mips_elf_create_dynamic_relocation (output_bfd, info, rel, h, sec, section-relative relocations. It's not like they're useful, after all. This should be a bit more efficient as well. */ - indx = 0; + /* ??? Although this behavior is compatible with glibc's ld.so, + the ABI says that relocations against STN_UNDEF should have + a symbol value of 0. Irix rld honors this, so relocations + against STN_UNDEF have no effect. */ + if (!SGI_COMPAT (output_bfd)) + indx = 0; defined_p = TRUE; } -- 2.30.2