Moved in from p3:

Tue Oct 27 12:24:34 1992  Ian Lance Taylor  (ian@cygnus.com)

	* coffcode.h (coff_swap_aux_out): set the fcnary info before
	optionally setting the dimen info, since they are in the same
	memory locations.  Also zero out external auxent.
	(coff_write_symbol): don't zero external auxent; now done in
	coff_swap_aux_out.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b820465da9464c90f1cd0223f6158a8ef921134e..e0d4803708f78264c190dab1e2ab108e7e332592 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+Tue Oct 27 12:24:34 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+       * coffcode.h (coff_swap_aux_out): set the fcnary info before
+       optionally setting the dimen info, since they are in the same
+       memory locations.  Also zero out external auxent.
+       (coff_write_symbol): don't zero external auxent; now done in
+       coff_swap_aux_out.
+
 Fri Oct 23 13:55:35 1992  Ian Lance Taylor  (ian@cygnus.com)
 
        * Check fclose return value for errors.

diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index 2277cad222a940a333ab8beacdda95322a65a44f..348ba64ae361f04f97cefc31564fb0ef5509256e 100644 (file)
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -683,6 +683,8 @@ DEFUN(coff_swap_aux_out,(abfd, inp, type, class, extp),
 {
   union internal_auxent *in = (union internal_auxent *)inp;
   AUXENT *ext = (AUXENT *)extp;
+
+  memset((PTR)ext, 0, AUXESZ);
   switch (class) {
   case C_FILE:
     if (in->x_file.x_fname[0] == 0) {
@@ -733,13 +735,13 @@ DEFUN(coff_swap_aux_out,(abfd, inp, type, class, extp),
     bfd_h_put_16(abfd, in->x_sym.x_tvndx , (bfd_byte *) ext->x_sym.x_tvndx);
 #endif
 
+    PUT_FCN_LNNOPTR(abfd,  in->x_sym.x_fcnary.x_fcn.x_lnnoptr, ext);
+    PUT_FCN_ENDNDX(abfd,  in->x_sym.x_fcnary.x_fcn.x_endndx.l, ext);
+
     if (ISFCN(type)) {
       PUTWORD(abfd, in->x_sym.x_misc.x_fsize, (bfd_byte *)  ext->x_sym.x_misc.x_fsize);
-      PUT_FCN_LNNOPTR(abfd,  in->x_sym.x_fcnary.x_fcn.x_lnnoptr, ext);
-      PUT_FCN_ENDNDX(abfd,  in->x_sym.x_fcnary.x_fcn.x_endndx.l, ext);
     }
     else {
-
       if (ISARY(type) || class == C_BLOCK) {
 #if DIMNUM != E_DIMNUM
        -> Error, we need to cope with truncating or extending DIMNUM!;
@@ -752,11 +754,6 @@ DEFUN(coff_swap_aux_out,(abfd, inp, type, class, extp),
       }
       PUT_LNSZ_LNNO(abfd, in->x_sym.x_misc.x_lnsz.x_lnno, ext);
       PUT_LNSZ_SIZE(abfd, in->x_sym.x_misc.x_lnsz.x_size, ext);
-
-      PUT_FCN_LNNOPTR(abfd,  in->x_sym.x_fcnary.x_fcn.x_lnnoptr, ext);
-      PUT_FCN_ENDNDX(abfd,  in->x_sym.x_fcnary.x_fcn.x_endndx.l, ext);
-
-
     }
   }
 return sizeof(AUXENT);
@@ -1594,7 +1591,6 @@ unsigned int written)
   for (j = 0; j < native->u.syment.n_numaux;  j++)
   {
     AUXENT buf1;
-    memset((PTR)&buf, 0, AUXESZ);
     coff_swap_aux_out(abfd,
                      &( (native + j + 1)->u.auxent), type, class, &buf1);
     bfd_write((PTR) (&buf1), 1, AUXESZ, abfd);