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/ldmain.c | |
| parent | b0cffb47671ffbaac559c1f17a9f248256ea6c42 (diff) | |
| download | fsf-binutils-gdb-3860d2b4b72feeef4cf045c6c9907a0476f46f3d.zip fsf-binutils-gdb-3860d2b4b72feeef4cf045c6c9907a0476f46f3d.tar.gz fsf-binutils-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 'ld/ldmain.c')
| -rw-r--r-- | ld/ldmain.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ld/ldmain.c b/ld/ldmain.c index 3c5065f..406833b 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -865,17 +865,17 @@ add_archive_element (struct bfd_link_info *info, header_printed = TRUE; } - if (bfd_my_archive (abfd) == NULL - || bfd_is_thin_archive (bfd_my_archive (abfd))) + if (abfd->my_archive == NULL + || bfd_is_thin_archive (abfd->my_archive)) { minfo ("%s", bfd_get_filename (abfd)); len = strlen (bfd_get_filename (abfd)); } else { - minfo ("%s(%s)", bfd_get_filename (bfd_my_archive (abfd)), + minfo ("%s(%s)", bfd_get_filename (abfd->my_archive), bfd_get_filename (abfd)); - len = (strlen (bfd_get_filename (bfd_my_archive (abfd))) + len = (strlen (bfd_get_filename (abfd->my_archive)) + strlen (bfd_get_filename (abfd)) + 2); } |