From d0256ade1d543029b48aa74a9701d67ba1285e86 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sat, 14 Oct 2000 18:35:19 +0000 Subject: Merge changes from mainline --- binutils/objdump.c | 69 +++++++++++++++++++++++++++--------------------------- binutils/stabs.c | 1 + 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/binutils/objdump.c b/binutils/objdump.c index d3c1ed2..4832e9d 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -220,55 +220,56 @@ usage (stream, status) FILE *stream; int status; { - fprintf (stream, _("Usage: %s file(s)\n"), program_name); - fprintf (stream, _(" At least one of the following switches must be given:\n")); + fprintf (stream, _("Usage: %s OPTION... FILE...\n"), program_name); + fprintf (stream, _("Display information from object FILE.\n")); + fprintf (stream, _("\n At least one of the following switches must be given:\n")); fprintf (stream, _("\ - -a --archive-headers Display archive header information\n\ - -f --file-headers Display the contents of the overall file header\n\ - -p --private-headers Display object format specific file header contents\n\ - -h --[section-]headers Display the contents of the section headers\n\ - -x --all-headers Display the contents of all headers\n\ - -d --disassemble Display assembler contents of executable sections\n\ - -D --disassemble-all Display assembler contents of all sections\n\ - -S --source Intermix source code with disassembly\n\ - -s --full-contents Display the full contents of all sections requested\n\ - -g --debugging Display debug information in object file\n\ - -G --stabs Display the STABS contents of an ELF format file\n\ - -t --syms Display the contents of the symbol table(s)\n\ - -T --dynamic-syms Display the contents of the dynamic symbol table\n\ - -r --reloc Display the relocation entries in the file\n\ - -R --dynamic-reloc Display the dynamic relocation entries in the file\n\ - -V --version Display this program's version number\n\ - -i --info List object formats and architectures supported\n\ - -H --help Display this information\n\ + -a, --archive-headers Display archive header information\n\ + -f, --file-headers Display the contents of the overall file header\n\ + -p, --private-headers Display object format specific file header contents\n\ + -h, --[section-]headers Display the contents of the section headers\n\ + -x, --all-headers Display the contents of all headers\n\ + -d, --disassemble Display assembler contents of executable sections\n\ + -D, --disassemble-all Display assembler contents of all sections\n\ + -S, --source Intermix source code with disassembly\n\ + -s, --full-contents Display the full contents of all sections requested\n\ + -g, --debugging Display debug information in object file\n\ + -G, --stabs Display (in raw form) any STABS info in the file\n\ + -t, --syms Display the contents of the symbol table(s)\n\ + -T, --dynamic-syms Display the contents of the dynamic symbol table\n\ + -r, --reloc Display the relocation entries in the file\n\ + -R, --dynamic-reloc Display the dynamic relocation entries in the file\n\ + -V, --version Display this program's version number\n\ + -i, --info List object formats and architectures supported\n\ + -H, --help Display this information\n\ ")); if (status != 2) { fprintf (stream, _("\n The following switches are optional:\n")); fprintf (stream, _("\ - -b --target Specify the target object format as \n\ - -m --architecture Specify the target architecture as \n\ - -j --section Only display information for section \n\ - -M --disassembler-options Pass text on to the disassembler\n\ + -b, --target=BFDNAME Specify the target object format as BFDNAME\n\ + -m, --architecture=MACHINE Specify the target architecture as MACHINE\n\ + -j, --section=NAME Only display information for section NAME\n\ + -M, --disassembler-options=OPT Pass text OPT on to the disassembler\n\ -EB --endian=big Assume big endian format when disassembling\n\ -EL --endian=little Assume little endian format when disassembling\n\ --file-start-context Include context from start of file (with -S)\n\ - -l --line-numbers Include line numbers and filenames in output\n\ - -C --demangle Decode mangled/processed symbol names\n\ - -w --wide Format output for more than 80 columns\n\ - -z --disassemble-zeroes Do not skip blocks of zeroes when disassembling\n\ - --start-address Only process data whoes address is >= \n\ - --stop-address Only process data whoes address is <= \n\ + -l, --line-numbers Include line numbers and filenames in output\n\ + -C, --demangle Decode mangled/processed symbol names\n\ + -w, --wide Format output for more than 80 columns\n\ + -z, --disassemble-zeroes Do not skip blocks of zeroes when disassembling\n\ + --start-address=ADDR Only process data whoes address is >= ADDR\n\ + --stop-address=ADDR Only process data whoes address is <= ADDR\n\ --prefix-addresses Print complete address alongside disassembly\n\ --[no-]show-raw-insn Display hex alongside symbolic disassembly\n\ - --adjust-vma Add to all displayed section addresses\n\ + --adjust-vma=OFFSET Add OFFSET to all displayed section addresses\n\ \n")); list_supported_targets (program_name, stream); - + disassembler_usage (stream); } if (status == 0) - fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO); + fprintf (stream, _("Report bugs to %s.\n"), REPORT_BUGS_TO); exit (status); } @@ -2606,7 +2607,7 @@ dump_reloc_set (abfd, sec, relpp, relcount) } /* The length of the longest architecture name + 1. */ -#define LONGEST_ARCH sizeof("rs6000:6000") +#define LONGEST_ARCH sizeof("powerpc:common") static const char * endian_string (endian) diff --git a/binutils/stabs.c b/binutils/stabs.c index 8c20ed3..5f60035 100644 --- a/binutils/stabs.c +++ b/binutils/stabs.c @@ -1261,6 +1261,7 @@ parse_stab_type (dhandle, info, typename, pp, slotp) { case 's': size = atoi (attr + 1); + size /= 8; /* Size is in bits. We store it in bytes. */ if (size <= 0) size = -1; break; -- cgit v1.1