From e4943f2c7569a829eb6129f10f7c5401a96aaa08 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Wed, 19 Jul 2017 09:55:12 +0200 Subject: [PATCH] Remove datasize measurements based on sbrk() binutils/ * nm.c (show_stats): Remove variable. (long_options): Remove --stats option. (main): Remove handling of --stats. ld/ * ldmain.c (main): Remove display of data size. gas/ * as.c (start_sbrk): Remove. (main): Remove assignment. (dump_statistics): Remove display of data size. --- binutils/ChangeLog | 6 ++++++ binutils/nm.c | 11 ----------- gas/ChangeLog | 6 ++++++ gas/as.c | 19 ------------------- ld/ChangeLog | 4 ++++ ld/ldmain.c | 16 ---------------- 6 files changed, 16 insertions(+), 46 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index d098082958..7e9d809c14 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2017-07-19 Tristan Gingold + + * nm.c (show_stats): Remove variable. + (long_options): Remove --stats option. + (main): Remove handling of --stats. + 2017-07-18 Nick Clifton PR 21775 diff --git a/binutils/nm.c b/binutils/nm.c index 7ddcc8a113..5e03a8ae92 100644 --- a/binutils/nm.c +++ b/binutils/nm.c @@ -157,7 +157,6 @@ static int sort_by_size = 0; /* Sort by size of symbol. */ static int undefined_only = 0; /* Print undefined symbols only. */ static int dynamic = 0; /* Print dynamic symbols. */ static int show_version = 0; /* Show the version number. */ -static int show_stats = 0; /* Show statistics. */ static int show_synthetic = 0; /* Display synthesized symbols too. */ static int line_numbers = 0; /* Print line numbers for symbols. */ static int allow_special_symbols = 0; /* Allow special symbols. */ @@ -221,7 +220,6 @@ static struct option long_options[] = {"reverse-sort", no_argument, &reverse_sort, 1}, {"size-sort", no_argument, 0, OPTION_SIZE_SORT}, {"special-syms", no_argument, &allow_special_symbols, 1}, - {"stats", no_argument, &show_stats, 1}, {"synthetic", no_argument, &show_synthetic, 1}, {"target", required_argument, 0, OPTION_TARGET}, {"defined-only", no_argument, &defined_only, 1}, @@ -1797,15 +1795,6 @@ main (int argc, char **argv) END_PROGRESS (program_name); -#ifdef HAVE_SBRK - if (show_stats) - { - char *lim = (char *) sbrk (0); - - non_fatal (_("data size %ld"), (long) (lim - (char *) &environ)); - } -#endif - exit (retval); return retval; } diff --git a/gas/ChangeLog b/gas/ChangeLog index c53ac9ad1f..dd6a34f858 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2017-07-19 Tristan Gingold + + * as.c (start_sbrk): Remove. + (main): Remove assignment. + (dump_statistics): Remove display of data size. + 2017-07-19 Tristan Gingold * testsuite/gas/pe/seh-x64-err-2.s: New test. diff --git a/gas/as.c b/gas/as.c index 83a572b250..47175591a0 100644 --- a/gas/as.c +++ b/gas/as.c @@ -46,12 +46,6 @@ #define itbl_init() #endif -#ifdef HAVE_SBRK -#ifdef NEED_DECLARATION_SBRK -extern void *sbrk (); -#endif -#endif - #ifdef USING_CGEN /* Perform any cgen specific initialisation for gas. */ extern void gas_cgen_begin (void); @@ -125,9 +119,6 @@ static struct itbl_file_list *itbl_files; #endif static long start_time; -#ifdef HAVE_SBRK -char *start_sbrk; -#endif static int flag_macro_alternate; @@ -1043,17 +1034,10 @@ This program has absolutely no warranty.\n")); static void dump_statistics (void) { -#ifdef HAVE_SBRK - char *lim = (char *) sbrk (0); -#endif long run_time = get_run_time () - start_time; fprintf (stderr, _("%s: total time in assembly: %ld.%06ld\n"), myname, run_time / 1000000, run_time % 1000000); -#ifdef HAVE_SBRK - fprintf (stderr, _("%s: data size %ld\n"), - myname, (long) (lim - start_sbrk)); -#endif subsegs_print_statistics (stderr); write_print_statistics (stderr); @@ -1187,9 +1171,6 @@ main (int argc, char ** argv) start_time = get_run_time (); signal_init (); -#ifdef HAVE_SBRK - start_sbrk = (char *) sbrk (0); -#endif #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) setlocale (LC_MESSAGES, ""); diff --git a/ld/ChangeLog b/ld/ChangeLog index ea648a9380..4525236a6b 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2017-07-19 Tristan Gingold + + * ldmain.c (main): Remove display of data size. + 2017-07-18 Maciej W. Rozycki * testsuite/ld-elf/binutils.exp (binutils_test): Make the diff --git a/ld/ldmain.c b/ld/ldmain.c index ee5ab1166a..5d1a3f46f5 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -50,12 +50,6 @@ #include -#ifdef HAVE_SBRK -#if !HAVE_DECL_SBRK -extern void *sbrk (); -#endif -#endif - #ifndef TARGET_SYSTEM_ROOT #define TARGET_SYSTEM_ROOT "" #endif @@ -198,9 +192,6 @@ main (int argc, char **argv) { char *emulation; long start_time = get_run_time (); -#ifdef HAVE_SBRK - char *start_sbrk = (char *) sbrk (0); -#endif #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) setlocale (LC_MESSAGES, ""); @@ -539,18 +530,11 @@ main (int argc, char **argv) if (config.stats) { -#ifdef HAVE_SBRK - char *lim = (char *) sbrk (0); -#endif long run_time = get_run_time () - start_time; fflush (stdout); fprintf (stderr, _("%s: total time in link: %ld.%06ld\n"), program_name, run_time / 1000000, run_time % 1000000); -#ifdef HAVE_SBRK - fprintf (stderr, _("%s: data size %ld\n"), program_name, - (long) (lim - start_sbrk)); -#endif fflush (stderr); } -- 2.34.1