* dlltool.c (gen_exp_file): Revert 19990411 change.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 47e692b..0a273fe 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun  2 12:34:36 1999  Richard Henderson  <rth@cygnus.com>
+
+       * dlltool.c (gen_exp_file): Revert 19990411 change.
+
 Mon May 31 09:56:22 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
 
        * readelf.c (process_relocs): Determine type of reloc from

diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index 9129126..2ba8135 100644 (file)
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -350,10 +350,6 @@ static int verbose;
 static FILE *output_def;
 static FILE *base_file;
 
-#ifdef DLLTOOL_BEOS
-static const char *mname = "beos";
-#endif
-
 #ifdef DLLTOOL_ARM
 static const char *mname = "arm";
 #endif
@@ -1874,8 +1870,6 @@ gen_exp_file ()
          int src;
          int dst = 0;
          int last = -1;
-         int totsize = 0;
-
          qsort (copy, num_entries, sizeof (long), sfunc);
          /* Delete duplcates */
          for (src = 0; src < num_entries; src++)
@@ -1889,31 +1883,18 @@ gen_exp_file ()
          on_page = 0;
          for (j = 0; j < num_entries; j++)
            {
-             totsize += 2;
              addr = copy[j];
              if ((addr & PAGE_MASK) != page_addr)
                {
-                 totsize += 8 + (on_page & 1)*2;
                  flush_page (f, need, page_addr, on_page);
                  on_page = 0;
                  page_addr = addr & PAGE_MASK;
                }
              need[on_page++] = addr;
            }
-
-         /* Pad the section to an even 32-byte boundary.  This will make
-            the BeOS loader much happier, and shouldn't matter for other
-            OSes. */
-         while ((totsize + 8 + (on_page & 1)*2) % 32 != 0)
-           {
-             /* 0x0000 is an absolute relocation that should be ignored.  */
-             need[on_page++] = 0x0000;
-             totsize += 2;
-           }
-
          flush_page (f, need, page_addr, on_page);
 
-         /* fprintf (f, "\t%s\t0,0\t%s End\n", ASM_LONG, ASM_C);*/
+/*       fprintf (f, "\t%s\t0,0\t%s End\n", ASM_LONG, ASM_C);*/
        }
     }