yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delete PROGRESS macros

Browse Source 
I don't see much point in cluttering the source with the PROGRESS
macros, which of course do nothing at all with the definitions in
progress.h.  progress.h is unchanged apart from the copyright comment
since commit d4d4c53c68f0 in 1994.

binutils/
	* ar.c: Don't include progress.h, or invoke PROGRESS macros.
	* nm.c: Likewise.
	* objcopy.c: Likewise.
	* objdump.c: Likewise.
gas/
	* as.h: Don't include progress.h.
	* as.c: Don't invoke PROGRESS macros.
	* write.c: Likewise.
include/
	* progress.h: Delete.
ld/
	* ldmain.c: Don't include progress.h, or invoke PROGRESS macros.
This commit is contained in:
Alan Modra 2023-02-16 09:15:57 +10:30
parent 7f27b6b18a
commit 7ed4ad59e9
9 changed files with 1 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
binutils/ar.c
View File

@ -26,7 +26,6 @@
#include "sysdep.h"
#include "bfd.h"
#include "libiberty.h"
#include "progress.h"
#include "getopt.h"
#include "aout/ar.h"
#include "bucomm.h"
@ -198,10 +197,7 @@ map_over_members (bfd *arch, void (*function)(bfd *), char **files, int count)
if (count == 0)
{
for (head = arch->archive_next; head; head = head->archive_next)
{
PROGRESS (1);
function (head);
}
function (head);
return;
}
@ -223,7 +219,6 @@ map_over_members (bfd *arch, void (*function)(bfd *), char **files, int count)
{
const char * filename;
PROGRESS (1);
/* PR binutils/15796: Once an archive element has been matched
do not match it again. If the user provides multiple same-named
parameters on the command line their intent is to match multiple
@ -749,8 +744,6 @@ main (int argc, char **argv)
is_ranlib = 0;
}
START_PROGRESS (program_name, 0);
if (bfd_init () != BFD_INIT_MAGIC)
fatal (_("fatal error: libbfd ABI mismatch"));
set_default_bfd_target ();
@ -952,8 +945,6 @@ main (int argc, char **argv)
}
}
END_PROGRESS (program_name);
xexit (0);
return 0;
}
@ -1063,7 +1054,6 @@ open_inarch (const char *archive_filename, const char *file)
next_one;
next_one = bfd_openr_next_archived_file (arch, next_one))
{
PROGRESS (1);
*last_one = next_one;
last_one = &next_one->archive_next;
}

12
binutils/nm.c
View File

@ -20,7 +20,6 @@
#include "sysdep.h"
#include "bfd.h"
#include "progress.h"
#include "getopt.h"
#include "aout/stab_gnu.h"
#include "aout/ranlib.h"
@ -786,8 +785,6 @@ filter_symbols (bfd *abfd, bool is_dynamic, void *minisyms,
int keep = 0;
asymbol *sym;
PROGRESS (1);
sym = bfd_minisymbol_to_symbol (abfd, is_dynamic, (const void *) from, store);
if (sym == NULL)
bfd_fatal (bfd_get_filename (abfd));
@ -1183,8 +1180,6 @@ print_symbol (bfd * abfd,
symbol_info syminfo;
struct extended_symbol_info info;
PROGRESS (1);
format->print_symbol_filename (archive_bfd, abfd);
bfd_get_symbol_info (abfd, sym, &syminfo);
@ -1604,8 +1599,6 @@ display_archive (bfd *file)
for (;;)
{
PROGRESS (1);
arfile = bfd_openr_next_archived_file (file, arfile);
if (arfile == NULL)
@ -2005,8 +1998,6 @@ main (int argc, char **argv)
bfd_plugin_set_program_name (program_name);
#endif
START_PROGRESS (program_name, 0);
expandargv (&argc, &argv);
if (bfd_init () != BFD_INIT_MAGIC)
@ -2193,13 +2184,10 @@ main (int argc, char **argv)
/* We were given several filenames to do. */
while (optind < argc)
{
PROGRESS (1);
if (!display_file (argv[optind++]))
retval++;
}
END_PROGRESS (program_name);
exit (retval);
return retval;
}

5
binutils/objcopy.c
View File

@ -20,7 +20,6 @@
#include "sysdep.h"
#include "bfd.h"
#include "progress.h"
#include "getopt.h"
#include "libiberty.h"
#include "bucomm.h"
@ -6053,8 +6052,6 @@ main (int argc, char *argv[])
program_name = argv[0];
xmalloc_set_program_name (program_name);
START_PROGRESS (program_name, 0);
expandargv (&argc, &argv);
strip_symbols = STRIP_UNDEF;
@ -6089,8 +6086,6 @@ main (int argc, char *argv[])
else
copy_main (argc, argv);
END_PROGRESS (program_name);
xexit (status);
return status;
}

5
binutils/objdump.c
View File

@ -52,7 +52,6 @@
#include "bfd.h"
#include "elf-bfd.h"
#include "coff-bfd.h"
#include "progress.h"
#include "bucomm.h"
#include "elfcomm.h"
#include "demanguse.h"
@ -5838,8 +5837,6 @@ main (int argc, char **argv)
xmalloc_set_program_name (program_name);
bfd_set_error_program_name (program_name);
START_PROGRESS (program_name, 0);
expandargv (&argc, &argv);
if (bfd_init () != BFD_INIT_MAGIC)
@ -6221,7 +6218,5 @@ main (int argc, char **argv)
free (dump_ctf_parent_name);
free ((void *) source_comment);
END_PROGRESS (program_name);
return exit_status;
}

9
gas/as.c
View File

@ -1250,7 +1250,6 @@ perform_an_assembly_pass (int argc, char ** argv)
{
if (*argv)
{ /* Is it a file-name argument? */
PROGRESS (1);
saw_a_file++;
/* argv->"" if stdin desired, else->filename. */
read_a_source_file (*argv);
@ -1301,7 +1300,6 @@ gas_early_init (int *argcp, char ***argvp)
myname = **argvp;
xmalloc_set_program_name (myname);
bfd_set_error_program_name (myname);
START_PROGRESS (myname, 0);
expandargv (argcp, argvp);
@ -1350,8 +1348,6 @@ gas_init (void)
if (flag_print_statistics)
xatexit (dump_statistics);
PROGRESS (1);
dot_symbol_init ();
#ifdef tc_init_after_args
@ -1389,7 +1385,6 @@ main (int argc, char ** argv)
struct stat sob;
gas_early_init (&argc, &argv);
PROGRESS (1);
/* Call parse_args before gas_init so that switches like
--hash-size can be honored. */
@ -1436,8 +1431,6 @@ main (int argc, char ** argv)
gas_init ();
PROGRESS (1);
/* Assemble it. */
perform_an_assembly_pass (argc, argv);
@ -1513,8 +1506,6 @@ main (int argc, char ** argv)
input_scrub_end ();
END_PROGRESS (myname);
/* Use xexit instead of return, because under VMS environments they
may not place the same interpretation on the value given. */
if (had_errors () != 0)

3
gas/as.h
View File

@ -77,9 +77,6 @@
#include "bfd.h"
#include "libiberty.h"
/* Define the standard progress macros. */
#include "progress.h"
/* Other stuff from config.h. */
#ifdef NEED_DECLARATION_ENVIRON
extern char **environ;

4
gas/write.c
View File

@ -2328,8 +2328,6 @@ write_object_file (void)
maybe_generate_build_notes ();
#endif
PROGRESS (1);
#ifdef tc_frob_file_before_adjust
tc_frob_file_before_adjust ();
#endif
@ -2472,8 +2470,6 @@ write_object_file (void)
}
}
PROGRESS (1);
/* Now do any format-specific adjustments to the symbol table, such
as adding file symbols. */
#ifdef tc_adjust_symtab

38
include/progress.h
View File

@ -1,38 +0,0 @@
/* Default definitions for progress macros.
Copyright (C) 1994-2023 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
MA 02110-1301, USA. */
/* The default definitions below are intended to be replaced by real
definitions, if building the tools for an interactive programming
environment. */
#ifndef _PROGRESS_H
#define _PROGRESS_H
#ifndef START_PROGRESS
#define START_PROGRESS(STR,N)
#endif
#ifndef PROGRESS
#define PROGRESS(X)
#endif
#ifndef END_PROGRESS
#define END_PROGRESS(STR)
#endif
#endif /* _PROGRESS_H */

5
ld/ldmain.c
View File

@ -23,7 +23,6 @@
#include "bfd.h"
#include "safe-ctype.h"
#include "libiberty.h"
#include "progress.h"
#include "bfdlink.h"
#include "ctf-api.h"
#include "filenames.h"
@ -263,8 +262,6 @@ main (int argc, char **argv)
program_name = argv[0];
xmalloc_set_program_name (program_name);
START_PROGRESS (program_name, 0);
expandargv (&argc, &argv);
if (bfd_init () != BFD_INIT_MAGIC)
@ -618,8 +615,6 @@ main (int argc, char **argv)
}
}
END_PROGRESS (program_name);
if (config.stats)
{
long run_time = get_run_time () - start_time;