[src/trunk]: src/gnu/dist/toolchain/binutils Fix a couple of merge errors.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/588d12dc2451
branches:  trunk
changeset: 544117:588d12dc2451
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Mar 12 03:46:11 2003 +0000

description:
Fix a couple of merge errors.

diffstat:

 gnu/dist/toolchain/binutils/size.c |  12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diffs (30 lines):

diff -r 452b2681eb65 -r 588d12dc2451 gnu/dist/toolchain/binutils/size.c
--- a/gnu/dist/toolchain/binutils/size.c        Wed Mar 12 00:24:41 2003 +0000
+++ b/gnu/dist/toolchain/binutils/size.c        Wed Mar 12 03:46:11 2003 +0000
@@ -54,10 +54,6 @@
 static bfd_size_type total_datasize;
 static bfd_size_type total_textsize;
 
-static bfd_size_type total_bsssize;
-static bfd_size_type total_datasize;
-static bfd_size_type total_textsize;
-
 /* Program exit status.  */
 int return_code = 0;
 
@@ -469,11 +465,11 @@
   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");
+    puts ((radix == octal) ? "   text\t   data\tbss/stk\t    oct\t    hex\tfilename" :
+         "   text\t   data\tbss/stk\t    dec\t    hex\tfilename");
 #else
-    puts ((radix == octal) ? "text\tdata\tbss\toct\thex\tfilename" :
-         "text\tdata\tbss\tdec\thex\tfilename");
+    puts ((radix == octal) ? "   text\t   data\t    bss\t    oct\t    hex\tfilename" :
+         "   text\t   data\t    bss\t    dec\t    hex\tfilename");
 #endif
 
   total = textsize + datasize + bsssize;