From: H.J. Lu <hjl.tools@gmail.com>
Date: Tue, 27 Apr 2021 15:16:55 +0000 (-0700)
Subject: x86: Add () to silence GCC 5
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=60cfa10c36668e3298bab35e9dc86624f3ddf61a;p=binutils-gdb.git

x86: Add () to silence GCC 5

Add () to !i.prefix[ADDR_PREFIX] to silence GCC 5:

gas/config/tc-i386.c:4152:31: error: logical not is only applied to the left hand side of comparison [-Werror=logical-not-parentheses]
     && !i.prefix[ADDR_PREFIX] != (flag_code == CODE_32BIT))
                               ^

	* config/tc-i386.c (optimize_encoding): Add () to silence GCC 5.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 03ba1964176..64378d10666 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (optimize_encoding): Add () to silence GCC 5.
+
 2021-04-26  Jan Beulich  <jbeulich@suse.com>
 
 	* config/tc-i386.c (tc_gen_reloc): Check IS_ELF for
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 99f990464cd..88b601ff742 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -4149,7 +4149,9 @@ optimize_encoding (void)
 	      if (i.op[0].disps
 		  && i.op[0].disps->X_op == O_constant
 		  && i.op[1].regs->reg_type.bitfield.dword
-		  && !i.prefix[ADDR_PREFIX] != (flag_code == CODE_32BIT))
+		  /* NB: Add () to !i.prefix[ADDR_PREFIX] to silence
+		     GCC 5. */
+		  && (!i.prefix[ADDR_PREFIX]) != (flag_code == CODE_32BIT))
 		i.op[0].disps->X_add_number &= 0xffff;
 	    }