Fix compile time warning building arm-dis.c

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index c8a1b7eab9d18e81f9cf21963da855332ff24dde..d247bac90bdc240ee6f90b429db840407048d384 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-16  Nick Clifton  <nickc@redhat.com>
+
+       * arm-dis.c (print_insn_thumb32): Fix compile time warning
+       computing value_in_comment.
+
 2016-12-14  Maciej W. Rozycki  <macro@imgtec.com>
 
        * mips-dis.c (mips_convert_abiflags_ases): New function.

diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index 791d1240910a211f4033dca566ee5e4551f79589..372c11e1c5f6c884cb40b46ac89499d35f492988 100644 (file)
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -5759,7 +5759,7 @@ print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given)
                      if (off || !U)
                        {
                          func (stream, ", #%c%u", U ? '+' : '-', off * 4);
-                         value_in_comment = off * 4 * U ? 1 : -1;
+                         value_in_comment = (off && U) ? 1 : -1;
                        }
                      func (stream, "]");
                      if (W)
@@ -5771,7 +5771,7 @@ print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given)
                      if (W)
                        {
                          func (stream, "#%c%u", U ? '+' : '-', off * 4);
-                         value_in_comment = off * 4 * U ? 1 : -1;
+                         value_in_comment = (off && U) ? 1 : -1;
                        }
                      else
                        {