Delete bfd_my_archive macro

Many more places use abfd->my_archive rather than bfd_my_archive (abfd),
so let's make the code consistently use the first idiom.

bfd/
	* bfd-in.h (bfd_my_archive): Delete.
	* bfd-in2.h: Regenerate.
binutils/
	* ar.c: Expand uses of bfd_my_archive.
	* size.c: Likewise.
ld/
	* ldlang.c: Expand uses of bfd_my_archive.
	* ldmain.c: Likewise.
	* ldmisc.c: Likewise.
	* plugin.c: Likewise.
This commit is contained in:
Alan Modra
2016-06-14 13:24:37 +09:30
parent b0cffb4767
commit 3860d2b4b7
11 changed files with 39 additions and 24 deletions

View File

@ -1003,7 +1003,7 @@ print_contents (bfd *abfd)
if (nread != tocopy)
/* xgettext:c-format */
fatal (_("%s is not a valid archive"),
bfd_get_filename (bfd_my_archive (abfd)));
bfd_get_filename (abfd->my_archive));
/* fwrite in mingw32 may return int instead of bfd_size_type. Cast the
return value to bfd_size_type to avoid comparison between signed and
@ -1081,7 +1081,7 @@ extract_file (bfd *abfd)
if (nread != tocopy)
/* xgettext:c-format */
fatal (_("%s is not a valid archive"),
bfd_get_filename (bfd_my_archive (abfd)));
bfd_get_filename (abfd->my_archive));
/* See comment above; this saves disk arm motion */
if (ostream == NULL)