@smallexample
@c man begin SYNOPSIS size
-size [@option{-A}|@option{-B}|@option{--format=}@var{compatibility}]
+size [@option{-A}|@option{-B}|@option{-G}|@option{--format=}@var{compatibility}]
[@option{--help}]
[@option{-d}|@option{-o}|@option{-x}|@option{--radix=}@var{number}]
[@option{--common}]
@table @env
@item -A
@itemx -B
+@itemx -G
@itemx --format=@var{compatibility}
@cindex @command{size} display format
Using one of these options, you can choose whether the output from @sc{gnu}
@command{size} resembles output from System V @command{size} (using @option{-A},
or @option{--format=sysv}), or Berkeley @command{size} (using @option{-B}, or
@option{--format=berkeley}). The default is the one-line format similar to
-Berkeley's.
+Berkeley's. Alternatively, you can choose the GNU format output
+(using @option{-G}, or @option{--format=gnu}), this is similar to
+Berkeley's output format, but sizes are counted differently.
@c Bonus for doc-source readers: you can also say --format=strange (or
@c anything else that starts with 's') for sysv, and --format=boring (or
@c anything else that starts with 'b') for Berkeley.
294880 81920 11888 388688 5ee50 size
@end smallexample
+The Berkeley style output counts read only data in the @code{text}
+column, not in the @code{data} column, the @code{dec} and @code{hex}
+columns both display the sum of the @code{text}, @code{data}, and
+@code{bss} columns in decimal and hexadecimal respectively.
+
+The GNU format counts read only data in the @code{data} column, not
+the @code{text} column, and only displays the sum of the @code{text},
+@code{data}, and @code{bss} columns once, in the @code{total} column.
+The @option{--radix} option can be used to change the number base for
+all columns. Here is the same data displayed with GNU conventions:
+
+@smallexample
+$ size --format=GNU ranlib size
+ text data bss total filename
+ 279880 96920 11592 388392 ranlib
+ 279880 96920 11888 388688 size
+@end smallexample
+
@noindent
This is the same data, but displayed closer to System V conventions:
@item --common
Print total size of common symbols in each file. When using Berkeley
-format these are included in the bss size.
+or GNU format these are included in the bss size.
@item -t
@itemx --totals
-Show totals of all objects listed (Berkeley format listing mode only).
+Show totals of all objects listed (Berkeley or GNU format mode only).
@item --target=@var{bfdname}
@cindex object code format
}
radix = decimal;
-/* 0 means use AT&T-style output. */
-static int berkeley_format = BSD_DEFAULT;
+/* Select the desired output format. */
+enum output_format
+ {
+ FORMAT_BERKLEY,
+ FORMAT_SYSV,
+ FORMAT_GNU
+ };
+static enum output_format selected_output_format =
+#if BSD_DEFAULT
+ FORMAT_BERKLEY
+#else
+ FORMAT_SYSV
+#endif
+ ;
static int show_version = 0;
static int show_help = 0;
fprintf (stream, _(" Displays the sizes of sections inside binary files\n"));
fprintf (stream, _(" If no input file(s) are specified, a.out is assumed\n"));
fprintf (stream, _(" The options are:\n\
- -A|-B --format={sysv|berkeley} Select output style (default is %s)\n\
+ -A|-B|-G --format={sysv|berkeley|gnu} Select output style (default is %s)\n\
-o|-d|-x --radix={8|10|16} Display numbers in octal, decimal or hex\n\
-t --totals Display the total sizes (Berkeley only)\n\
--common Display total size for *COM* syms\n\
fatal (_("fatal error: libbfd ABI mismatch"));
set_default_bfd_target ();
- while ((c = getopt_long (argc, argv, "ABHhVvdfotx", long_options,
+ while ((c = getopt_long (argc, argv, "ABGHhVvdfotx", long_options,
(int *) 0)) != EOF)
switch (c)
{
{
case 'B':
case 'b':
- berkeley_format = 1;
+ selected_output_format = FORMAT_BERKLEY;
break;
case 'S':
case 's':
- berkeley_format = 0;
+ selected_output_format = FORMAT_SYSV;
+ break;
+ case 'G':
+ case 'g':
+ selected_output_format = FORMAT_GNU;
break;
default:
non_fatal (_("invalid argument to --format: %s"), optarg);
break;
case 'A':
- berkeley_format = 0;
+ selected_output_format = FORMAT_SYSV;
break;
case 'B':
- berkeley_format = 1;
+ selected_output_format = FORMAT_BERKLEY;
+ break;
+ case 'G':
+ selected_output_format = FORMAT_GNU;
break;
case 'v':
case 'V':
for (; optind < argc;)
display_file (argv[optind++]);
- if (show_totals && berkeley_format)
+ if (show_totals && (selected_output_format == FORMAT_BERKLEY
+ || selected_output_format == FORMAT_GNU))
{
bfd_size_type total = total_textsize + total_datasize + total_bsssize;
-
- rprint_number (7, total_textsize);
- putchar('\t');
- rprint_number (7, total_datasize);
- putchar('\t');
- rprint_number (7, total_bsssize);
- printf (((radix == octal) ? "\t%7lo\t%7lx\t" : "\t%7lu\t%7lx\t"),
- (unsigned long) total, (unsigned long) total);
+ int col_width = (selected_output_format == FORMAT_BERKLEY) ? 7 : 10;
+ char sep_char = (selected_output_format == FORMAT_BERKLEY) ? '\t' : ' ';
+
+ rprint_number (col_width, total_textsize);
+ putchar(sep_char);
+ rprint_number (col_width, total_datasize);
+ putchar(sep_char);
+ rprint_number (col_width, total_bsssize);
+ putchar(sep_char);
+ if (selected_output_format == FORMAT_BERKLEY)
+ printf (((radix == octal) ? "%7lo\t%7lx" : "%7lu\t%7lx"),
+ (unsigned long) total, (unsigned long) total);
+ else
+ rprint_number (col_width, total);
+ putchar(sep_char);
fputs ("(TOTALS)\n", stdout);
}
static bfd_size_type textsize;
static void
-berkeley_sum (bfd *abfd ATTRIBUTE_UNUSED, sec_ptr sec,
- void *ignore ATTRIBUTE_UNUSED)
+berkeley_or_gnu_sum (bfd *abfd ATTRIBUTE_UNUSED, sec_ptr sec,
+ void *ignore ATTRIBUTE_UNUSED)
{
flagword flags;
bfd_size_type size;
return;
size = bfd_get_section_size (sec);
- if ((flags & SEC_CODE) != 0 || (flags & SEC_READONLY) != 0)
+ if ((flags & SEC_CODE) != 0
+ || (selected_output_format == FORMAT_BERKLEY
+ && (flags & SEC_READONLY) != 0))
textsize += size;
else if ((flags & SEC_HAS_CONTENTS) != 0)
datasize += size;
}
static void
-print_berkeley_format (bfd *abfd)
+print_berkeley_or_gnu_format (bfd *abfd)
{
static int files_seen = 0;
bfd_size_type total;
+ int col_width = (selected_output_format == FORMAT_BERKLEY) ? 7 : 10;
+ char sep_char = (selected_output_format == FORMAT_BERKLEY) ? '\t' : ' ';
bsssize = 0;
datasize = 0;
textsize = 0;
- bfd_map_over_sections (abfd, berkeley_sum, NULL);
+ bfd_map_over_sections (abfd, berkeley_or_gnu_sum, NULL);
bsssize += common_size;
if (files_seen++ == 0)
- puts ((radix == octal) ? " text\t data\t bss\t oct\t hex\tfilename" :
- " text\t data\t bss\t dec\t hex\tfilename");
+ {
+ if (selected_output_format == FORMAT_BERKLEY)
+ puts ((radix == octal) ? " text\t data\t bss\t oct\t hex\tfilename" :
+ " text\t data\t bss\t dec\t hex\tfilename");
+ else
+ puts (" text data bss total filename");
+ }
total = textsize + datasize + bsssize;
total_bsssize += bsssize;
}
- rprint_number (7, textsize);
- putchar ('\t');
- rprint_number (7, datasize);
- putchar ('\t');
- rprint_number (7, bsssize);
- printf (((radix == octal) ? "\t%7lo\t%7lx\t" : "\t%7lu\t%7lx\t"),
- (unsigned long) total, (unsigned long) total);
+ rprint_number (col_width, textsize);
+ putchar (sep_char);
+ rprint_number (col_width, datasize);
+ putchar (sep_char);
+ rprint_number (col_width, bsssize);
+ putchar (sep_char);
+ if (selected_output_format == FORMAT_BERKLEY)
+ printf (((radix == octal) ? "%7lo\t%7lx" : "%7lu\t%7lx"),
+ (unsigned long) total, (unsigned long) total);
+ else
+ rprint_number (col_width, total);
+
+ putchar (sep_char);
fputs (bfd_get_filename (abfd), stdout);
if (abfd->my_archive)
{
if (show_common)
calculate_common_size (file);
- if (berkeley_format)
- print_berkeley_format (file);
- else
+ if (selected_output_format == FORMAT_SYSV)
print_sysv_format (file);
+ else
+ print_berkeley_or_gnu_format (file);
}
projects / deliverable / binutils-gdb.git / commitdiff
