From faf786e66817bcfc5b6ead80cafe6acc3149df02 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 18 Jul 2013 16:12:35 +0000 Subject: [PATCH] * ar.c (usage): Fix C conformance issue. * config/tc-i386-intel.c (i386_intel_operand): Fixed signed vs unsigned comparison. --- binutils/ChangeLog | 4 ++++ binutils/ar.c | 4 ++-- gas/ChangeLog | 5 +++++ gas/config/tc-i386-intel.c | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 700d03b..8f0451a 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,7 @@ +2013-07-18 Jim Thomas + + * ar.c (usage): Fix C conformance issue. + 2013-07-18 Nick Clifton * doc/binutils.texi (nm, objdump): Remove bogus links to STABS diff --git a/binutils/ar.c b/binutils/ar.c index c424038..af5694d 100644 --- a/binutils/ar.c +++ b/binutils/ar.c @@ -243,8 +243,6 @@ usage (int help) { FILE *s; - s = help ? stdout : stderr; - #if BFD_SUPPORTS_PLUGINS /* xgettext:c-format */ const char *command_line @@ -257,6 +255,8 @@ usage (int help) = _("Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV]" " [member-name] [count] archive-file file...\n"); #endif + s = help ? stdout : stderr; + fprintf (s, command_line, program_name); /* xgettext:c-format */ diff --git a/gas/ChangeLog b/gas/ChangeLog index 87908d7..04229f9 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2013-07-18 Jim Thomas + + * config/tc-i386-intel.c (i386_intel_operand): Fixed signed vs + unsigned comparison. + 2013-07-18 Sandeep Kumar Singh * config/rx-defs.h: Add macros for RX100, RX200, RX600, and diff --git a/gas/config/tc-i386-intel.c b/gas/config/tc-i386-intel.c index aefdc2a..9080861 100644 --- a/gas/config/tc-i386-intel.c +++ b/gas/config/tc-i386-intel.c @@ -792,7 +792,7 @@ i386_intel_operand (char *operand_string, int got_a_float) || intel_state.is_mem) { /* Memory operand. */ - if (i.mem_operands + if ((int) i.mem_operands >= 2 - !current_templates->start->opcode_modifier.isstring) { /* Handle -- 2.7.4