diff options
| -rw-r--r-- | binutils/ChangeLog | 4 | ||||
| -rw-r--r-- | binutils/ar.c | 4 | ||||
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-i386-intel.c | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 700d03b399..8f0451ae07 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,7 @@ +2013-07-18 Jim Thomas <thomas@cfht.hawaii.edu> + + * ar.c (usage): Fix C conformance issue. + 2013-07-18 Nick Clifton <nickc@redhat.com> * doc/binutils.texi (nm, objdump): Remove bogus links to STABS diff --git a/binutils/ar.c b/binutils/ar.c index c424038f78..af5694dfa2 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 87908d7267..04229f9ba8 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2013-07-18 Jim Thomas <thomas@cfht.hawaii.edu> + + * config/tc-i386-intel.c (i386_intel_operand): Fixed signed vs + unsigned comparison. + 2013-07-18 Sandeep Kumar Singh <Sandeep.Singh2@kpitcummins.com> * 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 aefdc2a9c7..9080861834 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 |