aboutsummaryrefslogtreecommitdiff
path: root/binutils/ar.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2016-06-14 13:24:37 +0930
committerAlan Modra <amodra@gmail.com>2016-06-14 13:24:37 +0930
commit3860d2b4b72feeef4cf045c6c9907a0476f46f3d (patch)
tree60d7a2907b3fcc6cab7bb227ad14bf91d9913c93 /binutils/ar.c
parentb0cffb47671ffbaac559c1f17a9f248256ea6c42 (diff)
downloadgdb-3860d2b4b72feeef4cf045c6c9907a0476f46f3d.zip
gdb-3860d2b4b72feeef4cf045c6c9907a0476f46f3d.tar.gz
gdb-3860d2b4b72feeef4cf045c6c9907a0476f46f3d.tar.bz2
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.
Diffstat (limited to 'binutils/ar.c')
-rw-r--r--binutils/ar.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/binutils/ar.c b/binutils/ar.c
index 3d2bc59..3afa253 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -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)