aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2015-03-10 13:44:51 +0000
committerNick Clifton <nickc@redhat.com>2015-03-10 13:44:51 +0000
commitb6370efb1efe39e62abd01e95c7957834c8bdf47 (patch)
tree615f88a08ab859218ea5c5c366f15c15a182fc82
parentcfad873011d6399aa88bc6ddcb4c93dda5dad9b0 (diff)
downloadgdb-b6370efb1efe39e62abd01e95c7957834c8bdf47.zip
gdb-b6370efb1efe39e62abd01e95c7957834c8bdf47.tar.gz
gdb-b6370efb1efe39e62abd01e95c7957834c8bdf47.tar.bz2
Fixes "readelf -s --wide" not returning an error status or help message.
PR binutils/18101 * readelf.c (parse_args): Enhance check for nothing to do by accounting for the --wide option.
-rw-r--r--binutils/ChangeLog4
-rw-r--r--binutils/readelf.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 550111b..062cec4 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,9 @@
2015-03-10 Nick Clifton <nickc@redhat.com>
+ PR binutils/18101
+ * readelf.c (parse_args): Enhance check for nothing to do by
+ accounting for the --wide option.
+
PR binutils/17636
* objcopy.c (copy_object): Avoid calling fatal as that does not
allow the parent to clean up temporary files.
diff --git a/binutils/readelf.c b/binutils/readelf.c
index d0b66ae..771d29d 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -4232,7 +4232,7 @@ parse_args (int argc, char ** argv)
&& !do_section_groups && !do_archive_index
&& !do_dyn_syms)
usage (stderr);
- else if (argc < 3)
+ else if (argc < 3 || (do_wide && argc < 4))
{
warn (_("Nothing to do.\n"));
usage (stderr);