Don't use boolean OR in arithmetic expressions

bfd/
	* elf32-epiphany.c (epiphany_final_link_relocate): Use bitwise
	OR in arithmetic expression, not boolean OR.
opcodes/
	* cr16-dis.c (print_insn_cr16): Don't use boolean OR in arithmetic.
	* crx-dis.c (print_insn_crx): Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e54585aac041f336f0ee5996b916a55f83832bc2..7ba9597315644e6849c07d87cdc41ce8e89b4ac6 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-06  Alan Modra  <amodra@gmail.com>
+
+       * elf32-epiphany.c (epiphany_final_link_relocate): Use bitwise
+       OR in arithmetic expression, not boolean OR.
+
 2016-09-30  Alan Modra  <amodra@gmail.com>
 
        * Makefile.am (BFD_H_FILES): Add linker.c and simple.c.  Sort

diff --git a/bfd/elf32-epiphany.c b/bfd/elf32-epiphany.c
index 420dc8bb0780d5a62e236e374859c2dffe879494..6b798b17a5e9e53433afa564bc67517bcb4562bc 100644 (file)
--- a/bfd/elf32-epiphany.c
+++ b/bfd/elf32-epiphany.c
@@ -420,9 +420,10 @@ epiphany_final_link_relocate (reloc_howto_type *  howto,
       relocation += rel->r_addend;
       if ((unsigned int) relocation > 0x7ff)
        return bfd_reloc_outofrange;
+      /* Fall through.  */
     disp11:
-      relocation = ((relocation & 7) << 5)
-       || ((relocation & 0x7f8 )  << 13);
+      relocation = (((relocation & 7) << 5)
+                   | ((relocation & 0x7f8 ) << 13));
       return _bfd_relocate_contents (howto, input_bfd, relocation,
                                     contents + rel->r_offset);
 

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 20ebe6913b789e47dd9ae6c19a00fbd2c60050fa..83f435c3ec43f3fa9e79c6a2edc9f89c43c1d8dc 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-06  Alan Modra  <amodra@gmail.com>
+
+       * cr16-dis.c (print_insn_cr16): Don't use boolean OR in arithmetic.
+       * crx-dis.c (print_insn_crx): Likewise.
+
 2016-09-30  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR binutils/20657

diff --git a/opcodes/cr16-dis.c b/opcodes/cr16-dis.c
index 3c901f965e5a6f59fd6341aa129d8779ac22060e..1d7054aff3f2f1ff7f931b991a5e1b5272f01217 100644 (file)
--- a/opcodes/cr16-dis.c
+++ b/opcodes/cr16-dis.c
@@ -815,7 +815,7 @@ print_insn_cr16 (bfd_vma memaddr, struct disassemble_info *info)
   /* Find a matching opcode in table.  */
   is_decoded = cr16_match_opcode ();
   /* If found, print the instruction's mnemonic and arguments.  */
-  if (is_decoded > 0 && (cr16_words[0] << 16 || cr16_words[1]) != 0)
+  if (is_decoded > 0 && (cr16_words[0] != 0 || cr16_words[1] != 0))
     {
       if (strneq (instruction->mnemonic, "cinv", 4))
         info->fprintf_func (info->stream,"%s", getcinvstring (instruction->mnemonic));

diff --git a/opcodes/crx-dis.c b/opcodes/crx-dis.c
index 2da70edda872188fc02d5d3445c63a1f2cf78bef..d6b129ed7ccc3f3e90ecab46222433095dfc59d0 100644 (file)
--- a/opcodes/crx-dis.c
+++ b/opcodes/crx-dis.c
@@ -727,7 +727,7 @@ print_insn_crx (bfd_vma memaddr, struct disassemble_info *info)
   /* Find a matching opcode in table.  */
   is_decoded = match_opcode ();
   /* If found, print the instruction's mnemonic and arguments.  */
-  if (is_decoded > 0 && (words[0] << 16 || words[1]) != 0)
+  if (is_decoded > 0 && (words[0] != 0 || words[1] != 0))
     {
       info->fprintf_func (info->stream, "%s", instruction->mnemonic);
       if ((currInsn.nargs = get_number_of_operands ()) != 0)