diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2d896412e0..d92c334f3a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2018-04-19  Alan Modra  <amodra@gmail.com>
+
+	PR 22537
+	* elf32-hppa.c (elf32_hppa_size_stubs): Init "destination" to -1.
+	(hppa_type_of_stub): Don't return a long branch stub for
+	symbols other than those defined statically.
+
 2018-04-19  Alan Modra  <amodra@gmail.com>
 
 	* Makefile.am: Revert 2018-04-18 coff-mips changes.
diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
index 3ce38078b8..44fb753c0e 100644
--- a/bfd/elf32-hppa.c
+++ b/bfd/elf32-hppa.c
@@ -612,6 +612,9 @@ hppa_type_of_stub (asection *input_sec,
       return hppa_stub_import;
     }
 
+  if (destination == (bfd_vma) -1)
+    return hppa_stub_none;
+
   /* Determine where the call point is.  */
   location = (input_sec->output_offset
 	      + input_sec->output_section->vma
@@ -2843,7 +2846,7 @@ elf32_hppa_size_stubs
 		     section.  */
 		  sym_sec = NULL;
 		  sym_value = 0;
-		  destination = 0;
+		  destination = -1;
 		  hh = NULL;
 		  if (r_indx < symtab_hdr->sh_info)
 		    {