* dwarf.c (display_debug_loc): Cast section_end - start to long

[deliverable/binutils-gdb.git] / binutils / dlltool.c

diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index 8ee61d322004ff4111096b8a840a59f0b1b379b7..2459e21a75825c5be6c908340462848cebfc3d97 100644 (file)
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -6,7 +6,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -243,12 +243,13 @@
 
 #define PAGE_SIZE 4096
 #define PAGE_MASK (-PAGE_SIZE)
+#include "sysdep.h"
 #include "bfd.h"
 #include "libiberty.h"
-#include "bucomm.h"
 #include "getopt.h"
 #include "demangle.h"
 #include "dyn-string.h"
+#include "bucomm.h"
 #include "dlltool.h"
 #include "safe-ctype.h"
 
@@ -1890,7 +1891,7 @@ gen_exp_file (void)
                     ASM_RVA_BEFORE, exp->ordinal, ASM_RVA_AFTER);
        }
 
-      fprintf (f,"%s Export Oridinal Table\n", ASM_C);
+      fprintf (f,"%s Export Ordinal Table\n", ASM_C);
       fprintf (f, "anords:\n");
       for (i = 0; (exp = d_exports_lexically[i]); i++)
        {
@@ -2827,7 +2828,7 @@ gen_lib_file (void)
       if (exp->private)
        continue;
       n = make_one_lib_file (exp, i);
-      n->next = head;
+      n->archive_next = head;
       head = n;
       if (ext_prefix_alias)
        {
@@ -2846,14 +2847,14 @@ gen_lib_file (void)
          alias_exp.forward = exp->forward;
          alias_exp.next = exp->next;
          n = make_one_lib_file (&alias_exp, i + PREFIX_ALIAS_BASE);
-         n->next = head;
+         n->archive_next = head;
          head = n;
        }
     }
 
   /* Now stick them all into the archive.  */
-  ar_head->next = head;
-  ar_tail->next = ar_head;
+  ar_head->archive_next = head;
+  ar_tail->archive_next = ar_head;
   head = ar_tail;
 
   if (! bfd_set_archive_head (outarch, head))
@@ -2864,7 +2865,7 @@ gen_lib_file (void)
 
   while (head != NULL)
     {
-      bfd *n = head->next;
+      bfd *n = head->archive_next;
       bfd_close (head);
       head = n;
     }
@@ -2987,7 +2988,7 @@ process_duplicates (export_type **d_export_vec)
              if (a->ordinal != -1
                  && b->ordinal != -1)
                /* xgettext:c-format */
-               fatal (_("Error, duplicate EXPORT with oridinals: %s"),
+               fatal (_("Error, duplicate EXPORT with ordinals: %s"),
                      a->name);
 
              /* Merge attributes.  */