daily update

[deliverable/binutils-gdb.git] / bfd / section.c

diff --git a/bfd/section.c b/bfd/section.c
index 5a335a62909ad67754c3d6c6763302b5bf2f01a2..d92dc2d4d7a7d8b7f5588041e54792ae23d16bcd 100644 (file)
--- a/bfd/section.c
+++ b/bfd/section.c
@@ -428,6 +428,13 @@ CODE_FRAGMENT
 .     section size calculated on a previous linker relaxation pass.  *}
 .  bfd_size_type rawsize;
 .
+.  {* Relaxation table. *}
+.  struct relax_table *relax;
+.
+.  {* Count of used relaxation table entries. *}
+.  int relax_count;
+.
+.
 .  {* If this section is going to be output, then this value is the
 .     offset in *bytes* into the output section of the first byte in the
 .     input section (byte ==> smallest addressable unit on the
@@ -517,6 +524,17 @@ CODE_FRAGMENT
 .  } map_head, map_tail;
 .} asection;
 .
+.{* Relax table contains information about instructions which can
+.   be removed by relaxation -- replacing a long address with a 
+.   short address.  *}
+.struct relax_table {
+.  {* Address where bytes may be deleted. *}
+.  bfd_vma addr;
+.  
+.  {* Number of bytes to be deleted.  *}
+.  int size;
+.};
+.
 .{* These sections are global, and are managed by BFD.  The application
 .   and target back end are not permitted to change the values in
 .   these sections.  New code should use the section_ptr macros rather
@@ -652,8 +670,8 @@ CODE_FRAGMENT
 .  {* has_tls_get_addr_call, has_gp_reloc, need_finalize_relax,     *} \
 .     0,                     0,            0,                          \
 .                                                                      \
-.  {* reloc_done, vma, lma, size, rawsize                           *} \
-.     0,          0,   0,   0,    0,                                   \
+.  {* reloc_done, vma, lma, size, rawsize, relax, relax_count,      *} \
+.     0,          0,   0,   0,    0,       0,     0,                   \
 .                                                                      \
 .  {* output_offset, output_section,              alignment_power,  *} \
 .     0,             (struct bfd_section *) &SEC, 0,                   \
@@ -919,7 +937,7 @@ bfd_get_unique_section_name (bfd *abfd, const char *templat, int *count)
   char *sname;
 
   len = strlen (templat);
-  sname = bfd_malloc (len + 8);
+  sname = (char *) bfd_malloc (len + 8);
   if (sname == NULL)
     return NULL;
   memcpy (sname, templat, len);
@@ -1436,6 +1454,16 @@ bfd_get_section_contents (bfd *abfd,
 
   if ((section->flags & SEC_IN_MEMORY) != 0)
     {
+      if (section->contents == NULL)
+       {
+         /* This can happen because of errors earlier on in the linking process.
+            We do not want to seg-fault here, so clear the flag and return an
+            error code.  */
+         section->flags &= ~ SEC_IN_MEMORY;
+         bfd_set_error (bfd_error_invalid_operation);
+         return FALSE;
+       }
+      
       memcpy (location, section->contents + offset, (size_t) count);
       return TRUE;
     }
@@ -1467,7 +1495,8 @@ bfd_malloc_and_get_section (bfd *abfd, sec_ptr sec, bfd_byte **buf)
   if (sz == 0)
     return TRUE;
 
-  p = bfd_malloc (sec->rawsize > sec->size ? sec->rawsize : sec->size);
+  p = (bfd_byte *)
+      bfd_malloc (sec->rawsize > sec->size ? sec->rawsize : sec->size);
   if (p == NULL)
     return FALSE;
   *buf = p;