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. --- ld/plugin.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ld/plugin.c') diff --git a/ld/plugin.c b/ld/plugin.c index c347cfa61cc..ebde25ffe70 100644 --- a/ld/plugin.c +++ b/ld/plugin.c @@ -1089,9 +1089,9 @@ plugin_object_p (bfd *ibfd) return NULL; } - inarchive = (bfd_my_archive (ibfd) != NULL - && !bfd_is_thin_archive (bfd_my_archive (ibfd))); - name = inarchive ? bfd_my_archive (ibfd)->filename : ibfd->filename; + inarchive = (ibfd->my_archive != NULL + && !bfd_is_thin_archive (ibfd->my_archive)); + name = inarchive ? ibfd->my_archive->filename : ibfd->filename; fd = open (name, O_RDONLY | O_BINARY); if (fd < 0) -- cgit v1.2.3