* avr.h: Update for new devices.

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

diff --git a/bfd/merge.c b/bfd/merge.c
index 3d0904153eb85c88d72bffa78529ec62916d948d..d3586feb69dac02ea24667b64172321557dba632 100644 (file)
--- a/bfd/merge.c
+++ b/bfd/merge.c
@@ -26,8 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "libbfd.h"
 #include "hashtab.h"
 
-#include <ctype.h>
-
 struct sec_merge_sec_info;
 
 /* An entry in the section merge hash table.  */
@@ -108,6 +106,12 @@ static struct sec_merge_hash_entry *sec_merge_add
           struct sec_merge_sec_info *));
 static boolean sec_merge_emit
   PARAMS ((bfd *, struct sec_merge_hash_entry *));
+static int cmplengthentry PARAMS ((const PTR, const PTR));
+static int last4_eq PARAMS ((const PTR, const PTR));
+static int last_eq PARAMS ((const PTR, const PTR));
+static boolean record_section
+  PARAMS ((struct sec_merge_info *, struct sec_merge_sec_info *));
+static void merge_strings PARAMS ((struct sec_merge_info *));
 
 /* Routine to create an entry in a section merge hashtab.  */
 
@@ -196,7 +200,7 @@ sec_merge_hash_lookup (table, string, alignment, create)
        }
       hash ^= hash >> 2;
       len += table->entsize;
-    }      
+    }
   else
     {
       for (i = 0; i < table->entsize; ++i)
@@ -256,9 +260,9 @@ sec_merge_init (entsize, strings)
      boolean strings;
 {
   struct sec_merge_hash *table;
+  bfd_size_type amt = sizeof (struct sec_merge_hash);
 
-  table = ((struct sec_merge_hash *)
-          bfd_malloc (sizeof (struct sec_merge_hash)));
+  table = (struct sec_merge_hash *) bfd_malloc (amt);
   if (table == NULL)
     return NULL;
 
@@ -319,7 +323,7 @@ sec_merge_emit (abfd, entry)
   int alignment_power = bfd_get_section_alignment (abfd, sec->output_section);
 
   if (alignment_power)
-    pad = bfd_zmalloc (1 << alignment_power);
+    pad = bfd_zmalloc ((bfd_size_type) 1 << alignment_power);
 
   for (; entry != NULL && entry->secinfo == secinfo; entry = entry->next)
     {
@@ -330,7 +334,7 @@ sec_merge_emit (abfd, entry)
       if (len)
        {
          len = entry->alignment - len;
-         if (bfd_write ((PTR) pad, 1, len, abfd) != len)
+         if (bfd_bwrite ((PTR) pad, (bfd_size_type) len, abfd) != len)
            break;
          off += len;
        }
@@ -338,7 +342,7 @@ sec_merge_emit (abfd, entry)
       str = entry->root.string;
       len = entry->len;
 
-      if (bfd_write ((PTR) str, 1, len, abfd) != len)
+      if (bfd_bwrite ((PTR) str, (bfd_size_type) len, abfd) != len)
        break;
 
       off += len;
@@ -363,6 +367,7 @@ _bfd_merge_section (abfd, psinfo, sec, psecinfo)
   struct sec_merge_info *sinfo;
   struct sec_merge_sec_info *secinfo;
   unsigned int align;
+  bfd_size_type amt;
 
   if (sec->_raw_size == 0
       || (sec->flags & SEC_EXCLUDE)
@@ -411,7 +416,7 @@ _bfd_merge_section (abfd, psinfo, sec, psecinfo)
     {
       /* Initialize the information we need to keep track of.  */
       sinfo = (struct sec_merge_info *)
-             bfd_alloc (abfd, sizeof (struct sec_merge_info));
+             bfd_alloc (abfd, (bfd_size_type) sizeof (struct sec_merge_info));
       if (sinfo == NULL)
        goto error_return;
       sinfo->next = (struct sec_merge_info *) *psinfo;
@@ -425,8 +430,8 @@ _bfd_merge_section (abfd, psinfo, sec, psecinfo)
 
   /* Read the section from abfd.  */
 
-  *psecinfo = bfd_alloc (abfd, sizeof (struct sec_merge_sec_info)
-                              + sec->_raw_size - 1);
+  amt = sizeof (struct sec_merge_sec_info) + sec->_raw_size - 1;
+  *psecinfo = bfd_alloc (abfd, amt);
   if (*psecinfo == NULL)
     goto error_return;
 
@@ -444,8 +449,8 @@ _bfd_merge_section (abfd, psinfo, sec, psecinfo)
   secinfo->htab = sinfo->htab;
   secinfo->first = NULL;
 
-  if (! bfd_get_section_contents (sec->owner, sec, secinfo->contents, 0,
-                                 sec->_raw_size))
+  if (! bfd_get_section_contents (sec->owner, sec, secinfo->contents,
+                                 (bfd_vma) 0, sec->_raw_size))
     goto error_return;
 
   return true;
@@ -464,7 +469,7 @@ cmplengthentry (a, b)
 {
   struct sec_merge_hash_entry * A = *(struct sec_merge_hash_entry **) a;
   struct sec_merge_hash_entry * B = *(struct sec_merge_hash_entry **) b;
-              
+
   if (A->len < B->len)
     return 1;
   else if (A->len > B->len)
@@ -475,7 +480,8 @@ cmplengthentry (a, b)
 
 static int
 last4_eq (a, b)
-     const void *a, *b;
+     const PTR a;
+     const PTR b;
 {
   struct sec_merge_hash_entry * A = (struct sec_merge_hash_entry *) a;
   struct sec_merge_hash_entry * B = (struct sec_merge_hash_entry *) b;
@@ -502,7 +508,8 @@ last4_eq (a, b)
 
 static int
 last_eq (a, b)
-     const void *a, *b;
+     const PTR a;
+     const PTR b;
 {
   struct sec_merge_hash_entry * A = (struct sec_merge_hash_entry *) a;
   struct sec_merge_hash_entry * B = (struct sec_merge_hash_entry *) b;
@@ -548,16 +555,16 @@ record_section (sinfo, secinfo)
   align = bfd_get_section_alignment (sec->owner, sec);
   end = secinfo->contents + sec->_raw_size;
   nul = false;
-  mask = ((bfd_vma)1 << align) - 1;
+  mask = ((bfd_vma) 1 << align) - 1;
   if (sec->flags & SEC_STRINGS)
     {
-      for (p = secinfo->contents; p < end;)
+      for (p = secinfo->contents; p < end; )
        {
          eltalign = p - secinfo->contents;
          eltalign = ((eltalign ^ (eltalign - 1)) + 1) >> 1;
          if (!eltalign || eltalign > mask)
            eltalign = mask + 1;
-         entry = sec_merge_add (sinfo->htab, p, eltalign, secinfo);
+         entry = sec_merge_add (sinfo->htab, p, (unsigned) eltalign, secinfo);
          if (! entry)
            goto error_return;
          p += entry->len;
@@ -568,8 +575,8 @@ record_section (sinfo, secinfo)
                  if (!nul && !((p - secinfo->contents) & mask))
                    {
                      nul = true;
-                     entry = sec_merge_add (sinfo->htab, "", mask + 1,
-                                            secinfo);
+                     entry = sec_merge_add (sinfo->htab, "",
+                                            (unsigned) mask + 1, secinfo);
                      if (! entry)
                        goto error_return;
                    }
@@ -588,8 +595,8 @@ record_section (sinfo, secinfo)
                  if (!nul && !((p - secinfo->contents) & mask))
                    {
                      nul = true;
-                     entry = sec_merge_add (sinfo->htab, p, mask + 1,
-                                            secinfo);
+                     entry = sec_merge_add (sinfo->htab, p,
+                                            (unsigned) mask + 1, secinfo);
                      if (! entry)
                        goto error_return;
                    }
@@ -625,12 +632,12 @@ merge_strings (sinfo)
   struct sec_merge_hash_entry **array, **a, **end, *e;
   struct sec_merge_sec_info *secinfo;
   htab_t lasttab = NULL, last4tab = NULL;
-  bfd_size_type size;
+  bfd_size_type size, amt;
 
   /* Now sort the strings by length, longest first.  */
-  array = (struct sec_merge_hash_entry **)
-         malloc (sinfo->htab->size
-                 * sizeof (struct sec_merge_hash_entry *));
+  array = NULL;
+  amt = sinfo->htab->size * sizeof (struct sec_merge_hash_entry *);
+  array = (struct sec_merge_hash_entry **) bfd_malloc (amt);
   if (array == NULL)
     goto alloc_failure;
 
@@ -640,11 +647,11 @@ merge_strings (sinfo)
 
   sinfo->htab->size = a - array;
 
-  qsort (array, sinfo->htab->size, sizeof (struct sec_merge_hash_entry *),
-        cmplengthentry);
+  qsort (array, (size_t) sinfo->htab->size,
+        sizeof (struct sec_merge_hash_entry *), cmplengthentry);
 
-  last4tab = htab_create (sinfo->htab->size * 4, NULL, last4_eq, NULL);
-  lasttab = htab_create (sinfo->htab->size * 4, NULL, last_eq, NULL);
+  last4tab = htab_create ((size_t) sinfo->htab->size * 4, NULL, last4_eq, NULL);
+  lasttab = htab_create ((size_t) sinfo->htab->size * 4, NULL, last_eq, NULL);
   if (lasttab == NULL || last4tab == NULL)
     goto alloc_failure;
 
@@ -842,15 +849,15 @@ _bfd_write_merged_section (output_bfd, sec, psecinfo)
      PTR psecinfo;
 {
   struct sec_merge_sec_info *secinfo;
+  file_ptr pos;
 
   secinfo = (struct sec_merge_sec_info *) psecinfo;
 
   if (!secinfo->first)
     return true;
 
-  if (bfd_seek (output_bfd,
-               (sec->output_section->filepos + sec->output_offset),
-               SEEK_SET) != 0)
+  pos = sec->output_section->filepos + sec->output_offset;
+  if (bfd_seek (output_bfd, pos, SEEK_SET) != 0)
     return false;
 
   if (! sec_merge_emit (output_bfd, secinfo->first))
@@ -880,9 +887,11 @@ _bfd_merged_section_offset (output_bfd, psec, psecinfo, offset, addend)
   if (offset + addend >= sec->_raw_size)
     {
       if (offset + addend > sec->_raw_size)
-       (*_bfd_error_handler) (_("%s: access beyond end of merged section (%ld + %ld)"),
-                              bfd_get_filename (sec->owner), (long)offset,
-                              (long) addend);
+       {
+         (*_bfd_error_handler)
+           (_("%s: access beyond end of merged section (%ld + %ld)"),
+            bfd_get_filename (sec->owner), (long) offset, (long) addend);
+       }
       return (secinfo->first ? sec->_cooked_size : 0);
     }