Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-10 09:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't choose plugin target in binutils/

Browse Source 
Instead make bfd_check_format try the plugin target first when the
user hasn't supplied a target.

bfd/
	* format.c (bfd_check_format_matches): Try for a plugin target
	match first.
	* targets.c (bfd_find_target): Don't specially treat "plugin".
binutils/
	* ar.c (plugin_target): Delete.
	(open_inarch): Don't set target of archive elements.
	(replace_members): Use target rather than plugin_target when
	opening replacement or additional files.
	* arsup.c (plugin_target): Delete.  Replace all uses with NULL.
	(ar_open): Don't set element target.
	* bucomm.h (set_plugin_target): Delete.
	* nm.c (plugin_target): Delete.
	(display_archive): Don't set element target.
	(display_file): Alway use target when opening file.
	* objcopy.c (copy_archive): Don't use plugin target for output
	elements.
	* NEWS: Mention stricter target checking.
This commit is contained in:
Alan Modra
2025-08-18 18:33:54 +09:30
parent c3eb17bae4
commit 5e83077d55
8 changed files with 48 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
binutils/NEWS
View File

@@ -1,5 +1,12 @@
-*- text -*-
* Internal changes to plugin support, and stricter target checking may result
in some errors being exposed in user options passed to the various binutils.
For example objcopy --target=TARGET now will only work if the input file is
for TARGET whereas prior versions of objcopy accepted other target input
files and produced a TARGET output. If you do in fact want the old
behaviour the correct usage is objcopy --output-target=TARGET.
* NaCl target support is removed.
Changes in 2.45:

24
binutils/ar.c
View File

@@ -144,12 +144,6 @@ static int show_version = 0;
static int show_help = 0;
#if BFD_SUPPORTS_PLUGINS
static const char *plugin_target = "plugin";
#else
static const char *plugin_target = NULL;
#endif
static const char *target = NULL;
enum long_option_numbers
@@ -884,7 +878,7 @@ main (int argc, char **argv)
if (! bfd_make_readable (libdeps_bfd))
fatal (_("Cannot make libdeps object readable."));
if (bfd_find_target (plugin_target, libdeps_bfd) == NULL)
if (bfd_find_target (target, libdeps_bfd) == NULL)
fatal (_("Cannot reset libdeps record type."));
/* Insert our libdeps record in 2nd slot of the list of files
@@ -974,7 +968,6 @@ open_inarch (const char *archive_filename, const char *file)
bfd *arch;
char **matching;
const char *arch_target = target;
const struct bfd_target *plugin_vec;
bfd_set_error (bfd_error_no_error);
@@ -1064,21 +1057,12 @@ open_inarch (const char *archive_filename, const char *file)
}
}
/* We didn't open the archive using plugin_target, because the
plugin bfd_target does not support archives. Select
plugin_target now for elements so that we can recognise LTO IR
files and read IR symbols for use in the archive map. */
plugin_vec = NULL;
if (!target && plugin_target)
plugin_vec = bfd_find_target (plugin_target, NULL);
/* Open all the archive contents. */
last_one = &(arch->archive_next);
for (next_one = bfd_openr_next_archived_file (arch, NULL);
next_one;
next_one = bfd_openr_next_archived_file (arch, next_one))
{
set_plugin_target (next_one, plugin_vec);
*last_one = next_one;
last_one = &next_one->archive_next;
}
@@ -1570,9 +1554,8 @@ replace_members (bfd *arch, char **files_to_move, bool quick)
}
else
{
const char *targ = target ? target : plugin_target;
replaced = ar_emul_replace (after_bfd, *files_to_move,
targ, verbose);
target, verbose);
}
if (replaced)
{
@@ -1598,8 +1581,7 @@ replace_members (bfd *arch, char **files_to_move, bool quick)
}
else
{
const char *targ = target ? target : plugin_target;
changed |= ar_emul_append (after_bfd, *files_to_move, targ,
changed |= ar_emul_append (after_bfd, *files_to_move, target,
verbose, make_thin_archive);
}

19
binutils/arsup.c
View File

@@ -41,12 +41,6 @@ static char *temp_name;
static int temp_fd;
static FILE *outfile;
#if BFD_SUPPORTS_PLUGINS
static const char *plugin_target = "plugin";
#else
static const char *plugin_target = NULL;
#endif
static void
map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
{
@@ -203,15 +197,8 @@ ar_open (char *name, int t)
ptr = &(obfd->archive_head);
element = bfd_openr_next_archived_file (ibfd, NULL);
#if BFD_SUPPORTS_PLUGINS
const struct bfd_target *plugin_vec
= bfd_find_target (plugin_target, NULL);
#endif
while (element)
{
#if BFD_SUPPORTS_PLUGINS
set_plugin_target (element, plugin_vec);
#endif
*ptr = element;
ptr = &element->archive_next;
element = bfd_openr_next_archived_file (ibfd, element);
@@ -270,7 +257,7 @@ ar_addmod (struct list *list)
{
bfd *abfd;
abfd = bfd_openr (list->name, plugin_target);
abfd = bfd_openr (list->name, NULL);
if (!abfd)
{
fprintf (stderr, _("%s: can't open file %s\n"),
@@ -397,7 +384,7 @@ ar_replace (struct list *list)
if (FILENAME_CMP (bfd_get_filename (member), list->name) == 0)
{
/* Found the one to replace. */
bfd *abfd = bfd_openr (list->name, plugin_target);
bfd *abfd = bfd_openr (list->name, NULL);
if (!abfd)
{
@@ -421,7 +408,7 @@ ar_replace (struct list *list)
if (!found)
{
bfd *abfd = bfd_openr (list->name, plugin_target);
bfd *abfd = bfd_openr (list->name, NULL);
fprintf (stderr,_("%s: can't find module file %s\n"),
program_name, list->name);

15
binutils/bucomm.h
View File

@@ -84,19 +84,4 @@ extern int smart_rename (const char *, const char *, int,
((*res) = (a), (*res) *= (b), (b) != 0 && (*res) / (b) != (a))
#endif
/* Change ABFD target vector to TARG. ABFD is an archive element.
TARG is plugin_vec, or NULL if plugins are not supported. */
static inline void
set_plugin_target (bfd *abfd, const struct bfd_target *targ)
{
/* Don't change the target for archives like pdb that handle
elements specially, as detected by my_archive being NULL. */
if (abfd->my_archive && targ)
{
abfd->xvec = targ;
/* Don't fail if the element isn't recognised by the plugin. */
abfd->target_defaulted = true;
}
}
#endif /* _BUCOMM_H */

17
binutils/nm.c
View File

@@ -222,11 +222,6 @@ static char other_format[] = "%02x";
static char desc_format[] = "%04x";
static char *target = NULL;
#if BFD_SUPPORTS_PLUGINS
static const char *plugin_target = "plugin";
#else
static const char *plugin_target = NULL;
#endif
typedef enum unicode_display_type
{
@@ -1601,14 +1596,6 @@ display_archive (bfd *file)
if (print_armap)
print_symdef_entry (file);
/* We didn't open the archive using plugin_target, because the
plugin bfd_target does not support archives. Select
plugin_target now for elements so that we can recognise LTO IR
files and print IR symbols. */
const struct bfd_target *plugin_vec = NULL;
if (!target && plugin_target)
plugin_vec = bfd_find_target (plugin_target, NULL);
bfd *last_arfile = NULL;
for (;;)
{
@@ -1626,8 +1613,6 @@ display_archive (bfd *file)
if (last_arfile != NULL)
bfd_close (last_arfile);
set_plugin_target (arfile, plugin_vec);
char **matching;
if (bfd_check_format_matches (arfile, bfd_object, &matching))
{
@@ -1660,7 +1645,7 @@ display_file (char *filename)
if (get_file_size (filename) < 1)
return false;
file = bfd_openr (filename, target ? target : plugin_target);
file = bfd_openr (filename, target);
if (file == NULL)
{
bfd_nonfatal (filename);

10
binutils/objcopy.c
View File

@@ -3795,14 +3795,8 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
if (preserve_dates && stat_status == 0)
set_times (output_name, &buf);
/* Open the newly created output file and attach to our
list. We must enable the plugin target here in order to
read IR symbols for the archive map. */
const char *targ = output_target;
#if BFD_SUPPORTS_PLUGINS
if (!force_output_target)
targ = "plugin";
#endif
/* Open the newly created output file and attach to our list. */
const char *targ = force_output_target ? output_target : NULL;
output_element = bfd_openr (output_name, targ);
list->obfd = output_element;