diff options
| author | thorpej <thorpej@NetBSD.org> | 2003-03-12 03:46:11 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2003-03-12 03:46:11 +0000 |
| commit | 834dd24299b720731a91c8efd5bb98f5ce30cb45 (patch) | |
| tree | dd614c2ca739048dfbd72bfcb60b65e6b428b227 /gnu | |
| parent | 5feeffaf69f4829e387610afe582cc1d3749dec7 (diff) | |
Fix a couple of merge errors.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/dist/toolchain/binutils/size.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gnu/dist/toolchain/binutils/size.c b/gnu/dist/toolchain/binutils/size.c index ccc8b0bad04..a9448543505 100644 --- a/gnu/dist/toolchain/binutils/size.c +++ b/gnu/dist/toolchain/binutils/size.c @@ -54,10 +54,6 @@ static bfd_size_type total_bsssize; 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 @@ print_berkeley_format (abfd) 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; |
