diff options
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/archive.c | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 14d2a11..ab47c60 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,9 @@ Wed Jun 15 01:34:07 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + * archive.c (bfd_slurp_armap): Recognize __.SYMDEF/ as well as + __.SYMDEF; the former was used in old Linux archives. From + jrs@world.std.com (Rick Sladkey). + * i386linux.c (i386linux_write_object_contents): Define; like MY(write_object_contents) in aout-target.h, but set MACHTYPE to M_386. From jrs@world.std.com (Rick Sladkey). diff --git a/bfd/archive.c b/bfd/archive.c index d945ceb..ce79af4 100644 --- a/bfd/archive.c +++ b/bfd/archive.c @@ -904,7 +904,8 @@ bfd_slurp_armap (abfd) if (bfd_seek (abfd, (file_ptr) - 16, SEEK_CUR) != 0) return false; - if (!strncmp (nextname, "__.SYMDEF ", 16)) + if (!strncmp (nextname, "__.SYMDEF ", 16) + || !strncmp (nextname, "__.SYMDEF/ ", 16)) /* old Linux archives */ return do_slurp_bsd_armap (abfd); else if (!strncmp (nextname, "/ ", 16)) return do_slurp_coff_armap (abfd); @@ -943,7 +944,8 @@ bfd_slurp_bsd_armap_f2 (abfd) if (bfd_seek (abfd, -16L, SEEK_CUR) != 0) return false; - if (!strncmp (nextname, "__.SYMDEF ", 16)) + if (!strncmp (nextname, "__.SYMDEF ", 16) + || !strncmp (nextname, "__.SYMDEF/ ", 16)) /* old Linux archives */ return do_slurp_bsd_armap (abfd); if (strncmp (nextname, "/ ", 16)) @@ -1528,8 +1530,7 @@ _bfd_write_archive_contents (arch) else sprintf (&(hdr.ar_name[0]), "ARFILENAMES/"); sprintf (&(hdr.ar_size[0]), "%-10d", (int) elength); - hdr.ar_fmag[0] = '`'; - hdr.ar_fmag[1] = '\012'; + strncpy (hdr.ar_fmag, ARFMAG, 2); for (i = 0; i < sizeof (struct ar_hdr); i++) if (((char *) (&hdr))[i] == '\0') (((char *) (&hdr))[i]) = ' '; @@ -1798,8 +1799,7 @@ bsd_write_armap (arch, elength, map, orl_count, stridx) sprintf (hdr.ar_uid, "%d", getuid ()); sprintf (hdr.ar_gid, "%d", getgid ()); sprintf (hdr.ar_size, "%-10d", (int) mapsize); - hdr.ar_fmag[0] = '`'; - hdr.ar_fmag[1] = '\012'; + strncpy (hdr.ar_fmag, ARFMAG, 2); for (i = 0; i < sizeof (struct ar_hdr); i++) if (((char *) (&hdr))[i] == '\0') (((char *) (&hdr))[i]) = ' '; @@ -1955,8 +1955,7 @@ coff_write_armap (arch, elength, map, symbol_count, stridx) sprintf ((hdr.ar_uid), "%d", 0); sprintf ((hdr.ar_gid), "%d", 0); sprintf ((hdr.ar_mode), "%-7o", (unsigned) 0); - hdr.ar_fmag[0] = '`'; - hdr.ar_fmag[1] = '\012'; + strncpy (hdr.ar_fmag, ARFMAG, 2); for (i = 0; i < sizeof (struct ar_hdr); i++) if (((char *) (&hdr))[i] == '\0') |