diff options
| author | Alan Modra <amodra@gmail.com> | 2016-06-14 13:24:37 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2016-06-14 13:24:37 +0930 |
| commit | 3860d2b4b72feeef4cf045c6c9907a0476f46f3d (patch) | |
| tree | 60d7a2907b3fcc6cab7bb227ad14bf91d9913c93 /ld/ldmisc.c | |
| parent | b0cffb47671ffbaac559c1f17a9f248256ea6c42 (diff) | |
| download | binutils-gdb-3860d2b4b72feeef4cf045c6c9907a0476f46f3d.tar.gz | |
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 'ld/ldmisc.c')
| -rw-r--r-- | ld/ldmisc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ld/ldmisc.c b/ld/ldmisc.c index 321db9a21c5..5efff74feef 100644 --- a/ld/ldmisc.c +++ b/ld/ldmisc.c @@ -231,13 +231,13 @@ vfinfo (FILE *fp, const char *fmt, va_list arg, bfd_boolean is_warning) lang_input_statement_type *i; i = va_arg (arg, lang_input_statement_type *); - if (bfd_my_archive (i->the_bfd) != NULL - && !bfd_is_thin_archive (bfd_my_archive (i->the_bfd))) + if (i->the_bfd->my_archive != NULL + && !bfd_is_thin_archive (i->the_bfd->my_archive)) fprintf (fp, "(%s)", - bfd_get_filename (bfd_my_archive (i->the_bfd))); + bfd_get_filename (i->the_bfd->my_archive)); fprintf (fp, "%s", i->local_sym_name); - if ((bfd_my_archive (i->the_bfd) == NULL - || bfd_is_thin_archive (bfd_my_archive (i->the_bfd))) + if ((i->the_bfd->my_archive == NULL + || bfd_is_thin_archive (i->the_bfd->my_archive)) && filename_cmp (i->local_sym_name, i->filename) != 0) fprintf (fp, " (%s)", i->filename); } |