* elf64-ppc.c (ppc64_elf_check_relocs): Don't set has_14bit_branch

	on branches to same section.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c4519f25294449dd484787c4b875c2208f8b4432..49da6ebb239556215447c9a760ab33933343df73 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-18  Alan Modra  <amodra@bigpond.net.au>
+
+       * elf64-ppc.c (ppc64_elf_check_relocs): Don't set has_14bit_branch
+       on branches to same section.
+
 2005-11-17  Randolph Chung  <tausq@debian.org>
 
        * elf64-hppa.c (elf64_hppa_object_p): Recognize corefiles under

diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index d15c77230d714682073eb68918a2672d3ced289e..65b9c2162b1fb1a30529001deca3941f3b26980d 100644 (file)
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -4507,7 +4507,24 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
        case R_PPC64_REL14:
        case R_PPC64_REL14_BRTAKEN:
        case R_PPC64_REL14_BRNTAKEN:
-         htab->has_14bit_branch = 1;
+         {
+           asection *dest = NULL;
+
+           /* Heuristic: If jumping outside our section, chances are
+              we are going to need a stub.  */
+           if (h != NULL)
+             {
+               /* If the sym is weak it may be overridden later, so
+                  don't assume we know where a weak sym lives.  */
+               if (h->root.type == bfd_link_hash_defined)
+                 dest = h->root.u.def.section;
+             }
+           else
+             dest = bfd_section_from_r_symndx (abfd, &htab->sym_sec,
+                                               sec, r_symndx);
+           if (dest != sec)
+             htab->has_14bit_branch = 1;
+         }
          /* Fall through.  */
 
        case R_PPC64_REL24: