X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=binutils%2Fsize.c;h=369708771476d2afead60b844b169ac422675651;hb=21af24c8371a3e040f6f548ddfafb20114442c28;hp=936747ac9b3fc1e978a6ffe72159a15743d17a82;hpb=0c5dc23cc9f4f7a488c0b7df518e319148a2b103;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/size.c b/binutils/size.c
index 936747ac9b..3697087714 100644
--- a/binutils/size.c
+++ b/binutils/size.c
@@ -1,21 +1,22 @@
 /* size.c -- report size of various sections of an executable file.
-   Copyright 1991, 92, 93, 94 Free Software Foundation, Inc.
+   Copyright (C) 1991-2020 Free Software Foundation, Inc.
 
-This file is part of GNU Binutils.
+   This file is part of GNU Binutils.
 
-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 2 of the License, or
-(at your option) any later version.
+   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.
+   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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.  */
 
 /* Extensions/incompatibilities:
    o - BSD output has filenames at the end.
@@ -25,11 +26,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    o - We also handle core files.
    o - We also handle archives.
    If you write shell scripts which manipulate this info then you may be
-   out of luck; there's no --compatibility or --pedantic option.
-*/
+   out of luck; there's no --compatibility or --pedantic option.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
+#include "libiberty.h"
 #include "getopt.h"
 #include "bucomm.h"
 
@@ -39,93 +40,149 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Program options.  */
 
-enum
+static enum
   {
     decimal, octal, hex
-  } radix = decimal;
-int berkeley_format = BSD_DEFAULT;	/* 0 means use AT&T-style output.  */
-int show_version = 0;
-int show_help = 0;
+  }
+radix = decimal;
 
-/* Program exit status.  */
-int return_code = 0;
+/* 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
+  ;
 
-/* IMPORTS */
-extern char *program_version;
-extern char *target;
+static int show_version = 0;
+static int show_help = 0;
+static int show_totals = 0;
+static int show_common = 0;
 
-/* Forward declarations */
+static bfd_size_type common_size;
+static bfd_size_type total_bsssize;
+static bfd_size_type total_datasize;
+static bfd_size_type total_textsize;
 
-static void display_file PARAMS ((char *filename));
+/* Program exit status.  */
+static int return_code = 0;
+
+static char *target = NULL;
 
-static void print_sizes PARAMS ((bfd * file));
+/* Forward declarations.  */
 
-static void berkeley_sum PARAMS ((bfd *, sec_ptr, PTR));
+static void display_file (char *);
+static void rprint_number (int, bfd_size_type);
+static void print_sizes (bfd * file);
 
-void
-usage (stream, status)
-     FILE *stream;
-     int status;
+static void
+usage (FILE *stream, int status)
 {
-  fprintf (stream, "\
-Usage: %s [-ABdoxV] [--format=berkeley|sysv] [--radix=8|10|16]\n\
-       [--target=bfdname] [--version] [--help] [file...]\n", program_name);
+  fprintf (stream, _("Usage: %s [option(s)] [file(s)]\n"), program_name);
+  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|-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\
+            --target=<bfdname>        Set the binary file format\n\
+            @<file>                   Read options from <file>\n\
+  -h        --help                    Display this information\n\
+  -v        --version                 Display the program's version\n\
+\n"),
 #if BSD_DEFAULT
-  fputs ("default is --format=berkeley\n", stream);
+  "berkeley"
 #else
-  fputs ("default is --format=sysv\n", stream);
+  "sysv"
 #endif
+);
+  list_supported_targets (program_name, stream);
+  if (REPORT_BUGS_TO[0] && status == 0)
+    fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
   exit (status);
 }
 
-struct option long_options[] =
+#define OPTION_FORMAT (200)
+#define OPTION_RADIX (OPTION_FORMAT + 1)
+#define OPTION_TARGET (OPTION_RADIX + 1)
+
+static struct option long_options[] =
 {
-  {"format", required_argument, 0, 200},
-  {"radix", required_argument, 0, 201},
-  {"target", required_argument, 0, 202},
+  {"common", no_argument, &show_common, 1},
+  {"format", required_argument, 0, OPTION_FORMAT},
+  {"radix", required_argument, 0, OPTION_RADIX},
+  {"target", required_argument, 0, OPTION_TARGET},
+  {"totals", no_argument, &show_totals, 1},
   {"version", no_argument, &show_version, 1},
   {"help", no_argument, &show_help, 1},
   {0, no_argument, 0, 0}
 };
 
+int main (int, char **);
+
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   int temp;
   int c;
 
+#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
+  setlocale (LC_MESSAGES, "");
+#endif
+#if defined (HAVE_SETLOCALE)
+  setlocale (LC_CTYPE, "");
+#endif
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
+
   program_name = *argv;
+  xmalloc_set_program_name (program_name);
+  bfd_set_error_program_name (program_name);
+
+  expandargv (&argc, &argv);
 
-  bfd_init ();
+  if (bfd_init () != BFD_INIT_MAGIC)
+    fatal (_("fatal error: libbfd ABI mismatch"));
+  set_default_bfd_target ();
 
-  while ((c = getopt_long (argc, argv, "ABVdox", long_options,
+  while ((c = getopt_long (argc, argv, "ABGHhVvdfotx", long_options,
 			   (int *) 0)) != EOF)
     switch (c)
       {
-      case 200:		/* --format */
+      case OPTION_FORMAT:
 	switch (*optarg)
 	  {
 	  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:
-	    fprintf (stderr, "invalid argument to --format: %s\n", optarg);
+	    non_fatal (_("invalid argument to --format: %s"), optarg);
 	    usage (stderr, 1);
 	  }
 	break;
 
-      case 202:		/* --target */
+      case OPTION_TARGET:
 	target = optarg;
 	break;
 
-      case 201:		/* --radix */
+      case OPTION_RADIX:
 #ifdef ANSI_LIBRARIES
 	temp = strtol (optarg, NULL, 10);
 #else
@@ -143,17 +200,21 @@ main (argc, argv)
 	    radix = hex;
 	    break;
 	  default:
-	    printf ("Invalid radix: %s\n", optarg);
+	    non_fatal (_("Invalid radix: %s\n"), optarg);
 	    usage (stderr, 1);
 	  }
 	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':
 	show_version = 1;
 	break;
@@ -166,17 +227,29 @@ main (argc, argv)
       case 'o':
 	radix = octal;
 	break;
+      case 't':
+	show_totals = 1;
+	break;
+      case 'f': /* FIXME : For sysv68, `-f' means `full format', i.e.
+		   `[fname:] M(.text) + N(.data) + O(.bss) + P(.comment) = Q'
+		   where `fname: ' appears only if there are >= 2 input files,
+		   and M, N, O, P, Q are expressed in decimal by default,
+		   hexa or octal if requested by `-x' or `-o'.
+		   Just to make things interesting, Solaris also accepts -f,
+		   which prints out the size of each allocatable section, the
+		   name of the section, and the total of the section sizes.  */
+		/* For the moment, accept `-f' silently, and ignore it.  */
+	break;
       case 0:
 	break;
+      case 'h':
+      case 'H':
       case '?':
 	usage (stderr, 1);
       }
 
   if (show_version)
-    {
-      printf ("GNU %s version %s\n", program_name, program_version);
-      exit (0);
-    }
+    print_version ("size");
   if (show_help)
     usage (stdout, 0);
 
@@ -186,14 +259,68 @@ main (argc, argv)
     for (; optind < argc;)
       display_file (argv[optind++]);
 
+  if (show_totals && (selected_output_format == FORMAT_BERKLEY
+		      || selected_output_format == FORMAT_GNU))
+    {
+      bfd_size_type total = total_textsize + total_datasize + total_bsssize;
+      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);
+    }
+
   return return_code;
 }
 
+/* Total size required for common symbols in ABFD.  */
+
+static void
+calculate_common_size (bfd *abfd)
+{
+  asymbol **syms = NULL;
+  long storage, symcount;
+
+  common_size = 0;
+  if ((bfd_get_file_flags (abfd) & (EXEC_P | DYNAMIC | HAS_SYMS)) != HAS_SYMS)
+    return;
+
+  storage = bfd_get_symtab_upper_bound (abfd);
+  if (storage < 0)
+    bfd_fatal (bfd_get_filename (abfd));
+  if (storage)
+    syms = (asymbol **) xmalloc (storage);
+
+  symcount = bfd_canonicalize_symtab (abfd, syms);
+  if (symcount < 0)
+    bfd_fatal (bfd_get_filename (abfd));
+
+  while (--symcount >= 0)
+    {
+      asymbol *sym = syms[symcount];
+
+      if (bfd_is_com_section (sym->section)
+	  && (sym->flags & BSF_SECTION_SYM) == 0)
+	common_size += sym->value;
+    }
+  free (syms);
+}
+
 /* Display stats on file or archive member ABFD.  */
 
-void
-display_bfd (abfd)
-     bfd *abfd;
+static void
+display_bfd (bfd *abfd)
 {
   char **matching;
 
@@ -208,7 +335,7 @@ display_bfd (abfd)
       return;
     }
 
-  if (bfd_error == file_ambiguously_recognized)
+  if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
     {
       bfd_nonfatal (bfd_get_filename (abfd));
       list_matching_formats (matching);
@@ -219,7 +346,7 @@ display_bfd (abfd)
 
   if (bfd_check_format_matches (abfd, bfd_core, &matching))
     {
-      CONST char *core_cmd;
+      const char *core_cmd;
 
       print_sizes (abfd);
       fputs (" (core file", stdout);
@@ -234,7 +361,7 @@ display_bfd (abfd)
 
   bfd_nonfatal (bfd_get_filename (abfd));
 
-  if (bfd_error == file_ambiguously_recognized)
+  if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
     {
       list_matching_formats (matching);
       free (matching);
@@ -244,19 +371,19 @@ display_bfd (abfd)
 }
 
 static void
-display_archive (file)
-     bfd *file;
+display_archive (bfd *file)
 {
   bfd *arfile = (bfd *) NULL;
+  bfd *last_arfile = (bfd *) NULL;
 
   for (;;)
     {
-      bfd_error = no_error;
+      bfd_set_error (bfd_error_no_error);
 
       arfile = bfd_openr_next_archived_file (file, arfile);
       if (arfile == NULL)
 	{
-	  if (bfd_error != no_more_archived_files)
+	  if (bfd_get_error () != bfd_error_no_more_archived_files)
 	    {
 	      bfd_nonfatal (bfd_get_filename (file));
 	      return_code = 2;
@@ -265,15 +392,35 @@ display_archive (file)
 	}
 
       display_bfd (arfile);
-      /* Don't close the archive elements; we need them for next_archive */
+
+      if (last_arfile != NULL)
+	{
+	  bfd_close (last_arfile);
+
+	  /* PR 17512: file: a244edbc.  */
+	  if (last_arfile == arfile)
+	    return;
+	}
+
+      last_arfile = arfile;
     }
+
+  if (last_arfile != NULL)
+    bfd_close (last_arfile);
 }
 
 static void
-display_file (filename)
-     char *filename;
+display_file (char *filename)
 {
-  bfd *file = bfd_openr (filename, target);
+  bfd *file;
+
+  if (get_file_size (filename) < 1)
+    {
+      return_code = 1;
+      return;
+    }
+
+  file = bfd_openr (filename, target);
   if (file == NULL)
     {
       bfd_nonfatal (filename);
@@ -281,12 +428,12 @@ display_file (filename)
       return;
     }
 
-  if (bfd_check_format (file, bfd_archive) == true)
+  if (bfd_check_format (file, bfd_archive))
     display_archive (file);
   else
     display_bfd (file);
 
-  if (bfd_close (file) == false)
+  if (!bfd_close (file))
     {
       bfd_nonfatal (filename);
       return_code = 1;
@@ -294,26 +441,30 @@ display_file (filename)
     }
 }
 
-/* This is what lexical functions are for.  */
-
-void
-lprint_number (width, num)
-     int width;
-     bfd_size_type num;
+static int
+size_number (bfd_size_type num)
 {
-  printf ((radix == decimal ? "%-*lu\t" :
-	   ((radix == octal) ? "%-*lo\t" : "%-*lx\t")),
-	  width, (unsigned long) num);
+  char buffer[40];
+
+  sprintf (buffer,
+	   (radix == decimal ? "%" BFD_VMA_FMT "u" :
+	   ((radix == octal) ? "0%" BFD_VMA_FMT "o" : "0x%" BFD_VMA_FMT "x")),
+	   num);
+
+  return strlen (buffer);
 }
 
-void
-rprint_number (width, num)
-     int width;
-     bfd_size_type num;
+static void
+rprint_number (int width, bfd_size_type num)
 {
-  printf ((radix == decimal ? "%*lu\t" :
-	   ((radix == octal) ? "%*lo\t" : "%*lx\t")),
-	  width, (unsigned long) num);
+  char buffer[40];
+
+  sprintf (buffer,
+	   (radix == decimal ? "%" BFD_VMA_FMT "u" :
+	   ((radix == octal) ? "0%" BFD_VMA_FMT "o" : "0x%" BFD_VMA_FMT "x")),
+	   num);
+
+  printf ("%*s", width, buffer);
 }
 
 static bfd_size_type bsssize;
@@ -321,106 +472,197 @@ static bfd_size_type datasize;
 static bfd_size_type textsize;
 
 static void
-berkeley_sum (abfd, sec, ignore)
-     bfd *abfd;
-     sec_ptr sec;
-     PTR ignore;
+berkeley_or_gnu_sum (bfd *abfd ATTRIBUTE_UNUSED, sec_ptr sec,
+		     void *ignore ATTRIBUTE_UNUSED)
 {
+  flagword flags;
   bfd_size_type size;
 
-  size = bfd_get_section_size_before_reloc (sec);
-  if (bfd_get_section_flags (abfd, sec) & SEC_CODE)
+  flags = bfd_section_flags (sec);
+  if ((flags & SEC_ALLOC) == 0)
+    return;
+
+  size = bfd_section_size (sec);
+  if ((flags & SEC_CODE) != 0
+      || (selected_output_format == FORMAT_BERKLEY
+	  && (flags & SEC_READONLY) != 0))
     textsize += size;
-  else if (bfd_get_section_flags (abfd, sec) & SEC_DATA)
+  else if ((flags & SEC_HAS_CONTENTS) != 0)
     datasize += size;
-  else if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
+  else
     bsssize += size;
 }
 
-void 
-print_berkeley_format (abfd)
-     bfd *abfd;
+static void
+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, (PTR) NULL);
+  bfd_map_over_sections (abfd, berkeley_or_gnu_sum, NULL);
 
+  bsssize += common_size;
   if (files_seen++ == 0)
-#if 0
-    /* Intel doesn't like bss/stk because they don't have core files.  */
-    puts ((radix == octal) ? "text\tdata\tbss/stk\toct\thex\tfilename" :
-	  "text\tdata\tbss/stk\tdec\thex\tfilename");
-#else
-    puts ((radix == octal) ? "text\tdata\tbss\toct\thex\tfilename" :
-	  "text\tdata\tbss\tdec\thex\tfilename");
-#endif
+    {
+      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;
 
-  lprint_number (7, textsize);
-  lprint_number (7, datasize);
-  lprint_number (7, bsssize);
-  printf (((radix == octal) ? "%-7lo\t%-7lx\t" : "%-7lu\t%-7lx\t"),
-	  (unsigned long) total, (unsigned long) total);
+  if (show_totals)
+    {
+      total_textsize += textsize;
+      total_datasize += datasize;
+      total_bsssize  += bsssize;
+    }
+
+  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 (bfd_my_archive (abfd))
-    printf (" (ex %s)", bfd_get_filename (bfd_my_archive (abfd)));
+
+  if (abfd->my_archive)
+    printf (" (ex %s)", bfd_get_filename (abfd->my_archive));
 }
 
 /* I REALLY miss lexical functions! */
 bfd_size_type svi_total = 0;
+bfd_vma svi_maxvma = 0;
+int svi_namelen = 0;
+int svi_vmalen = 0;
+int svi_sizelen = 0;
 
-void
-sysv_internal_printer (file, sec, ignore)
-     bfd *file;
-     sec_ptr sec;
-     PTR ignore;
+static void
+sysv_internal_sizer (bfd *file ATTRIBUTE_UNUSED, sec_ptr sec,
+		     void *ignore ATTRIBUTE_UNUSED)
 {
-  bfd_size_type size = bfd_section_size (file, sec);
-  if (sec != &bfd_abs_section
-      && !bfd_is_com_section (sec)
-      && sec != &bfd_und_section)
+  flagword flags = bfd_section_flags (sec);
+  /* Exclude sections with no flags set.  This is to omit som spaces.  */
+  if (flags == 0)
+    return;
+
+  if (   ! bfd_is_abs_section (sec)
+      && ! bfd_is_com_section (sec)
+      && ! bfd_is_und_section (sec))
     {
+      bfd_size_type size = bfd_section_size (sec);
+      int namelen = strlen (bfd_section_name (sec));
+
+      if (namelen > svi_namelen)
+	svi_namelen = namelen;
+
       svi_total += size;
 
-      printf ("%-12s", bfd_section_name (file, sec));
-      rprint_number (8, size);
-      printf (" ");
-      rprint_number (8, bfd_section_vma (file, sec));
-      printf ("\n");
+      if (bfd_section_vma (sec) > svi_maxvma)
+	svi_maxvma = bfd_section_vma (sec);
+    }
+}
+
+static void
+sysv_one_line (const char *name, bfd_size_type size, bfd_vma vma)
+{
+  printf ("%-*s   ", svi_namelen, name);
+  rprint_number (svi_sizelen, size);
+  printf ("   ");
+  rprint_number (svi_vmalen, vma);
+  printf ("\n");
+}
+
+static void
+sysv_internal_printer (bfd *file ATTRIBUTE_UNUSED, sec_ptr sec,
+		       void *ignore ATTRIBUTE_UNUSED)
+{
+  flagword flags = bfd_section_flags (sec);
+  if (flags == 0)
+    return;
+
+  if (   ! bfd_is_abs_section (sec)
+      && ! bfd_is_com_section (sec)
+      && ! bfd_is_und_section (sec))
+    {
+      bfd_size_type size = bfd_section_size (sec);
+
+      svi_total += size;
+
+      sysv_one_line (bfd_section_name (sec),
+		     size,
+		     bfd_section_vma (sec));
     }
 }
 
-void
-print_sysv_format (file)
-     bfd *file;
+static void
+print_sysv_format (bfd *file)
 {
+  /* Size all of the columns.  */
   svi_total = 0;
+  svi_maxvma = 0;
+  svi_namelen = 0;
+  bfd_map_over_sections (file, sysv_internal_sizer, NULL);
+  if (show_common)
+    {
+      if (svi_namelen < (int) sizeof ("*COM*") - 1)
+	svi_namelen = sizeof ("*COM*") - 1;
+      svi_total += common_size;
+    }
+
+  svi_vmalen = size_number ((bfd_size_type)svi_maxvma);
 
+  if ((size_t) svi_vmalen < sizeof ("addr") - 1)
+    svi_vmalen = sizeof ("addr")-1;
+
+  svi_sizelen = size_number (svi_total);
+  if ((size_t) svi_sizelen < sizeof ("size") - 1)
+    svi_sizelen = sizeof ("size")-1;
+
+  svi_total = 0;
   printf ("%s  ", bfd_get_filename (file));
+
   if (file->my_archive)
-    printf (" (ex %s)", file->my_archive->filename);
+    printf (" (ex %s)", bfd_get_filename (file->my_archive));
+
+  printf (":\n%-*s   %*s   %*s\n", svi_namelen, "section",
+	  svi_sizelen, "size", svi_vmalen, "addr");
 
-  puts (":\nsection\t\tsize\t     addr");
-  bfd_map_over_sections (file, sysv_internal_printer, (PTR) NULL);
+  bfd_map_over_sections (file, sysv_internal_printer, NULL);
+  if (show_common)
+    {
+      svi_total += common_size;
+      sysv_one_line ("*COM*", common_size, 0);
+    }
 
-  printf ("Total       ");
-  rprint_number (8, svi_total);
+  printf ("%-*s   ", svi_namelen, "Total");
+  rprint_number (svi_sizelen, svi_total);
   printf ("\n\n");
 }
 
 static void
-print_sizes (file)
-     bfd *file;
+print_sizes (bfd *file)
 {
-  if (berkeley_format)
-    print_berkeley_format (file);
-  else
+  if (show_common)
+    calculate_common_size (file);
+  if (selected_output_format == FORMAT_SYSV)
     print_sysv_format (file);
+  else
+    print_berkeley_or_gnu_format (file);
 }