* pe-dll.c (fill_edata): initialize entire block

(make_one): fill in correct section.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7fe1bbdee2ec98c6d6fccdc5edb6af6c14e03a49..395f3510ddfce2330a7ad342a144168833aed783 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-03  DJ Delorie  <dj@redhat.com>
+
+       * pe-dll.c (fill_edata): initialize entire block
+       (make_one): fill in correct section.
+
 2000-10-03  Kazu Hirata  <kazu@hxi.com>
 
        * ldexp.c: Fix formatting.

diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index a4be5f02a43f1f9597d07595c34dd89d2488b175..b869b3fd9c33814f379334ee58d0e094d03663e1 100644 (file)
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -676,7 +676,7 @@ fill_edata (abfd, info)
 
 #define ERVA(ptr) (((unsigned char *)(ptr) - edata_d) + edata_s->output_section->vma - image_base)
 
-  memset (edata_d, 0, 40);
+  memset (edata_d, 0, edata_sz);
   bfd_put_32 (abfd, now, edata_d + 4);
   if (pe_def_file->version_major != -1)
     {
@@ -1503,9 +1503,9 @@ make_one (exp, parent)
   memset (d4, 0, 4);
   if (exp->flag_noname)
     {
-      d5[0] = exp->ordinal;
-      d5[1] = exp->ordinal >> 8;
-      d5[3] = 0x80;
+      d4[0] = exp->ordinal;
+      d4[1] = exp->ordinal >> 8;
+      d4[3] = 0x80;
     }
   else
     {