From: Nick Clifton <nickc@redhat.com>
Date: Fri, 16 Dec 2016 10:59:36 +0000 (+0000)
Subject: Fix compile time warning building arm-dis.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=db7b55faa1a11e632ddf57505c9bb64bc783471a;p=binutils-gdb.git

Fix compile time warning building arm-dis.c
---

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index c8a1b7eab9d..d247bac90bd 100644
--- 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 791d1240910..372c11e1c5f 100644
--- 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
 			{