* elf32-spu.c (build_stub): Correct icache set_id.

	(spu_elf_relocate_section): Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 77be5da7cc5fd15cf9130bbbe19314cd22e19152..33174a319be013bc5b90d12d1cdf6cfa1448b9b7 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-15  Alan Modra  <amodra@bigpond.net.au>
+
+       * elf32-spu.c (build_stub): Correct icache set_id.
+       (spu_elf_relocate_section): Likewise.
+
 2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
 
        * xcofflink.c (xcoff_link_check_archive_element): Only free the

diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c
index 115fa49c570579b9c6dec7e29196cecb45763447..72ddccf25e89a1f9d6de01b4ca2cd6a72e046d15 100644 (file)
--- a/bfd/elf32-spu.c
+++ b/bfd/elf32-spu.c
@@ -1330,7 +1330,7 @@ build_stub (struct bfd_link_info *info,
 
       bfd_put_32 (sec->owner, dest_ovl - 1,
                  sec->contents + sec->size + 0);
-      set_id = (dest_ovl - 1) >> htab->num_lines_log2;
+      set_id = ((dest_ovl - 1) >> htab->num_lines_log2) + 1;
       bfd_put_32 (sec->owner, (set_id << 18) | (dest & 0x3ffff),
                  sec->contents + sec->size + 4);
       bfd_put_32 (sec->owner, (lrlive << 29) | (g->br_addr & 0x3ffff),
@@ -4768,9 +4768,9 @@ spu_elf_relocate_section (bfd *output_bfd,
              unsigned int ovl = overlay_index (sec);
              if (ovl != 0)
                {
-                 unsigned int set_id = (ovl - 1) >> htab->num_lines_log2;
+                 unsigned int set_id = ((ovl - 1) >> htab->num_lines_log2) + 1;
                  relocation += set_id << 18;
-                 overlay_encoded = set_id != 0;
+                 overlay_encoded = TRUE;
                }
            }
        }