From 3860d2b4b72feeef4cf045c6c9907a0476f46f3d Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 14 Jun 2016 13:24:37 +0930 Subject: 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. --- binutils/size.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'binutils/size.c') diff --git a/binutils/size.c b/binutils/size.c index ddb3bf4..07a570e 100644 --- a/binutils/size.c +++ b/binutils/size.c @@ -499,8 +499,8 @@ print_berkeley_format (bfd *abfd) fputs (bfd_get_filename (abfd), stdout); - if (bfd_my_archive (abfd)) - printf (" (ex %s)", bfd_get_filename (bfd_my_archive (abfd))); + if (abfd->my_archive) + printf (" (ex %s)", bfd_get_filename (abfd->my_archive)); } /* I REALLY miss lexical functions! */ @@ -587,8 +587,8 @@ print_sysv_format (bfd *file) svi_total = 0; printf ("%s ", bfd_get_filename (file)); - if (bfd_my_archive (file)) - printf (" (ex %s)", bfd_get_filename (bfd_my_archive (file))); + if (file->my_archive) + printf (" (ex %s)", bfd_get_filename (file->my_archive)); printf (":\n%-*s %*s %*s\n", svi_namelen, "section", svi_sizelen, "size", svi_vmalen, "addr"); -- cgit v1.1