diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 45269778a7..26a6f4db0c 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (needs_ovl_stub): Test that spu_elf_section_data
+	is non-NULL before dereferencing.
+
 2007-04-11  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* elf-vxworks.c (elf_vxworks_emit_relocs): Remap weakdef PLT slot
diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c
index fac414e85c..df0b68ae22 100644
--- a/bfd/elf32-spu.c
+++ b/bfd/elf32-spu.c
@@ -704,7 +704,8 @@ needs_ovl_stub (const char *sym_name,
     return FALSE;
 
   if (sym_sec == NULL
-      || sym_sec->output_section == NULL)
+      || sym_sec->output_section == NULL
+      || spu_elf_section_data (sym_sec->output_section) == NULL)
     return FALSE;
 
   /* setjmp always goes via an overlay stub, because then the return