diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a00def01985..e3026519495 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-28  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elf-hppa.h (elf_hppa_osec_to_segment): New function.
+	(elf_hppa_record_segment_addrs): Use elf_hppa_osec_to_segment.
+	Remove ATTRIBUTE_UNUSED from abfd argument.
+	* elf32-hppa.c (hppa_record_segment_addr): Likewise.
+
 2007-12-28  Nick Hudson  <nick.hudson@dsl.pipex.com>
 
 	* elf32-hppa.c (hppa_record_segment_addr): Locate the segment
diff --git a/bfd/elf-hppa.h b/bfd/elf-hppa.h
index dfe692fbdf1..a7850cefc5f 100644
--- a/bfd/elf-hppa.h
+++ b/bfd/elf-hppa.h
@@ -1088,6 +1088,35 @@ elf_hppa_fake_sections (bfd *abfd, Elf_Internal_Shdr *hdr, asection *sec)
   return TRUE;
 }
 
+/* Find the segment number in which OSEC, and output section, is
+   located.  */
+
+static unsigned
+elf_hppa_osec_to_segment (bfd *output_bfd, asection *osec)
+{
+  struct elf_segment_map *m;
+  Elf_Internal_Phdr *p;
+
+  /* Find the segment that contains the output_section.  */
+  for (m = elf_tdata (output_bfd)->segment_map,
+	 p = elf_tdata (output_bfd)->phdr;
+       m != NULL;
+       m = m->next, p++)
+    {
+      int i;
+
+      for (i = m->count - 1; i >= 0; i--)
+	if (m->sections[i] == osec)
+	  break;
+
+      if (i >= 0)
+	break;
+    }
+
+  BFD_ASSERT (m);
+  return p - elf_tdata (output_bfd)->phdr;
+}
+
 static void
 elf_hppa_final_write_processing (bfd *abfd,
 				 bfd_boolean linker ATTRIBUTE_UNUSED)
@@ -1300,25 +1329,28 @@ elf_hppa_is_dynamic_loader_symbol (const char *name)
 
 /* Record the lowest address for the data and text segments.  */
 static void
-elf_hppa_record_segment_addrs (bfd *abfd ATTRIBUTE_UNUSED,
+elf_hppa_record_segment_addrs (bfd *abfd,
 			       asection *section,
 			       void *data)
 {
-  struct elf64_hppa_link_hash_table *hppa_info;
-  bfd_vma value;
+  struct elf64_hppa_link_hash_table *hppa_info = data;
 
-  hppa_info = data;
+  if ((section->flags & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
+    {
+      unsigned seg = elf_hppa_osec_to_segment (abfd, section->output_section);
+      bfd_vma value = elf_tdata (abfd)->phdr[seg].p_vaddr;
 
-  value = section->vma - section->filepos;
-
-  if (((section->flags & (SEC_ALLOC | SEC_LOAD | SEC_READONLY))
-       == (SEC_ALLOC | SEC_LOAD | SEC_READONLY))
-      && value < hppa_info->text_segment_base)
-    hppa_info->text_segment_base = value;
-  else if (((section->flags & (SEC_ALLOC | SEC_LOAD | SEC_READONLY))
-	    == (SEC_ALLOC | SEC_LOAD))
-	   && value < hppa_info->data_segment_base)
-    hppa_info->data_segment_base = value;
+      if (section->flags & SEC_READONLY)
+	{
+	  if (value < hppa_info->text_segment_base)
+	    hppa_info->text_segment_base = value;
+	}
+      else
+	{
+	  if (value < hppa_info->data_segment_base)
+	    hppa_info->data_segment_base = value;
+	}
+    }
 }
 
 /* Called after we have seen all the input files/sections, but before
diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
index 20a2f8093b2..6fbcd646ecd 100644
--- a/bfd/elf32-hppa.c
+++ b/bfd/elf32-hppa.c
@@ -3256,7 +3256,7 @@ elf32_hppa_final_link (bfd *abfd, struct bfd_link_info *info)
 /* Record the lowest address for the data and text segments.  */
 
 static void
-hppa_record_segment_addr (bfd *abfd ATTRIBUTE_UNUSED,
+hppa_record_segment_addr (bfd *abfd,
 			  asection *section,
 			  void *data)
 {
@@ -3266,30 +3266,9 @@ hppa_record_segment_addr (bfd *abfd ATTRIBUTE_UNUSED,
 
   if ((section->flags & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
     {
-      bfd_vma value;
-      struct elf_segment_map *m;
-      Elf_Internal_Phdr *p;
+      unsigned seg = elf_hppa_osec_to_segment (abfd, section->output_section);
+      bfd_vma value = elf_tdata (abfd)->phdr[seg].p_vaddr;
 
-      /* Find the segment that contains the output_section for this section.  */
-      for (m = elf_tdata (abfd)->segment_map,
-	     p = elf_tdata (abfd)->phdr;
-	   m != NULL;
-	   m = m->next, p++)
-	{
-	  int i;
-
-	  for (i = m->count - 1; i >= 0; i--)
-	    if (m->sections[i] == section->output_section)
-	      break;
-	  if (i >= 0)
-	    break;
-	}
-
-      if (m == NULL)
-        return;
-
-      value = p->p_vaddr;
-      
       if ((section->flags & SEC_READONLY) != 0)
 	{
 	  if (value < htab->text_segment_base)