diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0c54609975d..b49316abf24 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-29  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-hppa.c (elf32_hppa_finish_dynamic_sections): Check if
+	hplink->sgot is NULL before filling GOT. Checck if hplink->splt
+	is NULL before filling PLT.
+
 2001-06-29  Alan Modra  <amodra@bigpond.net.au>
 
 	* elflink.h (elf_link_output_extsym): Revert 1999-04-10.
diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
index cc086095f11..af08d8e010f 100644
--- a/bfd/elf32-hppa.c
+++ b/bfd/elf32-hppa.c
@@ -4334,7 +4334,7 @@ elf32_hppa_finish_dynamic_sections (output_bfd, info)
 	}
     }
 
-  if (hplink->sgot->_raw_size != 0)
+  if (hplink->sgot != NULL && hplink->sgot->_raw_size != 0)
     {
       /* Fill in the first entry in the global offset table.
 	 We use it to point to our dynamic section, if we have one.  */
@@ -4352,7 +4352,7 @@ elf32_hppa_finish_dynamic_sections (output_bfd, info)
 	->this_hdr.sh_entsize = GOT_ENTRY_SIZE;
     }
 
-  if (hplink->splt->_raw_size != 0)
+  if (hplink->splt != NULL && hplink->splt->_raw_size != 0)
     {
       /* Set plt entry size.  */
       elf_section_data (hplink->splt->output_section)