Re: PATCH: PR ld/4909: request for more helpful "can't allocate in segment" error message

["H.J. Lu" <hjl at lucon dot org>]

On Fri, Aug 10, 2007 at 07:41:37AM +0930, Alan Modra wrote:
> On Thu, Aug 09, 2007 at 12:11:19PM -0700, H.J. Lu wrote:
> > 	PR ld/4909
> > 	* elf.c (print_segment_map): New function.
> > 	(assign_file_positions_for_load_sections): Call print_segment_map
> > 	when a section can't be allocated in segment.
> 
> OK.  A few minor nits.
> 
> > +print_segment_map (struct elf_segment_map *m)
> 
> Make m const.
> 
> > +  fprintf (stderr, "%s: ", pt);
> 
> Don't print the space here.
> 
> > +  for (j = 0; j < m->count; j++)
> > +    fprintf (stderr, "%s ", m->sections [j]->name);
> 
> Preceed %s with a space here instead.
> 

This is the patch I am checking in.

Thanks.


H.J.
---
2007-08-09  H.J. Lu  <hongjiu.lu@intel.com>

	PR ld/4909
	* elf.c (print_segment_map): New function.
	(assign_file_positions_for_load_sections): Call print_segment_map
	when a section can't be allocated in segment.

--- bfd/elf.c.print	2007-08-09 06:56:01.000000000 -0700
+++ bfd/elf.c	2007-08-09 16:07:48.000000000 -0700
@@ -4073,6 +4073,32 @@ vma_page_aligned_bias (bfd_vma vma, ufil
   return ((vma - off) % maxpagesize);
 }
 
+static void
+print_segment_map (const struct elf_segment_map *m)
+{
+  unsigned int j;
+  const char *pt = get_segment_type (m->p_type);
+  char buf[32];
+
+  if (pt == NULL)
+    {
+      if (m->p_type >= PT_LOPROC && m->p_type <= PT_HIPROC)
+	sprintf (buf, "LOPROC+%7.7x",
+		 (unsigned int) (m->p_type - PT_LOPROC));
+      else if (m->p_type >= PT_LOOS && m->p_type <= PT_HIOS)
+	sprintf (buf, "LOOS+%7.7x",
+		 (unsigned int) (m->p_type - PT_LOOS));
+      else
+	snprintf (buf, sizeof (buf), "%8.8x",
+		  (unsigned int) m->p_type);
+      pt = buf;
+    }
+  fprintf (stderr, "%s:", pt);
+  for (j = 0; j < m->count; j++)
+    fprintf (stderr, " %s", m->sections [j]->name);
+  putc ('\n',stderr);
+}
+
 /* Assign file positions to the sections based on the mapping from
    sections to segments.  This function also sets up some fields in
    the file header.  */
@@ -4460,6 +4486,7 @@ assign_file_positions_for_load_sections 
 		(*_bfd_error_handler)
 		  (_("%B: section `%A' can't be allocated in segment %d"),
 		   abfd, sec, j);
+		print_segment_map (m);
 		bfd_set_error (bfd_error_bad_value);
 		return FALSE;
 	      }