Add some string section merging support.

	* elf64-sh64.c (sh_elf64_relocate_section): Call
	_bfd_elf_rela_local_sym.  Handle relocs against STT_SECTION symbol
	of SHF_MERGE section.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 27230ffed9aea06c2be4dac78ea9db06240fc771..7e6a4128c3b822df3cbc6717ca563c10f4c63efb 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-25  Jim Wilson  <wilson@redhat.com>
+
+       * elf64-sh64.c (sh_elf64_relocate_section): Call
+       _bfd_elf_rela_local_sym.  Handle relocs against STT_SECTION symbol
+       of SHF_MERGE section.
+
 2002-10-25  Hans-Peter Nilsson  <hp@axis.com>
 
        * simple.c: Correct placement of ATTRIBUTE_UNUSED.

diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
index dfd7d377e42931dba4254d1795eeecfdc7e6d169..da02505d5c538081a09b92a3a8dc70eb70716b9a 100644 (file)
--- a/bfd/elf64-sh64.c
+++ b/bfd/elf64-sh64.c
@@ -1588,6 +1588,35 @@ sh_elf64_relocate_section (output_bfd, info, input_bfd, input_section,
 
              continue;
            }
+         else if (! howto->partial_inplace)
+           {
+             relocation = _bfd_elf_rela_local_sym (output_bfd, sym, sec, rel);
+             relocation |= ((sym->st_other & STO_SH5_ISA32) != 0);
+           }
+         else if ((sec->flags & SEC_MERGE)
+                  && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+           {
+             asection *msec;
+
+             if (howto->rightshift || howto->src_mask != 0xffffffff)
+               {
+                 (*_bfd_error_handler)
+                   (_("%s(%s+0x%lx): %s relocation against SEC_MERGE section"),
+                    bfd_archive_filename (input_bfd),
+                    bfd_get_section_name (input_bfd, input_section),
+                    (long) rel->r_offset, howto->name);
+                 return false;
+               }
+
+              addend = bfd_get_32 (input_bfd, contents + rel->r_offset);
+              msec = sec;
+              addend =
+               _bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend)
+               - relocation;
+             addend += msec->output_section->vma + msec->output_offset;
+             bfd_put_32 (input_bfd, addend, contents + rel->r_offset);
+             addend = 0;
+           }
        }
       else
        {