espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-18 08:38:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2016-06-14 Alan Modra <amodra@gmail.com>
* bfd-in.h (bfd_my_archive): Delete.
* bfd-in2.h: Regenerate.
2016-06-14 Alan Modra <amodra@gmail.com> 2016-06-14 Alan Modra <amodra@gmail.com>
PR ld/20241 PR ld/20241

1
bfd/bfd-in.h
View File

@ -511,7 +511,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *);
#define bfd_get_file_flags(abfd) ((abfd)->flags) #define bfd_get_file_flags(abfd) ((abfd)->flags)
#define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags) #define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags)
#define bfd_applicable_section_flags(abfd) ((abfd)->xvec->section_flags) #define bfd_applicable_section_flags(abfd) ((abfd)->xvec->section_flags)
#define bfd_my_archive(abfd) ((abfd)->my_archive)
#define bfd_has_map(abfd) ((abfd)->has_armap) #define bfd_has_map(abfd) ((abfd)->has_armap)
#define bfd_is_thin_archive(abfd) ((abfd)->is_thin_archive) #define bfd_is_thin_archive(abfd) ((abfd)->is_thin_archive)

1
bfd/bfd-in2.h
View File

@ -518,7 +518,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *);
#define bfd_get_file_flags(abfd) ((abfd)->flags) #define bfd_get_file_flags(abfd) ((abfd)->flags)
#define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags) #define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags)
#define bfd_applicable_section_flags(abfd) ((abfd)->xvec->section_flags) #define bfd_applicable_section_flags(abfd) ((abfd)->xvec->section_flags)
#define bfd_my_archive(abfd) ((abfd)->my_archive)
#define bfd_has_map(abfd) ((abfd)->has_armap) #define bfd_has_map(abfd) ((abfd)->has_armap)
#define bfd_is_thin_archive(abfd) ((abfd)->is_thin_archive) #define bfd_is_thin_archive(abfd) ((abfd)->is_thin_archive)

5
binutils/ChangeLog
View File

@ -1,3 +1,8 @@
2016-06-14 Alan Modra <amodra@gmail.com>
* ar.c: Expand uses of bfd_my_archive.
* size.c: Likewise.
2016-06-14 Alan Modra <amodra@gmail.com> 2016-06-14 Alan Modra <amodra@gmail.com>
PR ld/20241 PR ld/20241

4
binutils/ar.c
View File

@ -1003,7 +1003,7 @@ print_contents (bfd *abfd)
if (nread != tocopy) if (nread != tocopy)
/* xgettext:c-format */ /* xgettext:c-format */
fatal (_("%s is not a valid archive"), 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 /* 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 return value to bfd_size_type to avoid comparison between signed and
@ -1081,7 +1081,7 @@ extract_file (bfd *abfd)
if (nread != tocopy) if (nread != tocopy)
/* xgettext:c-format */ /* xgettext:c-format */
fatal (_("%s is not a valid archive"), 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 */ /* See comment above; this saves disk arm motion */
if (ostream == NULL) if (ostream == NULL)

8
binutils/size.c
View File

@ -499,8 +499,8 @@ print_berkeley_format (bfd *abfd)
fputs (bfd_get_filename (abfd), stdout); fputs (bfd_get_filename (abfd), stdout);
if (bfd_my_archive (abfd)) if (abfd->my_archive)
printf (" (ex %s)", bfd_get_filename (bfd_my_archive (abfd))); printf (" (ex %s)", bfd_get_filename (abfd->my_archive));
} }
/* I REALLY miss lexical functions! */ /* I REALLY miss lexical functions! */
@ -587,8 +587,8 @@ print_sysv_format (bfd *file)
svi_total = 0; svi_total = 0;
printf ("%s ", bfd_get_filename (file)); printf ("%s ", bfd_get_filename (file));
if (bfd_my_archive (file)) if (file->my_archive)
printf (" (ex %s)", bfd_get_filename (bfd_my_archive (file))); printf (" (ex %s)", bfd_get_filename (file->my_archive));
printf (":\n%-*s %*s %*s\n", svi_namelen, "section", printf (":\n%-*s %*s %*s\n", svi_namelen, "section",
svi_sizelen, "size", svi_vmalen, "addr"); svi_sizelen, "size", svi_vmalen, "addr");

7
ld/ChangeLog
View File

@ -1,3 +1,10 @@
2016-06-14 Alan Modra <amodra@gmail.com>
* ldlang.c: Expand uses of bfd_my_archive.
* ldmain.c: Likewise.
* ldmisc.c: Likewise.
* plugin.c: Likewise.
2016-06-14 Alan Modra <amodra@gmail.com> 2016-06-14 Alan Modra <amodra@gmail.com>
PR ld/20241 PR ld/20241

8
ld/ldlang.c
View File

@ -2499,9 +2499,9 @@ wild_sort (lang_wild_statement_type *wild,
archive. */ archive. */
if (file->the_bfd != NULL if (file->the_bfd != NULL
&& bfd_my_archive (file->the_bfd) != NULL) && file->the_bfd->my_archive != NULL)
{ {
fn = bfd_get_filename (bfd_my_archive (file->the_bfd)); fn = bfd_get_filename (file->the_bfd->my_archive);
fa = TRUE; fa = TRUE;
} }
else else
@ -2510,9 +2510,9 @@ wild_sort (lang_wild_statement_type *wild,
fa = FALSE; fa = FALSE;
} }
if (bfd_my_archive (ls->section->owner) != NULL) if (ls->section->owner->my_archive != NULL)
{ {
ln = bfd_get_filename (bfd_my_archive (ls->section->owner)); ln = bfd_get_filename (ls->section->owner->my_archive);
la = TRUE; la = TRUE;
} }
else else

8
ld/ldmain.c
View File

@ -865,17 +865,17 @@ add_archive_element (struct bfd_link_info *info,
header_printed = TRUE; header_printed = TRUE;
} }
if (bfd_my_archive (abfd) == NULL if (abfd->my_archive == NULL
|| bfd_is_thin_archive (bfd_my_archive (abfd))) || bfd_is_thin_archive (abfd->my_archive))
{ {
minfo ("%s", bfd_get_filename (abfd)); minfo ("%s", bfd_get_filename (abfd));
len = strlen (bfd_get_filename (abfd)); len = strlen (bfd_get_filename (abfd));
} }
else else
{ {
minfo ("%s(%s)", bfd_get_filename (bfd_my_archive (abfd)), minfo ("%s(%s)", bfd_get_filename (abfd->my_archive),
bfd_get_filename (abfd)); 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)) + strlen (bfd_get_filename (abfd))
+ 2); + 2);
} }

10
ld/ldmisc.c
View File

@ -231,13 +231,13 @@ vfinfo (FILE *fp, const char *fmt, va_list arg, bfd_boolean is_warning)
lang_input_statement_type *i; lang_input_statement_type *i;
i = va_arg (arg, lang_input_statement_type *); i = va_arg (arg, lang_input_statement_type *);
if (bfd_my_archive (i->the_bfd) != NULL if (i->the_bfd->my_archive != NULL
&& !bfd_is_thin_archive (bfd_my_archive (i->the_bfd))) && !bfd_is_thin_archive (i->the_bfd->my_archive))
fprintf (fp, "(%s)", 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); fprintf (fp, "%s", i->local_sym_name);
if ((bfd_my_archive (i->the_bfd) == NULL if ((i->the_bfd->my_archive == NULL
|| bfd_is_thin_archive (bfd_my_archive (i->the_bfd))) || bfd_is_thin_archive (i->the_bfd->my_archive))
&& filename_cmp (i->local_sym_name, i->filename) != 0) && filename_cmp (i->local_sym_name, i->filename) != 0)
fprintf (fp, " (%s)", i->filename); fprintf (fp, " (%s)", i->filename);
} }

6
ld/plugin.c
View File

@ -1089,9 +1089,9 @@ plugin_object_p (bfd *ibfd)
return NULL; return NULL;
} }
inarchive = (bfd_my_archive (ibfd) != NULL inarchive = (ibfd->my_archive != NULL
&& !bfd_is_thin_archive (bfd_my_archive (ibfd))); && !bfd_is_thin_archive (ibfd->my_archive));
name = inarchive ? bfd_my_archive (ibfd)->filename : ibfd->filename; name = inarchive ? ibfd->my_archive->filename : ibfd->filename;
fd = open (name, O_RDONLY | O_BINARY); fd = open (name, O_RDONLY | O_BINARY);
if (fd < 0) if (fd < 0)