From: John David Anglin <danglin@gcc.gnu.org>
Date: Mon, 31 Jul 2017 16:51:25 +0000 (-0400)
Subject: Fix bb instructions with double-word condition on hppa.
X-Git-Tag: hjl/gpoff-backup~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e957b16d45b8fe4396b16775f0b3fa77f71f0a0;p=thirdparty%2Fbinutils-gdb.git

Fix bb instructions with double-word condition on hppa.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7b716c3cc3b..1a3439d9e12 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2017-07-31  John David Anglin  <danglin@gcc.gnu.org>
+
+	* config/tc-hppa.c (pa_ip): Clear `d' bit in branch on bit instructions
+	with a double-word condition and a fixed bit position greater than 31.
+
 2017-07-28  Andrew Waterman  <andrew@sifive.com>
 
 	* config/tc-riscv.c (riscv_set_arch): Handle the Q subset like
diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index 724b48bfbce..e4ec8926077 100644
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -5216,9 +5216,7 @@ pa_ip (char *str)
 	      s = expr_end;
 	      CHECK_FIELD (num, 63, 0, strict);
 	      if (num & 0x20)
-		;
-	      else
-		opcode |= (1 << 13);
+		opcode &= ~(1 << 13);
 	      INSERT_FIELD_AND_CONTINUE (opcode, num & 0x1f, 21);
 
 	    /* Handle a 5 bit immediate at 10.  */