OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* archive.c (bfd_slurp_armap): Recognize __.SYMDEF/ as well as

Browse Source 
__.SYMDEF; the former was used in old Linux archives.  From
	jrs@world.std.com (Rick Sladkey).
This commit is contained in:
Ian Lance Taylor 1994-06-15 17:22:41 +00:00
parent f7d2fa4455
commit aeef32f01c
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bfd/ChangeLog
View File

@ -1,5 +1,9 @@
Wed Jun 15 01:34:07 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) 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 * i386linux.c (i386linux_write_object_contents): Define; like
MY(write_object_contents) in aout-target.h, but set MACHTYPE to MY(write_object_contents) in aout-target.h, but set MACHTYPE to
M_386. From jrs@world.std.com (Rick Sladkey). M_386. From jrs@world.std.com (Rick Sladkey).

15
bfd/archive.c
View File

@ -904,7 +904,8 @@ bfd_slurp_armap (abfd)
if (bfd_seek (abfd, (file_ptr) - 16, SEEK_CUR) != 0) if (bfd_seek (abfd, (file_ptr) - 16, SEEK_CUR) != 0)
return false; 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); return do_slurp_bsd_armap (abfd);
else if (!strncmp (nextname, "/ ", 16)) else if (!strncmp (nextname, "/ ", 16))
return do_slurp_coff_armap (abfd); return do_slurp_coff_armap (abfd);
@ -943,7 +944,8 @@ bfd_slurp_bsd_armap_f2 (abfd)
if (bfd_seek (abfd, -16L, SEEK_CUR) != 0) if (bfd_seek (abfd, -16L, SEEK_CUR) != 0)
return false; 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); return do_slurp_bsd_armap (abfd);
if (strncmp (nextname, "/ ", 16)) if (strncmp (nextname, "/ ", 16))
@ -1528,8 +1530,7 @@ _bfd_write_archive_contents (arch)
else else
sprintf (&(hdr.ar_name[0]), "ARFILENAMES/"); sprintf (&(hdr.ar_name[0]), "ARFILENAMES/");
sprintf (&(hdr.ar_size[0]), "%-10d", (int) elength); sprintf (&(hdr.ar_size[0]), "%-10d", (int) elength);
hdr.ar_fmag[0] = '`'; strncpy (hdr.ar_fmag, ARFMAG, 2);
hdr.ar_fmag[1] = '\012';
for (i = 0; i < sizeof (struct ar_hdr); i++) for (i = 0; i < sizeof (struct ar_hdr); i++)
if (((char *) (&hdr))[i] == '\0') if (((char *) (&hdr))[i] == '\0')
(((char *) (&hdr))[i]) = ' '; (((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_uid, "%d", getuid ());
sprintf (hdr.ar_gid, "%d", getgid ()); sprintf (hdr.ar_gid, "%d", getgid ());
sprintf (hdr.ar_size, "%-10d", (int) mapsize); sprintf (hdr.ar_size, "%-10d", (int) mapsize);
hdr.ar_fmag[0] = '`'; strncpy (hdr.ar_fmag, ARFMAG, 2);
hdr.ar_fmag[1] = '\012';
for (i = 0; i < sizeof (struct ar_hdr); i++) for (i = 0; i < sizeof (struct ar_hdr); i++)
if (((char *) (&hdr))[i] == '\0') if (((char *) (&hdr))[i] == '\0')
(((char *) (&hdr))[i]) = ' '; (((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_uid), "%d", 0);
sprintf ((hdr.ar_gid), "%d", 0); sprintf ((hdr.ar_gid), "%d", 0);
sprintf ((hdr.ar_mode), "%-7o", (unsigned) 0); sprintf ((hdr.ar_mode), "%-7o", (unsigned) 0);
hdr.ar_fmag[0] = '`'; strncpy (hdr.ar_fmag, ARFMAG, 2);
hdr.ar_fmag[1] = '\012';
for (i = 0; i < sizeof (struct ar_hdr); i++) for (i = 0; i < sizeof (struct ar_hdr); i++)
if (((char *) (&hdr))[i] == '\0') if (((char *) (&hdr))[i] == '\0')