FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Delete bfd_my_archive macro

Browse source 
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.
This commit is contained in:
Alan Modra 2016-06-14 13:24:37 +09:30
parent b0cffb4767
commit 3860d2b4b7
11 changed files with 39 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ld/ldmain.c
View file

@ -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);
}